diff --git a/src/Razor/Directory.Build.targets b/src/Razor/Directory.Build.targets
index 78626b773e..181bfc9f70 100644
--- a/src/Razor/Directory.Build.targets
+++ b/src/Razor/Directory.Build.targets
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
     <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
     <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion>
     <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
     <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
     <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
diff --git a/src/Razor/NuGetPackageVerifier.json b/src/Razor/NuGetPackageVerifier.json
index b62352e8b9..ceaad8c670 100644
--- a/src/Razor/NuGetPackageVerifier.json
+++ b/src/Razor/NuGetPackageVerifier.json
@@ -18,54 +18,53 @@
       "DefaultCompositeRule"
     ],
     "packages": {
-      "Microsoft.AspNetCore.Razor.Design": {
-        "exclusions": {
+      "Microsoft.NET.Sdk.Razor": {
+        "Exclusions": {
           "ASSEMBLY_DESCRIPTION": {
-            "tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions."
-          },
-          "NEUTRAL_RESOURCES_LANGUAGE": {
-            "tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions."
+            "tools/netcoreapp3.0/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions."
           },
           "ASSEMBLY_PRODUCT": {
-            "tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions."
+            "tools/netcoreapp3.0/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions."
+          },
+          "NEUTRAL_RESOURCES_LANGUAGE": {
+            "tools/netcoreapp3.0/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions."
           },
           "SERVICING_ATTRIBUTE": {
-            "tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions."
-          },
-          "VERSION_INFORMATIONALVERSION": {
-            "tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions."
+            "tools/netcoreapp3.0/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions."
           },
           "WRONG_PUBLICKEYTOKEN": {
-            "tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions."
+            "tools/netcoreapp3.0/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions."
           },
           "ASSEMBLY_INFORMATIONAL_VERSION_MISMATCH": {
-            "tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions."
+            "tools/netcoreapp3.0/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions."
           },
           "ASSEMBLY_FILE_VERSION_MISMATCH": {
-            "tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions."
+            "tools/netcoreapp3.0/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions."
           },
           "ASSEMBLY_VERSION_MISMATCH": {
-            "tools/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.",
-            "tools/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions."
+            "tools/netcoreapp3.0/Microsoft.CodeAnalysis.CSharp.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/Microsoft.CodeAnalysis.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/Newtonsoft.Json.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions.",
+            "tools/netcoreapp3.0/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll": "This assembly is not owned by us and does not follow our conventions."
+          },
+          "BUILD_ITEMS_FRAMEWORK": {
+            "*": "Razor SDK does not contain any dependencies or binaries and consequently does not have a dependency group."
           }
         }
       }
diff --git a/src/Razor/Razor.sln b/src/Razor/Razor.sln
index 5bb3137be2..8232e2316c 100644
--- a/src/Razor/Razor.sln
+++ b/src/Razor/Razor.sln
@@ -20,6 +20,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		build\dependencies.props = build\dependencies.props
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
+		build\repo.props = build\repo.props
+		build\repo.targets = build\repo.targets
 		build\sources.props = build\sources.props
 	EndProjectSection
 EndProject
@@ -77,9 +79,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Mac.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test", "test\Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test\Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test.csproj", "{B8A3E4CA-D54A-441F-A3BF-E00F060CA042}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Design", "src\Microsoft.AspNetCore.Razor.Design\Microsoft.AspNetCore.Razor.Design.csproj", "{5257B25D-330A-4DCF-ACED-B4709CFBF916}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Design.Test", "test\Microsoft.AspNetCore.Razor.Design.Test\Microsoft.AspNetCore.Razor.Design.Test.csproj", "{1D90F276-E1CA-4FDF-A173-EB889E7D3150}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.Razor.Test", "test\Microsoft.NET.Sdk.Razor.Test\Microsoft.NET.Sdk.Razor.Test.csproj", "{1D90F276-E1CA-4FDF-A173-EB889E7D3150}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test", "test\Microsoft.AspNetCore.Razor.Test\Microsoft.AspNetCore.Razor.Test.csproj", "{323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}"
 EndProject
@@ -97,6 +97,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib", "test\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj", "{72E89155-86C7-454E-BDD9-39F497F2F61B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X", "src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj", "{0693CA32-BB75-401E-BC08-72D6DEEB4C99}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test", "test\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj", "{495A006C-D2B9-4AD0-9D33-60820BA501D8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X", "test\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj", "{D87E5501-B832-46B6-ACD3-EC989E3D14ED}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -327,14 +333,6 @@ Global
 		{B8A3E4CA-D54A-441F-A3BF-E00F060CA042}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B8A3E4CA-D54A-441F-A3BF-E00F060CA042}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
 		{B8A3E4CA-D54A-441F-A3BF-E00F060CA042}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
-		{5257B25D-330A-4DCF-ACED-B4709CFBF916}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5257B25D-330A-4DCF-ACED-B4709CFBF916}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5257B25D-330A-4DCF-ACED-B4709CFBF916}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{5257B25D-330A-4DCF-ACED-B4709CFBF916}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
-		{5257B25D-330A-4DCF-ACED-B4709CFBF916}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5257B25D-330A-4DCF-ACED-B4709CFBF916}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5257B25D-330A-4DCF-ACED-B4709CFBF916}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
-		{5257B25D-330A-4DCF-ACED-B4709CFBF916}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
 		{1D90F276-E1CA-4FDF-A173-EB889E7D3150}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1D90F276-E1CA-4FDF-A173-EB889E7D3150}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1D90F276-E1CA-4FDF-A173-EB889E7D3150}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
@@ -399,6 +397,30 @@ Global
 		{72E89155-86C7-454E-BDD9-39F497F2F61B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{72E89155-86C7-454E-BDD9-39F497F2F61B}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
 		{72E89155-86C7-454E-BDD9-39F497F2F61B}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
+		{0693CA32-BB75-401E-BC08-72D6DEEB4C99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0693CA32-BB75-401E-BC08-72D6DEEB4C99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0693CA32-BB75-401E-BC08-72D6DEEB4C99}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
+		{0693CA32-BB75-401E-BC08-72D6DEEB4C99}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
+		{0693CA32-BB75-401E-BC08-72D6DEEB4C99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0693CA32-BB75-401E-BC08-72D6DEEB4C99}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0693CA32-BB75-401E-BC08-72D6DEEB4C99}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
+		{0693CA32-BB75-401E-BC08-72D6DEEB4C99}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
+		{495A006C-D2B9-4AD0-9D33-60820BA501D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{495A006C-D2B9-4AD0-9D33-60820BA501D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{495A006C-D2B9-4AD0-9D33-60820BA501D8}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
+		{495A006C-D2B9-4AD0-9D33-60820BA501D8}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
+		{495A006C-D2B9-4AD0-9D33-60820BA501D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{495A006C-D2B9-4AD0-9D33-60820BA501D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{495A006C-D2B9-4AD0-9D33-60820BA501D8}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
+		{495A006C-D2B9-4AD0-9D33-60820BA501D8}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
+		{D87E5501-B832-46B6-ACD3-EC989E3D14ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D87E5501-B832-46B6-ACD3-EC989E3D14ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D87E5501-B832-46B6-ACD3-EC989E3D14ED}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
+		{D87E5501-B832-46B6-ACD3-EC989E3D14ED}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
+		{D87E5501-B832-46B6-ACD3-EC989E3D14ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D87E5501-B832-46B6-ACD3-EC989E3D14ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D87E5501-B832-46B6-ACD3-EC989E3D14ED}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
+		{D87E5501-B832-46B6-ACD3-EC989E3D14ED}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -432,7 +454,6 @@ Global
 		{FAF9986F-E086-4513-9D52-F7BF5FFCF31D} = {C0CC1E1F-1559-44DE-93A8-63259CEA2AAB}
 		{95B18DEE-8B45-4CF0-B9F8-CCBAF3B5251A} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
 		{B8A3E4CA-D54A-441F-A3BF-E00F060CA042} = {92463391-81BE-462B-AC3C-78C6C760741F}
-		{5257B25D-330A-4DCF-ACED-B4709CFBF916} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
 		{1D90F276-E1CA-4FDF-A173-EB889E7D3150} = {92463391-81BE-462B-AC3C-78C6C760741F}
 		{323553F0-14AB-4FBD-9CF0-1CC0BE8056F8} = {92463391-81BE-462B-AC3C-78C6C760741F}
 		{6205467F-E381-4C42-AEEC-763BD62B3D5E} = {C2C98051-0F39-47F2-80B6-E72B29159F2C}
@@ -441,6 +462,9 @@ Global
 		{7D9ECCEE-71D1-4A42-ABEE-876AFA1B4FC9} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
 		{6EA56B2B-89EC-4C38-A384-97D203375B06} = {92463391-81BE-462B-AC3C-78C6C760741F}
 		{72E89155-86C7-454E-BDD9-39F497F2F61B} = {92463391-81BE-462B-AC3C-78C6C760741F}
+		{0693CA32-BB75-401E-BC08-72D6DEEB4C99} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
+		{495A006C-D2B9-4AD0-9D33-60820BA501D8} = {92463391-81BE-462B-AC3C-78C6C760741F}
+		{D87E5501-B832-46B6-ACD3-EC989E3D14ED} = {92463391-81BE-462B-AC3C-78C6C760741F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0035341D-175A-4D05-95E6-F1C2785A1E26}
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/ProjectSystem/ProjectSnapshotManagerBenchmarkBase.cs b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/ProjectSystem/ProjectSnapshotManagerBenchmarkBase.cs
index 70590a6a35..580ddd1572 100644
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/ProjectSystem/ProjectSnapshotManagerBenchmarkBase.cs
+++ b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Performance/ProjectSystem/ProjectSnapshotManagerBenchmarkBase.cs
@@ -132,14 +132,6 @@ namespace Microsoft.AspNetCore.Razor.Performance
 
         private class StaticProjectSnapshotProjectEngineFactory : ProjectSnapshotProjectEngineFactory
         {
-            public override RazorProjectEngine Create(ProjectSnapshot project, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure)
-            {
-                return RazorProjectEngine.Create(project.Configuration, fileSystem, b =>
-                {
-                    RazorExtensions.Register(b);
-                });
-            }
-
             public override IProjectEngineFactory FindFactory(ProjectSnapshot project)
             {
                 throw new NotImplementedException();
@@ -149,6 +141,14 @@ namespace Microsoft.AspNetCore.Razor.Performance
             {
                 throw new NotImplementedException();
             }
+
+            public override RazorProjectEngine Create(RazorConfiguration configuration, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure)
+            {
+                return RazorProjectEngine.Create(configuration, fileSystem, b =>
+                {
+                    RazorExtensions.Register(b);
+                });
+            }
         }
     }
 }
diff --git a/src/Razor/build/MPack.targets b/src/Razor/build/MPack.targets
index ce81b91622..e00b58a968 100644
--- a/src/Razor/build/MPack.targets
+++ b/src/Razor/build/MPack.targets
@@ -7,9 +7,9 @@
     <MPackArtifactCategory>shipoob</MPackArtifactCategory>
 
     <MPackIntermediateOutputPath>$(IntermediateDir)mpack\</MPackIntermediateOutputPath>
-    <AddinOutputPath>$(AddinDirectory)bin\$(Configuration)\net461\</AddinOutputPath>
+    <AddinOutputPath>$(AddinDirectory)bin\$(Configuration)\net472\</AddinOutputPath>
     <LanguageServiceName>Microsoft.VisualStudio.Mac.LanguageServices.Razor</LanguageServiceName>
-    <LanguageServiceOutputPath>$(RepositoryRoot)src\$(LanguageServiceName)\bin\$(Configuration)\net461\</LanguageServiceOutputPath>
+    <LanguageServiceOutputPath>$(RepositoryRoot)src\$(LanguageServiceName)\bin\$(Configuration)\net472\</LanguageServiceOutputPath>
     <MPackName>$(AddinName)_$(AddinVersion)</MPackName>
     <MPackFileName>$(MPackName).mpack</MPackFileName>
     <MPackOutputPath>$(BuildDir)$(MPackFileName)</MPackOutputPath>
@@ -72,8 +72,9 @@
     </ItemGroup>
 
     <ItemGroup>
-      <LanguageServiceExtensionAssembly Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\bin\$(Configuration)\net46\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.dll" />
-      <LanguageServiceExtensionAssembly Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\net46\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
+      <LanguageServiceExtensionAssembly Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.dll" />
+      <LanguageServiceExtensionAssembly Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.dll" />
+      <LanguageServiceExtensionAssembly Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
       <LanguageServiceAssembly Include="$(LanguageServiceOutputPath)%(LanguageServiceAssemblyNames.Identity)" Condition="Exists('$(LanguageServiceOutputPath)%(LanguageServiceAssemblyNames.Identity)')" />
       <LanguageServiceAssembly Include="%(LanguageServiceExtensionAssembly.Identity)" />
       <LanguageServicePDB Include="%(LanguageServiceAssembly.RootDir)%(Directory)%(FileName).pdb" Condition="Exists('%(LanguageServiceAssembly.RootDir)%(Directory)%(FileName).pdb')" />
diff --git a/src/Razor/build/VSIX.targets b/src/Razor/build/VSIX.targets
index eda19a3bef..bc3460fd16 100644
--- a/src/Razor/build/VSIX.targets
+++ b/src/Razor/build/VSIX.targets
@@ -105,7 +105,7 @@
         /p:Configuration=$(Configuration);
         /p:FeatureBranchVersionSuffix=$(FeatureBranchVersionSuffix);
         /p:BuildNumber=$(BuildNumber);
-        /p:LangVersion=7.1" />
+        /p:LangVersion=7.2" />
     </ItemGroup>
 
     <MakeDir Directories="$(LogOutputDir)" />
diff --git a/src/Razor/build/dependencies.props b/src/Razor/build/dependencies.props
index b76ea87d30..983109a3be 100644
--- a/src/Razor/build/dependencies.props
+++ b/src/Razor/build/dependencies.props
@@ -4,60 +4,63 @@
   </PropertyGroup>
   <PropertyGroup Label="Package Versions">
     <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
-    <InternalAspNetCoreSdkPackageVersion>2.2.0-preview2-20181108.4</InternalAspNetCoreSdkPackageVersion>
-    <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>2.2.0-rtm-181106-13</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
-    <MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>2.2.0-rtm-35661</MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>
-    <MicrosoftAspNetCoreTestingPackageVersion>2.2.0-rtm-181106-13</MicrosoftAspNetCoreTestingPackageVersion>
-    <MicrosoftBuildFrameworkPackageVersion>15.6.82</MicrosoftBuildFrameworkPackageVersion>
-    <MicrosoftBuildPackageVersion>15.6.82</MicrosoftBuildPackageVersion>
-    <MicrosoftBuildUtilitiesCorePackageVersion>15.6.82</MicrosoftBuildUtilitiesCorePackageVersion>
+    <InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20181108.5</InternalAspNetCoreSdkPackageVersion>
+    <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview-181106-14</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
+    <MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>3.0.0-alpha1-10717</MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>
+    <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview-181106-14</MicrosoftAspNetCoreTestingPackageVersion>
+    <MicrosoftBuildFrameworkPackageVersion>15.8.166</MicrosoftBuildFrameworkPackageVersion>
+    <MicrosoftBuildPackageVersion>15.8.166</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildUtilitiesCorePackageVersion>15.8.166</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftCodeAnalysisCommonPackageVersion>2.8.0</MicrosoftCodeAnalysisCommonPackageVersion>
     <MicrosoftCodeAnalysisCSharpPackageVersion>2.8.0</MicrosoftCodeAnalysisCSharpPackageVersion>
-    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.2.0-rtm-181106-13</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
-    <MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>2.2.0-rtm-181106-13</MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>
-    <MicrosoftExtensionsDependencyModelPackageVersion>2.1.0</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>2.2.0-rtm-181106-13</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
-    <MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>2.2.0-rtm-181106-13</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
-    <MicrosoftExtensionsWebEncodersPackageVersion>2.2.0-rtm-35661</MicrosoftExtensionsWebEncodersPackageVersion>
-    <MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
+    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
+    <MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview1-26907-05</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
+    <MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
+    <MicrosoftExtensionsWebEncodersPackageVersion>3.0.0-alpha1-10717</MicrosoftExtensionsWebEncodersPackageVersion>
     <MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion>
-    <MicrosoftNETCoreApp22PackageVersion>2.2.0-rtm-27105-02</MicrosoftNETCoreApp22PackageVersion>
+    <MicrosoftNETCoreApp30PackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreApp30PackageVersion>
+    <MicrosoftNETFrameworkReferenceAssemblies>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssemblies>
     <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
-    <MicrosoftVisualStudioComponentModelHostPackageVersion>15.0.26606</MicrosoftVisualStudioComponentModelHostPackageVersion>
-    <MicrosoftVisualStudioEditorPackageVersion>15.6.161-preview</MicrosoftVisualStudioEditorPackageVersion>
-    <MicrosoftVisualStudioLanguageIntellisensePackageVersion>15.6.161-preview</MicrosoftVisualStudioLanguageIntellisensePackageVersion>
-    <MicrosoftVisualStudioOLEInteropPackageVersion>7.10.6070</MicrosoftVisualStudioOLEInteropPackageVersion>
-    <MicrosoftVisualStudioProjectSystemAnalyzersPackageVersion>15.3.224</MicrosoftVisualStudioProjectSystemAnalyzersPackageVersion>
+    <MicrosoftVisualStudioComponentModelHostPackageVersion>15.8.525</MicrosoftVisualStudioComponentModelHostPackageVersion>
+    <MicrosoftVisualStudioImageCatalogPackageVersion>15.8.28010</MicrosoftVisualStudioImageCatalogPackageVersion>
+    <MicrosoftVisualStudioEditorPackageVersion>16.0.142-g25b7188c54</MicrosoftVisualStudioEditorPackageVersion>
+    <MicrosoftVisualStudioLanguagePackageVersion>16.0.142-g25b7188c54</MicrosoftVisualStudioLanguagePackageVersion>
+    <MicrosoftVisualStudioLanguageIntellisensePackageVersion>16.0.142-g25b7188c54</MicrosoftVisualStudioLanguageIntellisensePackageVersion>
+    <MicrosoftVisualStudioOLEInteropPackageVersion>7.10.6071</MicrosoftVisualStudioOLEInteropPackageVersion>
+    <MicrosoftVisualStudioProjectSystemAnalyzersPackageVersion>16.0.201-pre-g7d366164d0</MicrosoftVisualStudioProjectSystemAnalyzersPackageVersion>
     <MicrosoftVisualStudioProjectSystemManagedVSPackageVersion>2.0.6142705</MicrosoftVisualStudioProjectSystemManagedVSPackageVersion>
-    <MicrosoftVisualStudioProjectSystemSDKPackageVersion>15.3.224</MicrosoftVisualStudioProjectSystemSDKPackageVersion>
-    <MicrosoftVisualStudioShell150PackageVersion>15.0.26606</MicrosoftVisualStudioShell150PackageVersion>
-    <MicrosoftVisualStudioShellInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioShellInterop100PackageVersion>
-    <MicrosoftVisualStudioShellInterop110PackageVersion>11.0.61030</MicrosoftVisualStudioShellInterop110PackageVersion>
-    <MicrosoftVisualStudioShellInterop120PackageVersion>12.0.30110</MicrosoftVisualStudioShellInterop120PackageVersion>
-    <MicrosoftVisualStudioShellInterop80PackageVersion>8.0.50727</MicrosoftVisualStudioShellInterop80PackageVersion>
-    <MicrosoftVisualStudioShellInterop90PackageVersion>9.0.30729</MicrosoftVisualStudioShellInterop90PackageVersion>
-    <MicrosoftVisualStudioShellInteropPackageVersion>7.10.6071</MicrosoftVisualStudioShellInteropPackageVersion>
-    <MicrosoftVisualStudioTextUIPackageVersion>15.6.161-preview</MicrosoftVisualStudioTextUIPackageVersion>
+    <MicrosoftVisualStudioProjectSystemSDKPackageVersion>16.0.201-pre-g7d366164d0</MicrosoftVisualStudioProjectSystemSDKPackageVersion>
+    <MicrosoftVisualStudioShell150PackageVersion>15.8.28010</MicrosoftVisualStudioShell150PackageVersion>
+    <MicrosoftVisualStudioShellInterop100PackageVersion>10.0.30320</MicrosoftVisualStudioShellInterop100PackageVersion>
+    <MicrosoftVisualStudioShellInterop110PackageVersion>11.0.61031</MicrosoftVisualStudioShellInterop110PackageVersion>
+    <MicrosoftVisualStudioShellInterop120PackageVersion>12.0.30111</MicrosoftVisualStudioShellInterop120PackageVersion>
+    <MicrosoftVisualStudioShellInterop80PackageVersion>8.0.50728</MicrosoftVisualStudioShellInterop80PackageVersion>
+    <MicrosoftVisualStudioShellInterop90PackageVersion>9.0.30730</MicrosoftVisualStudioShellInterop90PackageVersion>
+    <MicrosoftVisualStudioShellInteropPackageVersion>7.10.6072</MicrosoftVisualStudioShellInteropPackageVersion>
+    <MicrosoftVisualStudioTextUIPackageVersion>16.0.142-g25b7188c54</MicrosoftVisualStudioTextUIPackageVersion>
+    <MicrosoftVisualStudioThreadingPackageVersion>15.8.168</MicrosoftVisualStudioThreadingPackageVersion>
     <MonoAddinsPackageVersion>1.3.8</MonoAddinsPackageVersion>
     <MonoDevelopSdkPackageVersion>1.0.1</MonoDevelopSdkPackageVersion>
     <MoqPackageVersion>4.10.0</MoqPackageVersion>
     <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
     <NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
-    <StreamJsonRpcPackageVersion>1.1.92</StreamJsonRpcPackageVersion>
-    <SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
+    <StreamJsonRpcPackageVersion>1.3.23</StreamJsonRpcPackageVersion>
+    <SystemDiagnosticsDiagnosticSourcePackageVersion>4.6.0-preview1-26907-04</SystemDiagnosticsDiagnosticSourcePackageVersion>
     <SystemRuntimeInteropServicesRuntimeInformationPackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationPackageVersion>
-    <SystemValueTuplePackageVersion>4.5.0</SystemValueTuplePackageVersion>
+    <SystemValueTuplePackageVersion>4.6.0-preview1-26829-04</SystemValueTuplePackageVersion>
     <VisualStudio_NewtonsoftJsonPackageVersion>9.0.1</VisualStudio_NewtonsoftJsonPackageVersion>
-    <VSIX_MicrosoftCodeAnalysisCommonPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisCommonPackageVersion>
-    <VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
-    <VSIX_MicrosoftCodeAnalysisCSharpPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisCSharpPackageVersion>
-    <VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
-    <VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
-    <VSIX_MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion>
-    <VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
-    <VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
-    <VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion>
-    <VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion>
+    <VSIX_MicrosoftCodeAnalysisCommonPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisCommonPackageVersion>
+    <VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
+    <VSIX_MicrosoftCodeAnalysisCSharpPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisCSharpPackageVersion>
+    <VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
+    <VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
+    <VSIX_MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion>
+    <VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
+    <VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
+    <VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion>
+    <VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion>2.11.0-beta3-63519-01</VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion>
     <XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion>
     <XunitPackageVersion>2.3.1</XunitPackageVersion>
     <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
diff --git a/src/Razor/build/repo.props b/src/Razor/build/repo.props
index def34f0b6f..0aebc758fb 100644
--- a/src/Razor/build/repo.props
+++ b/src/Razor/build/repo.props
@@ -21,13 +21,11 @@
   <PropertyGroup>
     <!-- These properties are use by the automation that updates dependencies.props -->
     <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
-    <LineupPackageVersion>2.2.0-*</LineupPackageVersion>
     <LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource>
   </PropertyGroup>
 
   <ItemGroup>
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
     <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
+    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp30PackageVersion)" />
   </ItemGroup>
 </Project>
diff --git a/src/Razor/build/repo.targets b/src/Razor/build/repo.targets
index 550069ec47..1c111a1c01 100644
--- a/src/Razor/build/repo.targets
+++ b/src/Razor/build/repo.targets
@@ -11,9 +11,9 @@
 
   <PropertyGroup>
     <PrepareDependsOn>$(PrepareDependsOn);GenerateMSBuildLocationFile</PrepareDependsOn>
-    <RazorDesignTestProject>$(RepositoryRoot)test\Microsoft.AspNetCore.Razor.Design.Test\</RazorDesignTestProject>
-    <MSBuildLocationFileTemplate>$(RazorDesignTestProject)BuildVariables.cs.template</MSBuildLocationFileTemplate>
-    <MSBuildLocationFileOutput>$(RazorDesignTestProject)obj\BuildVariables.generated.cs</MSBuildLocationFileOutput>
+    <RazorSdkTestProject>$(RepositoryRoot)test\Microsoft.NET.Sdk.Razor.Test\</RazorSdkTestProject>
+    <MSBuildLocationFileTemplate>$(RazorSdkTestProject)BuildVariables.cs.template</MSBuildLocationFileTemplate>
+    <MSBuildLocationFileOutput>$(RazorSdkTestProject)obj\BuildVariables.generated.cs</MSBuildLocationFileOutput>
   </PropertyGroup>
 
   <Target Name="GenerateMSBuildLocationFile"
@@ -24,8 +24,8 @@
     <PropertyGroup>
       <TemplateProperties>
         MSBuildLocation=$(VisualStudioMSBuildx86Path);
-        MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreApp22PackageVersion);
-        NETStandardLibraryPackageVersion=$(NETStandardLibrary20PackageVersion)
+        MicrosoftNETCoreApp30PackageVersion=$(MicrosoftNETCoreApp30PackageVersion);
+        NETStandardLibrary20PackageVersion=$(NETStandardLibrary20PackageVersion)
       </TemplateProperties>
     </PropertyGroup>
 
diff --git a/src/Razor/build/sources.props b/src/Razor/build/sources.props
index 02efac4549..2bd61d3599 100644
--- a/src/Razor/build/sources.props
+++ b/src/Razor/build/sources.props
@@ -10,8 +10,10 @@
       https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
       https://dotnet.myget.org/F/msbuild/api/v3/index.json;
       https://dotnet.myget.org/F/roslyn/api/v3/index.json;
+      https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json;
       https://vside.myget.org/F/vssdk/api/v3/index.json;
-      https://vside.myget.org/F/vsmac/api/v3/index.json
+      https://vside.myget.org/F/vsmac/api/v3/index.json;
+      https://vside.myget.org/F/devcore/api/v3/index.json;
     </RestoreSources>
     <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
       $(RestoreSources);
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj
index c6b3d3e212..0d61d12b26 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>ASP.NET Core design time hosting infrastructure for the Razor view engine.</Description>
-    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <PackageTags>$(PackageTags);aspnetcoremvc</PackageTags>
     <EnableApiCheck>false</EnableApiCheck>
   </PropertyGroup>
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/RazorExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/RazorExtensions.cs
index 5211072d0e..55e8929457 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/RazorExtensions.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/RazorExtensions.cs
@@ -20,7 +20,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X
             InjectDirective.Register(builder);
             ModelDirective.Register(builder);
 
-            FunctionsDirective.Register(builder);
             InheritsDirective.Register(builder);
 
             builder.Features.Add(new DefaultTagHelperDescriptorProvider());
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/AssemblyAttributeInjectionPass.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/AssemblyAttributeInjectionPass.cs
new file mode 100644
index 0000000000..021c61c368
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/AssemblyAttributeInjectionPass.cs
@@ -0,0 +1,102 @@
+// 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.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class AssemblyAttributeInjectionPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        private const string RazorViewAttribute = "global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute";
+        private const string RazorPageAttribute = "global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute";
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (documentNode.Options.DesignTime)
+            {
+                return;
+            }
+
+            var @namespace = documentNode.FindPrimaryNamespace();
+            if (@namespace == null || string.IsNullOrEmpty(@namespace.Content))
+            {
+                // No namespace node or it's incomplete. Skip.
+                return;
+            }
+
+            var @class = documentNode.FindPrimaryClass();
+            if (@class == null || string.IsNullOrEmpty(@class.ClassName))
+            {
+                // No class node or it's incomplete. Skip.
+                return;
+            }
+
+            var generatedTypeName = $"{@namespace.Content}.{@class.ClassName}";
+
+            // The MVC attributes require a relative path to be specified so that we can make a view engine path.
+            // We can't use a rooted path because we don't know what the project root is.
+            //
+            // If we can't sanitize the path, we'll just set it to null and let is blow up at runtime - we don't
+            // want to create noise if this code has to run in some unanticipated scenario.
+            var escapedPath = MakeVerbatimStringLiteral(ConvertToViewEnginePath(codeDocument.Source.RelativePath));
+
+            string attribute;
+            if (documentNode.DocumentKind == MvcViewDocumentClassifierPass.MvcViewDocumentKind)
+            {
+                attribute = $"[assembly:{RazorViewAttribute}({escapedPath}, typeof({generatedTypeName}))]";
+            }
+            else if (documentNode.DocumentKind == RazorPageDocumentClassifierPass.RazorPageDocumentKind &&
+                PageDirective.TryGetPageDirective(documentNode, out var pageDirective))
+            {
+                var escapedRoutePrefix = MakeVerbatimStringLiteral(pageDirective.RouteTemplate);
+                attribute = $"[assembly:{RazorPageAttribute}({escapedPath}, typeof({generatedTypeName}), {escapedRoutePrefix})]";
+            }
+            else
+            {
+                return;
+            }
+
+            var index = documentNode.Children.IndexOf(@namespace);
+            Debug.Assert(index >= 0);
+
+            var pageAttribute = new CSharpCodeIntermediateNode();
+            pageAttribute.Children.Add(new IntermediateToken()
+            {
+                Kind = TokenKind.CSharp,
+                Content = attribute,
+            });
+
+            documentNode.Children.Insert(index, pageAttribute);
+        }
+
+        private static string MakeVerbatimStringLiteral(string value)
+        {
+            if (value == null)
+            {
+                return "null";
+            }
+
+            value = value.Replace("\"", "\"\"");
+            return $"@\"{value}\"";
+        }
+        
+        private static string ConvertToViewEnginePath(string relativePath)
+        {
+            if (string.IsNullOrEmpty(relativePath))
+            {
+                return null;
+            }
+
+            // Checking for both / and \ because a \ will become a /.
+            if (!relativePath.StartsWith("/") && !relativePath.StartsWith("\\"))
+            {
+                relativePath = "/" + relativePath;
+            }
+            
+            relativePath = relativePath.Replace('\\', '/');
+            return relativePath;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/CSharpIdentifier.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/CSharpIdentifier.cs
similarity index 97%
rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/CSharpIdentifier.cs
rename to src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/CSharpIdentifier.cs
index e1ca2e343e..77a5e8f54e 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/CSharpIdentifier.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/CSharpIdentifier.cs
@@ -5,7 +5,7 @@ using System;
 using System.Globalization;
 using System.Text;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 {
     internal static class CSharpIdentifier
     {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ExtensionInitializer.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ExtensionInitializer.cs
new file mode 100644
index 0000000000..03d05f7f9b
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ExtensionInitializer.cs
@@ -0,0 +1,15 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    internal class ExtensionInitializer : RazorExtensionInitializer
+    {
+        public override void Initialize(RazorProjectEngineBuilder builder)
+        {
+            RazorExtensions.Register(builder);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/IInjectTargetExtension.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/IInjectTargetExtension.cs
new file mode 100644
index 0000000000..c334e23c2b
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/IInjectTargetExtension.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public interface IInjectTargetExtension : ICodeTargetExtension
+    {
+        void WriteInjectProperty(CodeRenderingContext context, InjectIntermediateNode node);
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/IViewComponentTagHelperTargetExtension.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/IViewComponentTagHelperTargetExtension.cs
new file mode 100644
index 0000000000..f3e07a2b75
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/IViewComponentTagHelperTargetExtension.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public interface IViewComponentTagHelperTargetExtension : ICodeTargetExtension
+    {
+        void WriteViewComponentTagHelper(CodeRenderingContext context, ViewComponentTagHelperIntermediateNode node);
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/InjectDirective.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/InjectDirective.cs
new file mode 100644
index 0000000000..9442aaf641
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/InjectDirective.cs
@@ -0,0 +1,124 @@
+// 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;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public static class InjectDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "inject",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder
+                    .AddTypeToken(Resources.InjectDirective_TypeToken_Name, Resources.InjectDirective_TypeToken_Description)
+                    .AddMemberToken(Resources.InjectDirective_MemberToken_Name, Resources.InjectDirective_MemberToken_Description);
+
+                builder.Usage = DirectiveUsage.FileScopedMultipleOccurring;
+                builder.Description = Resources.InjectDirective_Description;
+            });
+
+        public static RazorProjectEngineBuilder Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+            builder.AddTargetExtension(new InjectTargetExtension());
+            return builder;
+        }
+
+        internal class Pass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+        {
+            // Runs after the @model and @namespace directives
+            public override int Order => 10;
+            
+            protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+            {
+                var visitor = new Visitor();
+                visitor.Visit(documentNode);
+                var modelType = ModelDirective.GetModelType(documentNode);
+
+                var properties = new HashSet<string>(StringComparer.Ordinal);
+
+                for (var i = visitor.Directives.Count - 1; i >= 0; i--)
+                {
+                    var directive = visitor.Directives[i];
+                    var tokens = directive.Tokens.ToArray();
+                    if (tokens.Length < 2)
+                    {
+                        continue;
+                    }
+
+                    var typeName = tokens[0].Content;
+                    var memberName = tokens[1].Content;
+
+                    if (!properties.Add(memberName))
+                    {
+                        continue;
+                    }
+
+                    typeName = typeName.Replace("<TModel>", "<" + modelType + ">");
+
+                    var injectNode = new InjectIntermediateNode()
+                    {
+                        TypeName = typeName,
+                        MemberName = memberName,
+                    };
+
+                    visitor.Class.Children.Add(injectNode);
+                }
+            }
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public IList<DirectiveIntermediateNode> Directives { get; } = new List<DirectiveIntermediateNode>();
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                if (Class == null)
+                {
+                    Class = node;
+                }
+
+                base.VisitClassDeclaration(node);
+            }
+
+            public override void VisitDirective(DirectiveIntermediateNode node)
+            {
+                if (node.Directive == Directive)
+                {
+                    Directives.Add(node);
+                }
+            }
+        }
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+            builder.AddTargetExtension(new InjectTargetExtension());
+            return builder;
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/InjectIntermediateNode.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/InjectIntermediateNode.cs
new file mode 100644
index 0000000000..4e3603f40d
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/InjectIntermediateNode.cs
@@ -0,0 +1,58 @@
+// 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;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class InjectIntermediateNode : ExtensionIntermediateNode
+    {
+        public string TypeName { get; set; }
+
+        public string MemberName { get; set; }
+
+        public override IntermediateNodeCollection Children => IntermediateNodeCollection.ReadOnly;
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<InjectIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IInjectTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IInjectTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteInjectProperty(context, this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(MemberName);
+
+            formatter.WriteProperty(nameof(MemberName), MemberName);
+            formatter.WriteProperty(nameof(TypeName), TypeName);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/InjectTargetExtension.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/InjectTargetExtension.cs
new file mode 100644
index 0000000000..1660b84d6d
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/InjectTargetExtension.cs
@@ -0,0 +1,44 @@
+// 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;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class InjectTargetExtension : IInjectTargetExtension
+    {
+        private const string RazorInjectAttribute = "[global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]";
+
+        public void WriteInjectProperty(CodeRenderingContext context, InjectIntermediateNode node)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var property = $"public {node.TypeName} {node.MemberName} {{ get; private set; }}";
+
+            if (node.Source.HasValue)
+            {
+                using (context.CodeWriter.BuildLinePragma(node.Source.Value))
+                {
+                    context.CodeWriter
+                        .WriteLine(RazorInjectAttribute)
+                        .WriteLine(property);
+                }
+            }
+            else
+            {
+                context.CodeWriter
+                    .WriteLine(RazorInjectAttribute)
+                    .WriteLine(property);
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/InstrumentationPass.cs
similarity index 98%
rename from src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs
rename to src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/InstrumentationPass.cs
index d80c2b9b68..f82ed32e45 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/InstrumentationPass.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 {
     public class InstrumentationPass : IntermediateNodePassBase, IRazorOptimizationPass
     {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj
new file mode 100644
index 0000000000..e77d4c3837
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core design time hosting infrastructure for the Razor view engine.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageTags>$(PackageTags);aspnetcoremvc</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AspNetCore.Razor.Language\CodeGeneration\CodeWriterExtensions.cs">
+      <Link>Shared\CodeWriterExtensions.cs</Link>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj" />
+    <ProjectReference Include="../Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ModelDirective.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ModelDirective.cs
new file mode 100644
index 0000000000..cf80df5f68
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ModelDirective.cs
@@ -0,0 +1,152 @@
+// 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;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public static class ModelDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "model",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddTypeToken(Resources.ModelDirective_TypeToken_Name, Resources.ModelDirective_TypeToken_Description);
+                builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                builder.Description = Resources.ModelDirective_Description;
+            });
+
+        public static RazorProjectEngineBuilder Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+            return builder;
+        }
+
+        public static string GetModelType(DocumentIntermediateNode document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            var visitor = new Visitor();
+            return GetModelType(document, visitor);
+        }
+
+        private static string GetModelType(DocumentIntermediateNode document, Visitor visitor)
+        {
+            visitor.Visit(document);
+
+            for (var i = visitor.ModelDirectives.Count - 1; i >= 0; i--)
+            {
+                var directive = visitor.ModelDirectives[i];
+
+                var tokens = directive.Tokens.ToArray();
+                if (tokens.Length >= 1)
+                {
+                    return tokens[0].Content;
+                }
+            }
+
+            if (document.DocumentKind == RazorPageDocumentClassifierPass.RazorPageDocumentKind)
+            {
+                return visitor.Class.ClassName;
+            }
+            else
+            {
+                return "dynamic";
+            }
+        }
+
+        internal class Pass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+        {
+            // Runs after the @inherits directive
+            public override int Order => 5;
+
+            protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+            {
+                var visitor = new Visitor();
+                var modelType = GetModelType(documentNode, visitor);
+
+                if (documentNode.Options.DesignTime)
+                {
+                    // Alias the TModel token to a known type.
+                    // This allows design time compilation to succeed for Razor files where the token isn't replaced.
+                    var typeName = $"global::{typeof(object).FullName}";
+                    var usingNode = new UsingDirectiveIntermediateNode()
+                    {
+                        Content = $"TModel = {typeName}"
+                    };
+
+                    visitor.Namespace?.Children.Insert(0, usingNode);
+                }
+
+                var baseType = visitor.Class?.BaseType?.Replace("<TModel>", "<" + modelType + ">");
+                visitor.Class.BaseType = baseType;
+            }
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public NamespaceDeclarationIntermediateNode Namespace { get; private set; }
+
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public IList<DirectiveIntermediateNode> ModelDirectives { get; } = new List<DirectiveIntermediateNode>();
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                if (Namespace == null)
+                {
+                    Namespace = node;
+                }
+
+                base.VisitNamespaceDeclaration(node);
+            }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                if (Class == null)
+                {
+                    Class = node;
+                }
+
+                base.VisitClassDeclaration(node);
+            }
+
+            public override void VisitDirective(DirectiveIntermediateNode node)
+            {
+                if (node.Directive == Directive)
+                {
+                    ModelDirectives.Add(node);
+                }
+            }
+        }
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+            return builder;
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ModelExpressionPass.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ModelExpressionPass.cs
new file mode 100644
index 0000000000..ef8e8fb181
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ModelExpressionPass.cs
@@ -0,0 +1,85 @@
+// 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;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class ModelExpressionPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        private const string ModelExpressionTypeName = "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression";
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var visitor = new Visitor();
+            visitor.Visit(documentNode);
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public List<TagHelperIntermediateNode> TagHelpers { get; } = new List<TagHelperIntermediateNode>();
+
+            public override void VisitTagHelperProperty(TagHelperPropertyIntermediateNode node)
+            {
+                if (string.Equals(node.BoundAttribute.TypeName, ModelExpressionTypeName, StringComparison.Ordinal) ||
+                    (node.IsIndexerNameMatch &&
+                     string.Equals(node.BoundAttribute.IndexerTypeName, ModelExpressionTypeName, StringComparison.Ordinal)))
+                {
+                    var expression = new CSharpExpressionIntermediateNode();
+
+                    expression.Children.Add(new IntermediateToken()
+                    {
+                        Kind = TokenKind.CSharp,
+                        Content = "ModelExpressionProvider.CreateModelExpression(ViewData, __model => ",
+                    });
+
+                    if (node.Children.Count == 1 && node.Children[0] is IntermediateToken token && token.IsCSharp)
+                    {
+                        // A 'simple' expression will look like __model => __model.Foo
+
+                        expression.Children.Add(new IntermediateToken()
+                        {
+                            Kind = TokenKind.CSharp,
+                            Content = "__model."
+                        });
+
+                        expression.Children.Add(token);
+                    }
+                    else
+                    {
+                        for (var i = 0; i < node.Children.Count; i++)
+                        {
+                            if (node.Children[i] is CSharpExpressionIntermediateNode nestedExpression)
+                            {
+                                for (var j = 0; j < nestedExpression.Children.Count; j++)
+                                {
+                                    if (nestedExpression.Children[j] is IntermediateToken cSharpToken &&
+                                        cSharpToken.IsCSharp)
+                                    {
+                                        expression.Children.Add(cSharpToken);
+                                    }
+                                }
+
+                                continue;
+                            }
+                        }
+                    }
+
+                    expression.Children.Add(new IntermediateToken()
+                    {
+                        Kind = TokenKind.CSharp,
+                        Content = ")",
+                    });
+
+                    node.Children.Clear();
+
+                    node.Children.Add(expression);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/MvcImportProjectFeature.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/MvcImportProjectFeature.cs
new file mode 100644
index 0000000000..c25cb0d063
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/MvcImportProjectFeature.cs
@@ -0,0 +1,91 @@
+// 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;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    internal class MvcImportProjectFeature : RazorProjectEngineFeatureBase, IImportProjectFeature
+    {
+        private const string ImportsFileName = "_ViewImports.cshtml";
+
+        public IReadOnlyList<RazorProjectItem> GetImports(RazorProjectItem projectItem)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            var imports = new List<RazorProjectItem>();
+            AddDefaultDirectivesImport(imports);
+
+            // We add hierarchical imports second so any default directive imports can be overridden.
+            AddHierarchicalImports(projectItem, imports);
+
+            return imports;
+        }
+
+        // Internal for testing
+        internal static void AddDefaultDirectivesImport(List<RazorProjectItem> imports)
+        {
+            imports.Add(DefaultDirectivesProjectItem.Instance);
+        }
+
+        // Internal for testing
+        internal void AddHierarchicalImports(RazorProjectItem projectItem, List<RazorProjectItem> imports)
+        {
+            // We want items in descending order. FindHierarchicalItems returns items in ascending order.
+            var importProjectItems = ProjectEngine.FileSystem.FindHierarchicalItems(projectItem.FilePath, ImportsFileName).Reverse();
+            imports.AddRange(importProjectItems);
+        }
+
+        private class DefaultDirectivesProjectItem : RazorProjectItem
+        {
+            private readonly byte[] _defaultImportBytes;
+
+            private DefaultDirectivesProjectItem()
+            {
+                var preamble = Encoding.UTF8.GetPreamble();
+                var content = @"
+@using System
+@using System.Collections.Generic
+@using System.Linq
+@using System.Threading.Tasks
+@using Microsoft.AspNetCore.Mvc
+@using Microsoft.AspNetCore.Mvc.Rendering
+@using Microsoft.AspNetCore.Mvc.ViewFeatures
+@inject global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel> Html
+@inject global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json
+@inject global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component
+@inject global::Microsoft.AspNetCore.Mvc.IUrlHelper Url
+@inject global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider
+@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+@addTagHelper Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+";
+                var contentBytes = Encoding.UTF8.GetBytes(content);
+
+                _defaultImportBytes = new byte[preamble.Length + contentBytes.Length];
+                preamble.CopyTo(_defaultImportBytes, 0);
+                contentBytes.CopyTo(_defaultImportBytes, preamble.Length);
+            }
+
+            public override string BasePath => null;
+
+            public override string FilePath => null;
+
+            public override string PhysicalPath => null;
+
+            public override bool Exists => true;
+
+            public static DefaultDirectivesProjectItem Instance { get; } = new DefaultDirectivesProjectItem();
+
+            public override Stream Read() => new MemoryStream(_defaultImportBytes);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/MvcViewDocumentClassifierPass.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/MvcViewDocumentClassifierPass.cs
new file mode 100644
index 0000000000..7ec6a1360e
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/MvcViewDocumentClassifierPass.cs
@@ -0,0 +1,71 @@
+// 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;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class MvcViewDocumentClassifierPass : DocumentClassifierPassBase
+    {
+        public static readonly string MvcViewDocumentKind = "mvc.1.0.view";
+
+        protected override string DocumentKind => MvcViewDocumentKind;
+
+        protected override bool IsMatch(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode) => true;
+
+        protected override void OnDocumentStructureCreated(
+            RazorCodeDocument codeDocument, 
+            NamespaceDeclarationIntermediateNode @namespace, 
+            ClassDeclarationIntermediateNode @class, 
+            MethodDeclarationIntermediateNode method)
+        {
+            base.OnDocumentStructureCreated(codeDocument, @namespace, @class, method);
+
+            @namespace.Content = "AspNetCore";
+
+            var filePath = codeDocument.Source.RelativePath ?? codeDocument.Source.FilePath;
+            if (string.IsNullOrEmpty(filePath))
+            {
+                // It's possible for a Razor document to not have a file path.
+                // Eg. When we try to generate code for an in memory document like default imports.
+                var checksum = BytesToString(codeDocument.Source.GetChecksum());
+                @class.ClassName = $"AspNetCore_{checksum}";
+            }
+            else
+            {
+                @class.ClassName = CSharpIdentifier.GetClassNameFromPath(filePath);
+            }
+
+            @class.BaseType = "global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>";
+            @class.Modifiers.Clear();
+            @class.Modifiers.Add("public");
+
+            method.MethodName = "ExecuteAsync";
+            method.Modifiers.Clear();
+            method.Modifiers.Add("public");
+            method.Modifiers.Add("async");
+            method.Modifiers.Add("override");
+            method.ReturnType = $"global::{typeof(System.Threading.Tasks.Task).FullName}";
+        }
+
+        private static string BytesToString(byte[] bytes)
+        {
+            if (bytes == null)
+            {
+                throw new ArgumentNullException(nameof(bytes));
+            }
+
+            var result = new StringBuilder(bytes.Length);
+            for (var i = 0; i < bytes.Length; i++)
+            {
+                // The x2 format means lowercase hex, where each byte is a 2-character string.
+                result.Append(bytes[i].ToString("x2"));
+            }
+
+            return result.ToString();
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/NamespaceDirective.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/NamespaceDirective.cs
new file mode 100644
index 0000000000..de05d354b1
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/NamespaceDirective.cs
@@ -0,0 +1,204 @@
+// 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;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public static class NamespaceDirective
+    {
+        private static readonly char[] Separators = new char[] { '\\', '/' };
+
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "namespace",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddNamespaceToken(
+                    Resources.NamespaceDirective_NamespaceToken_Name,
+                    Resources.NamespaceDirective_NamespaceToken_Description);
+                builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                builder.Description = Resources.NamespaceDirective_Description;
+            });
+
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException();
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+        }
+
+        // internal for testing
+        internal class Pass : IntermediateNodePassBase, IRazorDirectiveClassifierPass
+        {
+            protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+            {
+                if (documentNode.DocumentKind != RazorPageDocumentClassifierPass.RazorPageDocumentKind &&
+                    documentNode.DocumentKind != MvcViewDocumentClassifierPass.MvcViewDocumentKind)
+                {
+                    // Not a page. Skip.
+                    return;
+                }
+
+                var visitor = new Visitor();
+                visitor.Visit(documentNode);
+
+                var directive = visitor.LastNamespaceDirective;
+                if (directive == null)
+                {
+                    // No namespace set. Skip.
+                    return;
+                }
+
+                var @namespace = visitor.FirstNamespace;
+                if (@namespace == null)
+                {
+                    // No namespace node. Skip.
+                    return;
+                }
+
+                @namespace.Content = GetNamespace(codeDocument.Source.FilePath, directive);
+            }
+        }
+
+        // internal for testing.
+        //
+        // This code does a best-effort attempt to compute a namespace 'suffix' - the path difference between
+        // where the @namespace directive appears and where the current document is on disk.
+        //
+        // In the event that these two source either don't have FileNames set or don't follow a coherent hierarchy,
+        // we will just use the namespace verbatim.
+        internal static string GetNamespace(string source, DirectiveIntermediateNode directive)
+        {
+            var directiveSource = NormalizeDirectory(directive.Source?.FilePath);
+
+            var baseNamespace = directive.Tokens.FirstOrDefault()?.Content;
+            if (string.IsNullOrEmpty(baseNamespace))
+            {
+                // The namespace directive was incomplete.
+                return string.Empty;
+            }
+
+            if (string.IsNullOrEmpty(source) || directiveSource == null)
+            {
+                // No sources, can't compute a suffix.
+                return baseNamespace;
+            }
+
+            // We're specifically using OrdinalIgnoreCase here because Razor treats all paths as case-insensitive.
+            if (!source.StartsWith(directiveSource, StringComparison.OrdinalIgnoreCase) ||
+                source.Length <= directiveSource.Length)
+            {
+                // The imports are not from the directory hierarchy, can't compute a suffix.
+                return baseNamespace;
+            }
+
+            // OK so that this point we know that the 'imports' file containing this directive is in the directory
+            // hierarchy of this soure file. This is the case where we can append a suffix to the baseNamespace.
+            //
+            // Everything so far has just been defensiveness on our part.
+
+            var builder = new StringBuilder(baseNamespace);
+
+            var segments = source.Substring(directiveSource.Length).Split(Separators);
+
+            // Skip the last segment because it's the FileName.
+            for (var i = 0; i < segments.Length - 1; i++)
+            {
+                builder.Append('.');
+                builder.Append(CSharpIdentifier.SanitizeClassName(segments[i]));
+            }
+
+            return builder.ToString();
+        }
+
+        // We want to normalize the path of the file containing the '@namespace' directive to just the containing
+        // directory with a trailing separator.
+        //
+        // Not using Path.GetDirectoryName here because it doesn't meet these requirements, and we want to handle
+        // both 'view engine' style paths and absolute paths.
+        //
+        // We also don't normalize the separators here. We expect that all documents are using a consistent style of path.
+        // 
+        // If we can't normalize the path, we just return null so it will be ignored.
+        private static string NormalizeDirectory(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+            {
+                return null;
+            }
+
+            var lastSeparator = path.LastIndexOfAny(Separators);
+            if (lastSeparator == -1)
+            {
+                return null;
+            }
+
+            // Includes the separator
+            return path.Substring(0, lastSeparator + 1);
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode FirstClass { get; private set; }
+
+            public NamespaceDeclarationIntermediateNode FirstNamespace { get; private set; }
+
+            // We want the last one, so get them all and then .
+            public DirectiveIntermediateNode LastNamespaceDirective { get; private set; }
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                if (FirstNamespace == null)
+                {
+                    FirstNamespace = node;
+                }
+
+                base.VisitNamespaceDeclaration(node);
+            }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                if (FirstClass == null)
+                {
+                    FirstClass = node;
+                }
+
+                base.VisitClassDeclaration(node);
+            }
+
+            public override void VisitDirective(DirectiveIntermediateNode node)
+            {
+                if (node.Directive == Directive)
+                {
+                    LastNamespaceDirective = node;
+                }
+
+                base.VisitDirective(node);
+            }
+        }
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static void Register(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException();
+            }
+
+            builder.AddDirective(Directive);
+            builder.Features.Add(new Pass());
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/PageDirective.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/PageDirective.cs
new file mode 100644
index 0000000000..9b483f9b9f
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/PageDirective.cs
@@ -0,0 +1,121 @@
+// 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;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class PageDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "page",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddOptionalStringToken(Resources.PageDirective_RouteToken_Name, Resources.PageDirective_RouteToken_Description);
+                builder.Usage = DirectiveUsage.FileScopedSinglyOccurring;
+                builder.Description = Resources.PageDirective_Description;
+            });
+
+        private PageDirective(string routeTemplate, IntermediateNode directiveNode)
+        {
+            RouteTemplate = routeTemplate;
+            DirectiveNode = directiveNode;
+        }
+
+        public string RouteTemplate { get; }
+
+        public IntermediateNode DirectiveNode { get; }
+
+        public static RazorProjectEngineBuilder Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            return builder;
+        }
+
+        public static bool TryGetPageDirective(DocumentIntermediateNode documentNode, out PageDirective pageDirective)
+        {
+            var visitor = new Visitor();
+            for (var i = 0; i < documentNode.Children.Count; i++)
+            {
+                visitor.Visit(documentNode.Children[i]);
+            }
+
+            if (visitor.DirectiveTokens == null)
+            {
+                pageDirective = null;
+                return false;
+            }
+
+            var tokens = visitor.DirectiveTokens.ToList();
+            string routeTemplate = null;
+            if (tokens.Count > 0)
+            {
+                routeTemplate = TrimQuotes(tokens[0].Content);
+            }
+
+            pageDirective = new PageDirective(routeTemplate, visitor.DirectiveNode);
+            return true;
+        }
+
+        private static string TrimQuotes(string content)
+        {
+            // Tokens aren't captured if they're malformed. Therefore, this method will
+            // always be called with a valid token content.
+            Debug.Assert(content.Length >= 2);
+            Debug.Assert(content.StartsWith("\"", StringComparison.Ordinal));
+            Debug.Assert(content.EndsWith("\"", StringComparison.Ordinal));
+
+            return content.Substring(1, content.Length - 2);
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public IntermediateNode DirectiveNode { get; private set; }
+
+            public IEnumerable<DirectiveTokenIntermediateNode> DirectiveTokens { get; private set; }
+
+            public override void VisitDirective(DirectiveIntermediateNode node)
+            {
+                if (node.Directive == Directive)
+                {
+                    DirectiveNode = node;
+                    DirectiveTokens = node.Tokens;
+                }
+            }
+
+            public override void VisitMalformedDirective(MalformedDirectiveIntermediateNode node)
+            {
+                if (DirectiveTokens == null && node.Directive == Directive)
+                {
+                    DirectiveNode = node;
+                    DirectiveTokens = node.Tokens;
+                }
+            }
+        }
+
+        #region Obsolete
+        [Obsolete("This method is obsolete and will be removed in a future version.")]
+        public static IRazorEngineBuilder Register(IRazorEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive);
+            return builder;
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/PagesPropertyInjectionPass.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/PagesPropertyInjectionPass.cs
new file mode 100644
index 0000000000..4010c1903b
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/PagesPropertyInjectionPass.cs
@@ -0,0 +1,57 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class PagesPropertyInjectionPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (documentNode.DocumentKind != RazorPageDocumentClassifierPass.RazorPageDocumentKind)
+            {
+                return;
+            }
+
+            var modelType = ModelDirective.GetModelType(documentNode);
+            var visitor = new Visitor();
+            visitor.Visit(documentNode);
+
+            var @class = visitor.Class;
+
+            var viewDataType = $"global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<{modelType}>";
+            var vddProperty = new CSharpCodeIntermediateNode();
+            vddProperty.Children.Add(new IntermediateToken()
+            {
+                Kind = TokenKind.CSharp,
+                Content = $"public {viewDataType} ViewData => ({viewDataType})PageContext?.ViewData;",
+            });
+            @class.Children.Add(vddProperty);
+
+            var modelProperty = new CSharpCodeIntermediateNode();
+            modelProperty.Children.Add(new IntermediateToken()
+            {
+                Kind = TokenKind.CSharp,
+                Content = $"public {modelType} Model => ViewData.Model;",
+            });
+            @class.Children.Add(modelProperty);
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                if (Class == null)
+                {
+                    Class = node;
+                }
+
+                base.VisitClassDeclaration(node);
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Properties/AssemblyInfo.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..a7a402e09a
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Properties/AssemblyInfo.cs
@@ -0,0 +1,12 @@
+// 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.Runtime.CompilerServices;
+using Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X;
+using Microsoft.AspNetCore.Razor.Language;
+
+[assembly: ProvideRazorExtensionInitializer("MVC-2.0", typeof(ExtensionInitializer))]
+[assembly: ProvideRazorExtensionInitializer("MVC-2.1", typeof(ExtensionInitializer))]
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Properties/Resources.Designer.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..ec4883803c
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Properties/Resources.Designer.cs
@@ -0,0 +1,338 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string ArgumentCannotBeNullOrEmpty
+        {
+            get => GetString("ArgumentCannotBeNullOrEmpty");
+        }
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string FormatArgumentCannotBeNullOrEmpty()
+            => GetString("ArgumentCannotBeNullOrEmpty");
+
+        /// <summary>
+        /// Inject a service from the application's service container into a property.
+        /// </summary>
+        internal static string InjectDirective_Description
+        {
+            get => GetString("InjectDirective_Description");
+        }
+
+        /// <summary>
+        /// Inject a service from the application's service container into a property.
+        /// </summary>
+        internal static string FormatInjectDirective_Description()
+            => GetString("InjectDirective_Description");
+
+        /// <summary>
+        /// The name of the property.
+        /// </summary>
+        internal static string InjectDirective_MemberToken_Description
+        {
+            get => GetString("InjectDirective_MemberToken_Description");
+        }
+
+        /// <summary>
+        /// The name of the property.
+        /// </summary>
+        internal static string FormatInjectDirective_MemberToken_Description()
+            => GetString("InjectDirective_MemberToken_Description");
+
+        /// <summary>
+        /// PropertyName
+        /// </summary>
+        internal static string InjectDirective_MemberToken_Name
+        {
+            get => GetString("InjectDirective_MemberToken_Name");
+        }
+
+        /// <summary>
+        /// PropertyName
+        /// </summary>
+        internal static string FormatInjectDirective_MemberToken_Name()
+            => GetString("InjectDirective_MemberToken_Name");
+
+        /// <summary>
+        /// The type of the service to inject.
+        /// </summary>
+        internal static string InjectDirective_TypeToken_Description
+        {
+            get => GetString("InjectDirective_TypeToken_Description");
+        }
+
+        /// <summary>
+        /// The type of the service to inject.
+        /// </summary>
+        internal static string FormatInjectDirective_TypeToken_Description()
+            => GetString("InjectDirective_TypeToken_Description");
+
+        /// <summary>
+        /// TypeName
+        /// </summary>
+        internal static string InjectDirective_TypeToken_Name
+        {
+            get => GetString("InjectDirective_TypeToken_Name");
+        }
+
+        /// <summary>
+        /// TypeName
+        /// </summary>
+        internal static string FormatInjectDirective_TypeToken_Name()
+            => GetString("InjectDirective_TypeToken_Name");
+
+        /// <summary>
+        /// Specify the view or page model for the page.
+        /// </summary>
+        internal static string ModelDirective_Description
+        {
+            get => GetString("ModelDirective_Description");
+        }
+
+        /// <summary>
+        /// Specify the view or page model for the page.
+        /// </summary>
+        internal static string FormatModelDirective_Description()
+            => GetString("ModelDirective_Description");
+
+        /// <summary>
+        /// The model type.
+        /// </summary>
+        internal static string ModelDirective_TypeToken_Description
+        {
+            get => GetString("ModelDirective_TypeToken_Description");
+        }
+
+        /// <summary>
+        /// The model type.
+        /// </summary>
+        internal static string FormatModelDirective_TypeToken_Description()
+            => GetString("ModelDirective_TypeToken_Description");
+
+        /// <summary>
+        /// TypeName
+        /// </summary>
+        internal static string ModelDirective_TypeToken_Name
+        {
+            get => GetString("ModelDirective_TypeToken_Name");
+        }
+
+        /// <summary>
+        /// TypeName
+        /// </summary>
+        internal static string FormatModelDirective_TypeToken_Name()
+            => GetString("ModelDirective_TypeToken_Name");
+
+        /// <summary>
+        /// The 'inherits' keyword is not allowed when a '{0}' keyword is used.
+        /// </summary>
+        internal static string MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword
+        {
+            get => GetString("MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword");
+        }
+
+        /// <summary>
+        /// The 'inherits' keyword is not allowed when a '{0}' keyword is used.
+        /// </summary>
+        internal static string FormatMvcRazorCodeParser_CannotHaveModelAndInheritsKeyword(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword"), p0);
+
+        /// <summary>
+        /// A property name must be specified when using the '{0}' statement. Format for a '{0}' statement is '@{0} &lt;Type Name&gt; &lt;Property Name&gt;'.
+        /// </summary>
+        internal static string MvcRazorCodeParser_InjectDirectivePropertyNameRequired
+        {
+            get => GetString("MvcRazorCodeParser_InjectDirectivePropertyNameRequired");
+        }
+
+        /// <summary>
+        /// A property name must be specified when using the '{0}' statement. Format for a '{0}' statement is '@{0} &lt;Type Name&gt; &lt;Property Name&gt;'.
+        /// </summary>
+        internal static string FormatMvcRazorCodeParser_InjectDirectivePropertyNameRequired(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_InjectDirectivePropertyNameRequired"), p0);
+
+        /// <summary>
+        /// The '{0}' keyword must be followed by a type name on the same line.
+        /// </summary>
+        internal static string MvcRazorCodeParser_KeywordMustBeFollowedByTypeName
+        {
+            get => GetString("MvcRazorCodeParser_KeywordMustBeFollowedByTypeName");
+        }
+
+        /// <summary>
+        /// The '{0}' keyword must be followed by a type name on the same line.
+        /// </summary>
+        internal static string FormatMvcRazorCodeParser_KeywordMustBeFollowedByTypeName(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_KeywordMustBeFollowedByTypeName"), p0);
+
+        /// <summary>
+        /// Only one '{0}' statement is allowed in a file.
+        /// </summary>
+        internal static string MvcRazorCodeParser_OnlyOneModelStatementIsAllowed
+        {
+            get => GetString("MvcRazorCodeParser_OnlyOneModelStatementIsAllowed");
+        }
+
+        /// <summary>
+        /// Only one '{0}' statement is allowed in a file.
+        /// </summary>
+        internal static string FormatMvcRazorCodeParser_OnlyOneModelStatementIsAllowed(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_OnlyOneModelStatementIsAllowed"), p0);
+
+        /// <summary>
+        /// Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.
+        /// </summary>
+        internal static string MvcRazorParser_InvalidPropertyType
+        {
+            get => GetString("MvcRazorParser_InvalidPropertyType");
+        }
+
+        /// <summary>
+        /// Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.
+        /// </summary>
+        internal static string FormatMvcRazorParser_InvalidPropertyType(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorParser_InvalidPropertyType"), p0, p1, p2);
+
+        /// <summary>
+        /// Specify the base namespace for the page.
+        /// </summary>
+        internal static string NamespaceDirective_Description
+        {
+            get => GetString("NamespaceDirective_Description");
+        }
+
+        /// <summary>
+        /// Specify the base namespace for the page.
+        /// </summary>
+        internal static string FormatNamespaceDirective_Description()
+            => GetString("NamespaceDirective_Description");
+
+        /// <summary>
+        /// The namespace for the page.
+        /// </summary>
+        internal static string NamespaceDirective_NamespaceToken_Description
+        {
+            get => GetString("NamespaceDirective_NamespaceToken_Description");
+        }
+
+        /// <summary>
+        /// The namespace for the page.
+        /// </summary>
+        internal static string FormatNamespaceDirective_NamespaceToken_Description()
+            => GetString("NamespaceDirective_NamespaceToken_Description");
+
+        /// <summary>
+        /// Namespace
+        /// </summary>
+        internal static string NamespaceDirective_NamespaceToken_Name
+        {
+            get => GetString("NamespaceDirective_NamespaceToken_Name");
+        }
+
+        /// <summary>
+        /// Namespace
+        /// </summary>
+        internal static string FormatNamespaceDirective_NamespaceToken_Name()
+            => GetString("NamespaceDirective_NamespaceToken_Name");
+
+        /// <summary>
+        /// The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.
+        /// </summary>
+        internal static string PageDirectiveCannotBeImported
+        {
+            get => GetString("PageDirectiveCannotBeImported");
+        }
+
+        /// <summary>
+        /// The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.
+        /// </summary>
+        internal static string FormatPageDirectiveCannotBeImported(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("PageDirectiveCannotBeImported"), p0, p1);
+
+        /// <summary>
+        /// The '@{0}' directive must exist at the top of the file. Only comments and whitespace are allowed before the '@{0}' directive.
+        /// </summary>
+        internal static string PageDirectiveMustExistAtTheTopOfFile
+        {
+            get => GetString("PageDirectiveMustExistAtTheTopOfFile");
+        }
+
+        /// <summary>
+        /// The '@{0}' directive must exist at the top of the file. Only comments and whitespace are allowed before the '@{0}' directive.
+        /// </summary>
+        internal static string FormatPageDirectiveMustExistAtTheTopOfFile(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("PageDirectiveMustExistAtTheTopOfFile"), p0);
+
+        /// <summary>
+        /// Mark the page as a Razor Page.
+        /// </summary>
+        internal static string PageDirective_Description
+        {
+            get => GetString("PageDirective_Description");
+        }
+
+        /// <summary>
+        /// Mark the page as a Razor Page.
+        /// </summary>
+        internal static string FormatPageDirective_Description()
+            => GetString("PageDirective_Description");
+
+        /// <summary>
+        /// An optional route template for the page.
+        /// </summary>
+        internal static string PageDirective_RouteToken_Description
+        {
+            get => GetString("PageDirective_RouteToken_Description");
+        }
+
+        /// <summary>
+        /// An optional route template for the page.
+        /// </summary>
+        internal static string FormatPageDirective_RouteToken_Description()
+            => GetString("PageDirective_RouteToken_Description");
+
+        /// <summary>
+        /// RouteTemplate
+        /// </summary>
+        internal static string PageDirective_RouteToken_Name
+        {
+            get => GetString("PageDirective_RouteToken_Name");
+        }
+
+        /// <summary>
+        /// RouteTemplate
+        /// </summary>
+        internal static string FormatPageDirective_RouteToken_Name()
+            => GetString("PageDirective_RouteToken_Name");
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Properties/ViewComponentResources.Designer.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Properties/ViewComponentResources.Designer.cs
new file mode 100644
index 0000000000..3309adf1c7
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Properties/ViewComponentResources.Designer.cs
@@ -0,0 +1,100 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class ViewComponentResources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentResources", typeof(ViewComponentResources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// View component '{0}' must have exactly one public method named '{1}' or '{2}'.
+        /// </summary>
+        internal static string ViewComponent_AmbiguousMethods
+        {
+            get => GetString("ViewComponent_AmbiguousMethods");
+        }
+
+        /// <summary>
+        /// View component '{0}' must have exactly one public method named '{1}' or '{2}'.
+        /// </summary>
+        internal static string FormatViewComponent_AmbiguousMethods(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AmbiguousMethods"), p0, p1, p2);
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return {2}&amp;lt;T&amp;gt;.
+        /// </summary>
+        internal static string ViewComponent_AsyncMethod_ShouldReturnTask
+        {
+            get => GetString("ViewComponent_AsyncMethod_ShouldReturnTask");
+        }
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return {2}&amp;lt;T&amp;gt;.
+        /// </summary>
+        internal static string FormatViewComponent_AsyncMethod_ShouldReturnTask(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AsyncMethod_ShouldReturnTask"), p0, p1, p2);
+
+        /// <summary>
+        /// Could not find an '{0}' or '{1}' method for the view component '{2}'.
+        /// </summary>
+        internal static string ViewComponent_CannotFindMethod
+        {
+            get => GetString("ViewComponent_CannotFindMethod");
+        }
+
+        /// <summary>
+        /// Could not find an '{0}' or '{1}' method for the view component '{2}'.
+        /// </summary>
+        internal static string FormatViewComponent_CannotFindMethod(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_CannotFindMethod"), p0, p1, p2);
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' cannot return a {2}.
+        /// </summary>
+        internal static string ViewComponent_SyncMethod_CannotReturnTask
+        {
+            get => GetString("ViewComponent_SyncMethod_CannotReturnTask");
+        }
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' cannot return a {2}.
+        /// </summary>
+        internal static string FormatViewComponent_SyncMethod_CannotReturnTask(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_CannotReturnTask"), p0, p1, p2);
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return a value.
+        /// </summary>
+        internal static string ViewComponent_SyncMethod_ShouldReturnValue
+        {
+            get => GetString("ViewComponent_SyncMethod_ShouldReturnValue");
+        }
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return a value.
+        /// </summary>
+        internal static string FormatViewComponent_SyncMethod_ShouldReturnValue(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_ShouldReturnValue"), p0, p1);
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/RazorExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/RazorExtensions.cs
new file mode 100644
index 0000000000..69cf7e2055
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/RazorExtensions.cs
@@ -0,0 +1,48 @@
+// 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;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.CodeAnalysis.Razor;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public static class RazorExtensions
+    {
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            InjectDirective.Register(builder);
+            ModelDirective.Register(builder);
+            NamespaceDirective.Register(builder);
+            PageDirective.Register(builder);
+
+            InheritsDirective.Register(builder);
+            SectionDirective.Register(builder);
+
+            builder.Features.Add(new DefaultTagHelperDescriptorProvider());
+            builder.Features.Add(new ViewComponentTagHelperDescriptorProvider());
+
+            builder.AddTargetExtension(new ViewComponentTagHelperTargetExtension());
+            builder.AddTargetExtension(new TemplateTargetExtension()
+            {
+                TemplateTypeName = "global::Microsoft.AspNetCore.Mvc.Razor.HelperResult",
+            });
+
+            builder.Features.Add(new ModelExpressionPass());
+            builder.Features.Add(new PagesPropertyInjectionPass());
+            builder.Features.Add(new ViewComponentTagHelperPass());
+            builder.Features.Add(new RazorPageDocumentClassifierPass());
+            builder.Features.Add(new MvcViewDocumentClassifierPass());
+            builder.Features.Add(new AssemblyAttributeInjectionPass());
+            builder.Features.Add(new InstrumentationPass());
+
+            builder.SetImportFeature(new MvcImportProjectFeature());
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/RazorExtensionsDiagnosticFactory.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/RazorExtensionsDiagnosticFactory.cs
new file mode 100644
index 0000000000..05a01d38a9
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/RazorExtensionsDiagnosticFactory.cs
@@ -0,0 +1,131 @@
+// 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.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    internal class RazorExtensionsDiagnosticFactory
+    {
+        private const string DiagnosticPrefix = "RZ";
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_CannotFindMethod =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3900",
+                () => ViewComponentResources.ViewComponent_CannotFindMethod,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_CannotFindMethod(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_CannotFindMethod,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                ViewComponentTypes.SyncMethodName,
+                ViewComponentTypes.AsyncMethodName,
+                tagHelperType);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_AmbiguousMethods =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3901",
+                () => ViewComponentResources.ViewComponent_AmbiguousMethods,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_AmbiguousMethods(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_AmbiguousMethods,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                tagHelperType,
+                ViewComponentTypes.SyncMethodName,
+                ViewComponentTypes.AsyncMethodName);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_AsyncMethod_ShouldReturnTask =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3902",
+                () => ViewComponentResources.ViewComponent_AsyncMethod_ShouldReturnTask,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_AsyncMethod_ShouldReturnTask(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_AsyncMethod_ShouldReturnTask,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                ViewComponentTypes.AsyncMethodName,
+                tagHelperType,
+                nameof(Task));
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_SyncMethod_ShouldReturnValue =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3903",
+                () => ViewComponentResources.ViewComponent_SyncMethod_ShouldReturnValue,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_SyncMethod_ShouldReturnValue(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_SyncMethod_ShouldReturnValue,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                ViewComponentTypes.SyncMethodName,
+                tagHelperType);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor ViewComponent_SyncMethod_CannotReturnTask =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3904",
+                () => ViewComponentResources.ViewComponent_SyncMethod_CannotReturnTask,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreateViewComponent_SyncMethod_CannotReturnTask(string tagHelperType)
+        {
+            var diagnostic = RazorDiagnostic.Create(
+                ViewComponent_SyncMethod_CannotReturnTask,
+                new SourceSpan(SourceLocation.Undefined, contentLength: 0),
+                ViewComponentTypes.SyncMethodName,
+                tagHelperType,
+                nameof(Task));
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor PageDirective_CannotBeImported =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3905",
+                () => Resources.PageDirectiveCannotBeImported,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreatePageDirective_CannotBeImported(SourceSpan source)
+        {
+            var fileName = Path.GetFileName(source.FilePath);
+            var diagnostic = RazorDiagnostic.Create(PageDirective_CannotBeImported, source, PageDirective.Directive.Directive, fileName);
+
+            return diagnostic;
+        }
+
+        internal static readonly RazorDiagnosticDescriptor PageDirective_MustExistAtTheTopOfFile =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}3906",
+                () => Resources.PageDirectiveMustExistAtTheTopOfFile,
+                RazorDiagnosticSeverity.Error);
+
+        public static RazorDiagnostic CreatePageDirective_MustExistAtTheTopOfFile(SourceSpan source)
+        {
+            var fileName = Path.GetFileName(source.FilePath);
+            var diagnostic = RazorDiagnostic.Create(PageDirective_MustExistAtTheTopOfFile, source, PageDirective.Directive.Directive);
+
+            return diagnostic;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/RazorPageDocumentClassifierPass.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/RazorPageDocumentClassifierPass.cs
new file mode 100644
index 0000000000..a5de7d0783
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/RazorPageDocumentClassifierPass.cs
@@ -0,0 +1,164 @@
+// 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;
+using System.Diagnostics;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class RazorPageDocumentClassifierPass : DocumentClassifierPassBase
+    {
+        public static readonly string RazorPageDocumentKind = "mvc.1.0.razor-page";
+        public static readonly string RouteTemplateKey = "RouteTemplate";
+
+        private static readonly RazorProjectEngine LeadingDirectiveParsingEngine = RazorProjectEngine.Create(
+            RazorConfiguration.Default,
+            RazorProjectFileSystem.Create("/"),
+            builder =>
+            {
+                for (var i = builder.Phases.Count - 1; i >= 0; i--)
+                {
+                    var phase = builder.Phases[i];
+                    builder.Phases.RemoveAt(i);
+                    if (phase is IRazorDocumentClassifierPhase)
+                    {
+                        break;
+                    }
+                }
+
+                RazorExtensions.Register(builder);
+                builder.Features.Add(new LeadingDirectiveParserOptionsFeature());
+            });
+
+        protected override string DocumentKind => RazorPageDocumentKind;
+
+        protected override bool IsMatch(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            return PageDirective.TryGetPageDirective(documentNode, out var pageDirective);
+        }
+
+        protected override void OnDocumentStructureCreated(
+            RazorCodeDocument codeDocument,
+            NamespaceDeclarationIntermediateNode @namespace,
+            ClassDeclarationIntermediateNode @class,
+            MethodDeclarationIntermediateNode method)
+        {
+            base.OnDocumentStructureCreated(codeDocument, @namespace, @class, method);
+
+            @namespace.Content = "AspNetCore";
+
+            @class.BaseType = "global::Microsoft.AspNetCore.Mvc.RazorPages.Page";
+
+            var filePath = codeDocument.Source.RelativePath ?? codeDocument.Source.FilePath;
+            if (string.IsNullOrEmpty(filePath))
+            {
+                // It's possible for a Razor document to not have a file path.
+                // Eg. When we try to generate code for an in memory document like default imports.
+                var checksum = BytesToString(codeDocument.Source.GetChecksum());
+                @class.ClassName = $"AspNetCore_{checksum}";
+            }
+            else
+            {
+                @class.ClassName = CSharpIdentifier.GetClassNameFromPath(filePath);
+            }
+
+            @class.Modifiers.Clear();
+            @class.Modifiers.Add("public");
+
+            method.MethodName = "ExecuteAsync";
+            method.Modifiers.Clear();
+            method.Modifiers.Add("public");
+            method.Modifiers.Add("async");
+            method.Modifiers.Add("override");
+            method.ReturnType = $"global::{typeof(System.Threading.Tasks.Task).FullName}";
+
+            var document = codeDocument.GetDocumentIntermediateNode();
+            PageDirective.TryGetPageDirective(document, out var pageDirective);
+
+            EnsureValidPageDirective(codeDocument, pageDirective);
+
+            AddRouteTemplateMetadataAttribute(@namespace, @class, pageDirective);
+        }
+
+        private static void AddRouteTemplateMetadataAttribute(NamespaceDeclarationIntermediateNode @namespace, ClassDeclarationIntermediateNode @class, PageDirective pageDirective)
+        {
+            if (string.IsNullOrEmpty(pageDirective.RouteTemplate))
+            {
+                return;
+            }
+
+            var classIndex = @namespace.Children.IndexOf(@class);
+            if (classIndex == -1)
+            {
+                return;
+            }
+
+            var metadataAttributeNode = new RazorCompiledItemMetadataAttributeIntermediateNode
+            {
+                Key = RouteTemplateKey,
+                Value = pageDirective.RouteTemplate,
+            };
+            // Metadata attributes need to be inserted right before the class declaration.
+            @namespace.Children.Insert(classIndex, metadataAttributeNode);
+        }
+
+        private void EnsureValidPageDirective(RazorCodeDocument codeDocument, PageDirective pageDirective)
+        {
+            Debug.Assert(pageDirective != null);
+
+            if (pageDirective.DirectiveNode.IsImported())
+            {
+                pageDirective.DirectiveNode.Diagnostics.Add(
+                    RazorExtensionsDiagnosticFactory.CreatePageDirective_CannotBeImported(pageDirective.DirectiveNode.Source.Value));
+            }
+            else
+            {
+                // The document contains a page directive and it is not imported.
+                // We now want to make sure this page directive exists at the top of the file.
+                // We are going to do that by re-parsing the document until the very first line that is not Razor comment
+                // or whitespace. We then make sure the page directive still exists in the re-parsed IR tree.
+                var leadingDirectiveCodeDocument = RazorCodeDocument.Create(codeDocument.Source);
+                LeadingDirectiveParsingEngine.Engine.Process(leadingDirectiveCodeDocument);
+
+                var leadingDirectiveDocumentNode = leadingDirectiveCodeDocument.GetDocumentIntermediateNode();
+                if (!PageDirective.TryGetPageDirective(leadingDirectiveDocumentNode, out var _))
+                {
+                    // The page directive is not the leading directive. Add an error.
+                    pageDirective.DirectiveNode.Diagnostics.Add(
+                        RazorExtensionsDiagnosticFactory.CreatePageDirective_MustExistAtTheTopOfFile(pageDirective.DirectiveNode.Source.Value));
+                }
+            }
+        }
+
+        private class LeadingDirectiveParserOptionsFeature : RazorEngineFeatureBase, IConfigureRazorParserOptionsFeature
+        {
+            public int Order { get; }
+
+            public void Configure(RazorParserOptionsBuilder options)
+            {
+                options.ParseLeadingDirectives = true;
+            }
+        }
+
+        private static string BytesToString(byte[] bytes)
+        {
+            if (bytes == null)
+            {
+                throw new ArgumentNullException(nameof(bytes));
+            }
+
+            var result = new StringBuilder(bytes.Length);
+            for (var i = 0; i < bytes.Length; i++)
+            {
+                // The x2 format means lowercase hex, where each byte is a 2-character string.
+                result.Append(bytes[i].ToString("x2"));
+            }
+
+            return result.ToString();
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Resources.resx b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Resources.resx
new file mode 100644
index 0000000000..474537197e
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/Resources.resx
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ArgumentCannotBeNullOrEmpty" xml:space="preserve">
+    <value>Value cannot be null or empty.</value>
+  </data>
+  <data name="InjectDirective_Description" xml:space="preserve">
+    <value>Inject a service from the application's service container into a property.</value>
+  </data>
+  <data name="InjectDirective_MemberToken_Description" xml:space="preserve">
+    <value>The name of the property.</value>
+  </data>
+  <data name="InjectDirective_MemberToken_Name" xml:space="preserve">
+    <value>PropertyName</value>
+  </data>
+  <data name="InjectDirective_TypeToken_Description" xml:space="preserve">
+    <value>The type of the service to inject.</value>
+  </data>
+  <data name="InjectDirective_TypeToken_Name" xml:space="preserve">
+    <value>TypeName</value>
+  </data>
+  <data name="ModelDirective_Description" xml:space="preserve">
+    <value>Specify the view or page model for the page.</value>
+  </data>
+  <data name="ModelDirective_TypeToken_Description" xml:space="preserve">
+    <value>The model type.</value>
+  </data>
+  <data name="ModelDirective_TypeToken_Name" xml:space="preserve">
+    <value>TypeName</value>
+  </data>
+  <data name="MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword" xml:space="preserve">
+    <value>The 'inherits' keyword is not allowed when a '{0}' keyword is used.</value>
+  </data>
+  <data name="MvcRazorCodeParser_InjectDirectivePropertyNameRequired" xml:space="preserve">
+    <value>A property name must be specified when using the '{0}' statement. Format for a '{0}' statement is '@{0} &lt;Type Name&gt; &lt;Property Name&gt;'.</value>
+  </data>
+  <data name="MvcRazorCodeParser_KeywordMustBeFollowedByTypeName" xml:space="preserve">
+    <value>The '{0}' keyword must be followed by a type name on the same line.</value>
+  </data>
+  <data name="MvcRazorCodeParser_OnlyOneModelStatementIsAllowed" xml:space="preserve">
+    <value>Only one '{0}' statement is allowed in a file.</value>
+  </data>
+  <data name="MvcRazorParser_InvalidPropertyType" xml:space="preserve">
+    <value>Invalid tag helper property '{0}.{1}'. Dictionary values must not be of type '{2}'.</value>
+  </data>
+  <data name="NamespaceDirective_Description" xml:space="preserve">
+    <value>Specify the base namespace for the page.</value>
+  </data>
+  <data name="NamespaceDirective_NamespaceToken_Description" xml:space="preserve">
+    <value>The namespace for the page.</value>
+  </data>
+  <data name="NamespaceDirective_NamespaceToken_Name" xml:space="preserve">
+    <value>Namespace</value>
+  </data>
+  <data name="PageDirectiveCannotBeImported" xml:space="preserve">
+    <value>The '@{0}' directive specified in {1} file will not be imported. The directive must appear at the top of each Razor cshtml file.</value>
+  </data>
+  <data name="PageDirectiveMustExistAtTheTopOfFile" xml:space="preserve">
+    <value>The '@{0}' directive must precede all other elements defined in a Razor file.</value>
+  </data>
+  <data name="PageDirective_Description" xml:space="preserve">
+    <value>Mark the page as a Razor Page.</value>
+  </data>
+  <data name="PageDirective_RouteToken_Description" xml:space="preserve">
+    <value>An optional route template for the page.</value>
+  </data>
+  <data name="PageDirective_RouteToken_Name" xml:space="preserve">
+    <value>RouteTemplate</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/TagHelperDescriptorExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/TagHelperDescriptorExtensions.cs
new file mode 100644
index 0000000000..b7bd72ec70
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/TagHelperDescriptorExtensions.cs
@@ -0,0 +1,37 @@
+// 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;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public static class TagHelperDescriptorExtensions
+    {
+        /// <summary>
+        /// Indicates whether a <see cref="TagHelperDescriptor"/> represents a view component.
+        /// </summary>
+        /// <param name="tagHelper">The <see cref="TagHelperDescriptor"/> to check.</param>
+        /// <returns>Whether a <see cref="TagHelperDescriptor"/> represents a view component.</returns>
+        public static bool IsViewComponentKind(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            return string.Equals(ViewComponentTagHelperConventions.Kind, tagHelper.Kind, StringComparison.Ordinal);
+        }
+
+        public static string GetViewComponentName(this TagHelperDescriptor tagHelper)
+        {
+            if (tagHelper == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelper));
+            }
+
+            tagHelper.Metadata.TryGetValue(ViewComponentTagHelperMetadata.Name, out var result);
+            return result;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentResources.resx b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentResources.resx
new file mode 100644
index 0000000000..d6aad4ff3f
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentResources.resx
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ViewComponent_AmbiguousMethods" xml:space="preserve">
+    <value>View component '{0}' must have exactly one public method named '{1}' or '{2}'.</value>
+  </data>
+  <data name="ViewComponent_AsyncMethod_ShouldReturnTask" xml:space="preserve">
+    <value>Method '{0}' of view component '{1}' should be declared to return {2}&amp;lt;T&amp;gt;.</value>
+  </data>
+  <data name="ViewComponent_CannotFindMethod" xml:space="preserve">
+    <value>Could not find an '{0}' or '{1}' method for the view component '{2}'.</value>
+  </data>
+  <data name="ViewComponent_SyncMethod_CannotReturnTask" xml:space="preserve">
+    <value>Method '{0}' of view component '{1}' cannot return a {2}.</value>
+  </data>
+  <data name="ViewComponent_SyncMethod_ShouldReturnValue" xml:space="preserve">
+    <value>Method '{0}' of view component '{1}' should be declared to return a value.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperConventions.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperConventions.cs
new file mode 100644
index 0000000000..30e8d1c36f
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperConventions.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public static class ViewComponentTagHelperConventions
+    {
+        public static readonly string Kind = "MVC.ViewComponent";
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperDescriptorFactory.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperDescriptorFactory.cs
new file mode 100644
index 0000000000..0b1221af72
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperDescriptorFactory.cs
@@ -0,0 +1,284 @@
+// 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;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    internal class ViewComponentTagHelperDescriptorFactory
+    {
+        private readonly INamedTypeSymbol _viewComponentAttributeSymbol;
+        private readonly INamedTypeSymbol _genericTaskSymbol;
+        private readonly INamedTypeSymbol _taskSymbol;
+        private readonly INamedTypeSymbol _iDictionarySymbol;
+
+        private static readonly SymbolDisplayFormat FullNameTypeDisplayFormat =
+            SymbolDisplayFormat.FullyQualifiedFormat
+                .WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted)
+                .WithMiscellaneousOptions(SymbolDisplayFormat.FullyQualifiedFormat.MiscellaneousOptions & (~SymbolDisplayMiscellaneousOptions.UseSpecialTypes));
+
+        private static readonly IReadOnlyDictionary<string, string> PrimitiveDisplayTypeNameLookups = new Dictionary<string, string>(StringComparer.Ordinal)
+        {
+            [typeof(byte).FullName] = "byte",
+            [typeof(sbyte).FullName] = "sbyte",
+            [typeof(int).FullName] = "int",
+            [typeof(uint).FullName] = "uint",
+            [typeof(short).FullName] = "short",
+            [typeof(ushort).FullName] = "ushort",
+            [typeof(long).FullName] = "long",
+            [typeof(ulong).FullName] = "ulong",
+            [typeof(float).FullName] = "float",
+            [typeof(double).FullName] = "double",
+            [typeof(char).FullName] = "char",
+            [typeof(bool).FullName] = "bool",
+            [typeof(object).FullName] = "object",
+            [typeof(string).FullName] = "string",
+            [typeof(decimal).FullName] = "decimal",
+        };
+
+        public ViewComponentTagHelperDescriptorFactory(Compilation compilation)
+        {
+            _viewComponentAttributeSymbol = compilation.GetTypeByMetadataName(ViewComponentTypes.ViewComponentAttribute);
+            _genericTaskSymbol = compilation.GetTypeByMetadataName(ViewComponentTypes.GenericTask);
+            _taskSymbol = compilation.GetTypeByMetadataName(ViewComponentTypes.Task);
+            _iDictionarySymbol = compilation.GetTypeByMetadataName(ViewComponentTypes.IDictionary);
+        }
+
+        public virtual TagHelperDescriptor CreateDescriptor(INamedTypeSymbol type)
+        {
+            var assemblyName = type.ContainingAssembly.Name;
+            var shortName = GetShortName(type);
+            var tagName = $"vc:{HtmlConventions.ToHtmlCase(shortName)}";
+            var typeName = $"__Generated__{shortName}ViewComponentTagHelper";
+            var displayName = shortName + "ViewComponentTagHelper";
+            var descriptorBuilder = TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, typeName, assemblyName);
+            descriptorBuilder.SetTypeName(typeName);
+            descriptorBuilder.DisplayName = displayName;
+
+            if (TryFindInvokeMethod(type, out var method, out var diagnostic))
+            {
+                var methodParameters = method.Parameters;
+                descriptorBuilder.TagMatchingRule(ruleBuilder =>
+                {
+                    ruleBuilder.TagName = tagName;
+                    AddRequiredAttributes(methodParameters, ruleBuilder);
+                });
+
+                AddBoundAttributes(methodParameters, displayName, descriptorBuilder);
+            }
+            else
+            {
+                descriptorBuilder.Diagnostics.Add(diagnostic);
+            }
+
+            descriptorBuilder.Metadata[ViewComponentTagHelperMetadata.Name] = shortName;
+
+            var descriptor = descriptorBuilder.Build();
+            return descriptor;
+        }
+
+        private bool TryFindInvokeMethod(INamedTypeSymbol type, out IMethodSymbol method, out RazorDiagnostic diagnostic)
+        {
+            var methods = GetInvokeMethods(type);
+
+            if (methods.Count == 0)
+            {
+                diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_CannotFindMethod(type.ToDisplayString(FullNameTypeDisplayFormat));
+                method = null;
+                return false;
+            }
+            else if (methods.Count > 1)
+            {
+                diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_AmbiguousMethods(type.ToDisplayString(FullNameTypeDisplayFormat));
+                method = null;
+                return false;
+            }
+
+            var selectedMethod = methods[0];
+            var returnType = selectedMethod.ReturnType as INamedTypeSymbol;
+            if (string.Equals(selectedMethod.Name, ViewComponentTypes.AsyncMethodName, StringComparison.Ordinal))
+            {
+                // Will invoke asynchronously. Method must not return Task or Task<T>.
+                if (returnType == _taskSymbol)
+                {
+                    // This is ok.
+                }
+                else if (returnType.IsGenericType && returnType.ConstructedFrom == _genericTaskSymbol)
+                {
+                    // This is ok.
+                }
+                else
+                {
+                    diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_AsyncMethod_ShouldReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
+                    method = null;
+                    return false;
+                }
+            }
+            else
+            {
+                // Will invoke synchronously. Method must not return void, Task or Task<T>.
+                if (returnType.SpecialType == SpecialType.System_Void)
+                {
+                    diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_ShouldReturnValue(type.ToDisplayString(FullNameTypeDisplayFormat));
+                    method = null;
+                    return false;
+                }
+                else if (returnType == _taskSymbol)
+                {
+                    diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
+                    method = null;
+                    return false;
+                }
+                else if (returnType.IsGenericType && returnType.ConstructedFrom == _genericTaskSymbol)
+                {
+                    diagnostic = RazorExtensionsDiagnosticFactory.CreateViewComponent_SyncMethod_CannotReturnTask(type.ToDisplayString(FullNameTypeDisplayFormat));
+                    method = null;
+                    return false;
+                }
+            }
+
+            method = selectedMethod;
+            diagnostic = null;
+            return true;
+        }
+
+        private static IReadOnlyList<IMethodSymbol> GetInvokeMethods(INamedTypeSymbol type)
+        {
+            var methods = new List<IMethodSymbol>();
+            while (type != null)
+            {
+                var currentTypeMethods = type.GetMembers()
+                    .OfType<IMethodSymbol>()
+                    .Where(m =>
+                        m.DeclaredAccessibility == Accessibility.Public &&
+                        !m.IsStatic &&
+                        (string.Equals(m.Name, ViewComponentTypes.AsyncMethodName, StringComparison.Ordinal) ||
+                        string.Equals(m.Name, ViewComponentTypes.SyncMethodName, StringComparison.Ordinal)));
+
+                methods.AddRange(currentTypeMethods);
+
+                type = type.BaseType;
+            }
+
+            return methods;
+        }
+
+        private void AddRequiredAttributes(ImmutableArray<IParameterSymbol> methodParameters, TagMatchingRuleDescriptorBuilder builder)
+        {
+            foreach (var parameter in methodParameters)
+            {
+                if (GetIndexerValueTypeName(parameter) == null)
+                {
+                    // Set required attributes only for non-indexer attributes. Indexer attributes can't be required attributes
+                    // because there are two ways of setting values for the attribute.
+                    builder.Attribute(attributeBuilder =>
+                    {
+                        var lowerKebabName = HtmlConventions.ToHtmlCase(parameter.Name);
+                        attributeBuilder.Name = lowerKebabName;
+                    });
+                }
+            }
+        }
+
+        private void AddBoundAttributes(ImmutableArray<IParameterSymbol> methodParameters, string containingDisplayName, TagHelperDescriptorBuilder builder)
+        {
+            foreach (var parameter in methodParameters)
+            {
+                var lowerKebabName = HtmlConventions.ToHtmlCase(parameter.Name);
+                var typeName = parameter.Type.ToDisplayString(FullNameTypeDisplayFormat);
+
+                if (!PrimitiveDisplayTypeNameLookups.TryGetValue(typeName, out var simpleName))
+                {
+                    simpleName = typeName;
+                }
+
+                builder.BindAttribute(attributeBuilder =>
+                {
+                    attributeBuilder.Name = lowerKebabName;
+                    attributeBuilder.TypeName = typeName;
+                    attributeBuilder.DisplayName = $"{simpleName} {containingDisplayName}.{parameter.Name}";
+                    attributeBuilder.SetPropertyName(parameter.Name);
+
+                    if (parameter.Type.TypeKind == TypeKind.Enum)
+                    {
+                        attributeBuilder.IsEnum = true;
+                    }
+                    else
+                    {
+                        var dictionaryValueType = GetIndexerValueTypeName(parameter);
+                        if (dictionaryValueType != null)
+                        {
+                            attributeBuilder.AsDictionary(lowerKebabName + "-", dictionaryValueType);
+                        }
+                    }
+                });
+            }
+        }
+
+        private string GetIndexerValueTypeName(IParameterSymbol parameter)
+        {
+            INamedTypeSymbol dictionaryType;
+            if ((parameter.Type as INamedTypeSymbol)?.ConstructedFrom == _iDictionarySymbol)
+            {
+                dictionaryType = (INamedTypeSymbol)parameter.Type;
+            }
+            else if (parameter.Type.AllInterfaces.Any(s => s.ConstructedFrom == _iDictionarySymbol))
+            {
+                dictionaryType = parameter.Type.AllInterfaces.First(s => s.ConstructedFrom == _iDictionarySymbol);
+            }
+            else
+            {
+                dictionaryType = null;
+            }
+
+            if (dictionaryType == null || dictionaryType.TypeArguments[0].SpecialType != SpecialType.System_String)
+            {
+                return null;
+            }
+
+            var type = dictionaryType.TypeArguments[1];
+            var typeName = type.ToDisplayString(FullNameTypeDisplayFormat);
+
+            return typeName;
+        }
+
+        private string GetShortName(INamedTypeSymbol componentType)
+        {
+            var viewComponentAttribute = componentType.GetAttributes().Where(a => a.AttributeClass == _viewComponentAttributeSymbol).FirstOrDefault();
+            var name = viewComponentAttribute
+                ?.NamedArguments
+                .Where(namedArgument => string.Equals(namedArgument.Key, ViewComponentTypes.ViewComponent.Name, StringComparison.Ordinal))
+                .FirstOrDefault()
+                .Value
+                .Value as string;
+
+            if (!string.IsNullOrEmpty(name))
+            {
+                var separatorIndex = name.LastIndexOf('.');
+                if (separatorIndex >= 0)
+                {
+                    return name.Substring(separatorIndex + 1);
+                }
+                else
+                {
+                    return name;
+                }
+            }
+
+            // Get name by convention
+            if (componentType.Name.EndsWith(ViewComponentTypes.ViewComponentSuffix, StringComparison.OrdinalIgnoreCase))
+            {
+                return componentType.Name.Substring(0, componentType.Name.Length - ViewComponentTypes.ViewComponentSuffix.Length);
+            }
+            else
+            {
+                return componentType.Name;
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperDescriptorProvider.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperDescriptorProvider.cs
new file mode 100644
index 0000000000..4806acc806
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperDescriptorProvider.cs
@@ -0,0 +1,72 @@
+// 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;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Razor;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public sealed class ViewComponentTagHelperDescriptorProvider : RazorEngineFeatureBase, ITagHelperDescriptorProvider
+    {
+        public int Order { get; set; }
+
+        public void Execute(TagHelperDescriptorProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var compilation = context.GetCompilation();
+            if (compilation == null)
+            {
+                // No compilation, nothing to do.
+                return;
+            }
+
+            var vcAttribute = compilation.GetTypeByMetadataName(ViewComponentTypes.ViewComponentAttribute);
+            var nonVCAttribute = compilation.GetTypeByMetadataName(ViewComponentTypes.NonViewComponentAttribute);
+            if (vcAttribute == null || vcAttribute.TypeKind == TypeKind.Error)
+            {
+                // Could not find attributes we care about in the compilation. Nothing to do.
+                return;
+            }
+
+            var types = new List<INamedTypeSymbol>();
+            var visitor = new ViewComponentTypeVisitor(vcAttribute, nonVCAttribute, types);
+
+            // We always visit the global namespace.
+            visitor.Visit(compilation.Assembly.GlobalNamespace);
+
+            foreach (var reference in compilation.References)
+            {
+                if (compilation.GetAssemblyOrModuleSymbol(reference) is IAssemblySymbol assembly)
+                {
+                    if (IsTagHelperAssembly(assembly))
+                    {
+                        visitor.Visit(assembly.GlobalNamespace);
+                    }
+                }
+            }
+
+            var factory = new ViewComponentTagHelperDescriptorFactory(compilation);
+            for (var i = 0; i < types.Count; i++)
+            {
+                var descriptor = factory.CreateDescriptor(types[i]);
+
+                if (descriptor != null)
+                {
+                    context.Results.Add(descriptor);
+                }
+            }
+        }
+
+        private bool IsTagHelperAssembly(IAssemblySymbol assembly)
+        {
+            return assembly.Name != null && !assembly.Name.StartsWith("System.", StringComparison.Ordinal);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperIntermediateNode.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperIntermediateNode.cs
new file mode 100644
index 0000000000..a42b88416b
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperIntermediateNode.cs
@@ -0,0 +1,59 @@
+// 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;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public sealed class ViewComponentTagHelperIntermediateNode : ExtensionIntermediateNode
+    {
+        public override IntermediateNodeCollection Children { get; } = IntermediateNodeCollection.ReadOnly;
+
+        public string ClassName { get; set; }
+
+        public TagHelperDescriptor TagHelper { get; set; }
+
+        public override void Accept(IntermediateNodeVisitor visitor)
+        {
+            if (visitor == null)
+            {
+                throw new ArgumentNullException(nameof(visitor));
+            }
+
+            AcceptExtensionNode<ViewComponentTagHelperIntermediateNode>(this, visitor);
+        }
+
+        public override void WriteNode(CodeTarget target, CodeRenderingContext context)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var extension = target.GetExtension<IViewComponentTagHelperTargetExtension>();
+            if (extension == null)
+            {
+                ReportMissingCodeTargetExtension<IViewComponentTagHelperTargetExtension>(context);
+                return;
+            }
+
+            extension.WriteViewComponentTagHelper(context, this);
+        }
+
+        public override void FormatNode(IntermediateNodeFormatter formatter)
+        {
+            formatter.WriteContent(ClassName);
+
+            formatter.WriteProperty(nameof(ClassName), ClassName);
+            formatter.WriteProperty(nameof(TagHelper), TagHelper?.DisplayName);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperMetadata.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperMetadata.cs
new file mode 100644
index 0000000000..ad77c7a29e
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperMetadata.cs
@@ -0,0 +1,14 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public static class ViewComponentTagHelperMetadata
+    {
+        /// <summary>
+        /// The key in a <see cref="Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor.Metadata"/>  containing 
+        /// the short name of a view component.
+        /// </summary>
+        public static readonly string Name = "MVC.ViewComponent.Name";
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperPass.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperPass.cs
new file mode 100644
index 0000000000..f5c37eb13b
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperPass.cs
@@ -0,0 +1,203 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class ViewComponentTagHelperPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        // Run after the default taghelper pass
+        public override int Order => IntermediateNodePassBase.DefaultFeatureOrder + 2000;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            var @namespace = documentNode.FindPrimaryNamespace();
+            var @class = documentNode.FindPrimaryClass();
+            if (@namespace == null || @class == null)
+            {
+                // Nothing to do, bail. We can't function without the standard structure.
+                return;
+            }
+
+            var context = new Context(@namespace, @class);
+
+            // For each VCTH *usage* we need to rewrite the tag helper node to use the tag helper runtime to construct
+            // and set properties on the the correct field, and using the name of the type we will generate.
+            var nodes = documentNode.FindDescendantNodes<TagHelperIntermediateNode>();
+            for (var i = 0; i < nodes.Count; i++)
+            {
+                var node = nodes[i];
+                foreach (var tagHelper in node.TagHelpers)
+                {
+                    RewriteUsage(context, node, tagHelper);
+                }
+            }
+
+            // Then for each VCTH *definition* that we've seen we need to generate the class that implements
+            // ITagHelper and the field that will hold it.
+            foreach (var tagHelper in context.TagHelpers)
+            {
+                AddField(context, tagHelper);
+                AddTagHelperClass(context, tagHelper);
+            }
+        }
+
+        private void RewriteUsage(Context context, TagHelperIntermediateNode node, TagHelperDescriptor tagHelper)
+        {
+            if (!tagHelper.IsViewComponentKind())
+            {
+                return;
+            }
+
+            context.Add(tagHelper);
+
+            // Now we need to insert a create node using the default tag helper runtime. This is similar to
+            // code in DefaultTagHelperOptimizationPass.
+            //
+            // Find the body node.
+            var i = 0;
+            while (i < node.Children.Count && node.Children[i] is TagHelperBodyIntermediateNode)
+            {
+                i++;
+            }
+            while (i < node.Children.Count && node.Children[i] is DefaultTagHelperBodyIntermediateNode)
+            {
+                i++;
+            }
+
+            // Now find the last create node.
+            while (i < node.Children.Count && node.Children[i] is DefaultTagHelperCreateIntermediateNode)
+            {
+                i++;
+            }
+
+            // Now i has the right insertion point.
+            node.Children.Insert(i, new DefaultTagHelperCreateIntermediateNode()
+            {
+                FieldName = context.GetFieldName(tagHelper),
+                TagHelper = tagHelper,
+                TypeName = context.GetFullyQualifiedName(tagHelper),
+            });
+
+            // Now we need to rewrite any set property nodes to use the default runtime.
+            for (i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is TagHelperPropertyIntermediateNode propertyNode &&
+                    propertyNode.TagHelper == tagHelper)
+                {
+                    // This is a set property for this VCTH - we need to replace it with a node
+                    // that will use our field and property name.
+                    node.Children[i] = new DefaultTagHelperPropertyIntermediateNode(propertyNode)
+                    {
+                        FieldName = context.GetFieldName(tagHelper),
+                        PropertyName = propertyNode.BoundAttribute.GetPropertyName(),
+                    };
+                }
+            }
+        }
+
+        private void AddField(Context context, TagHelperDescriptor tagHelper)
+        {
+            // We need to insert a node for the field that will hold the tag helper. We've already generated a field name
+            // at this time and use it for all uses of the same tag helper type.
+            //
+            // We also want to preserve the ordering of the nodes for testability. So insert at the end of any existing
+            // field nodes.
+            var i = 0;
+            while (i < context.Class.Children.Count && context.Class.Children[i] is DefaultTagHelperRuntimeIntermediateNode)
+            {
+                i++;
+            }
+
+            while (i < context.Class.Children.Count && context.Class.Children[i] is FieldDeclarationIntermediateNode)
+            {
+                i++;
+            }
+
+            context.Class.Children.Insert(i, new FieldDeclarationIntermediateNode()
+            {
+                Annotations =
+                {
+                    { CommonAnnotations.DefaultTagHelperExtension.TagHelperField, bool.TrueString },
+                },
+                Modifiers =
+                {
+                    "private",
+                },
+                FieldName = context.GetFieldName(tagHelper),
+                FieldType = "global::" + context.GetFullyQualifiedName(tagHelper),
+            });
+        }
+
+        private void AddTagHelperClass(Context context, TagHelperDescriptor tagHelper)
+        {
+            var node = new ViewComponentTagHelperIntermediateNode()
+            {
+                ClassName = context.GetClassName(tagHelper),
+                TagHelper = tagHelper
+            };
+
+            context.Class.Children.Add(node);
+        }
+
+        private struct Context
+        {
+            private Dictionary<TagHelperDescriptor, (string className, string fullyQualifiedName, string fieldName)> _tagHelpers;
+
+            public Context(NamespaceDeclarationIntermediateNode @namespace, ClassDeclarationIntermediateNode @class)
+            {
+                Namespace = @namespace;
+                Class = @class;
+
+                _tagHelpers = new Dictionary<TagHelperDescriptor, (string, string, string)>();
+            }
+
+            public ClassDeclarationIntermediateNode Class { get; }
+
+            public NamespaceDeclarationIntermediateNode Namespace { get; }
+
+
+            public IEnumerable<TagHelperDescriptor> TagHelpers => _tagHelpers.Keys;
+
+            public bool Add(TagHelperDescriptor tagHelper)
+            {
+                if (_tagHelpers.ContainsKey(tagHelper))
+                {
+                    return false;
+                }
+
+                var className = $"__Generated__{tagHelper.GetViewComponentName()}ViewComponentTagHelper";
+                var fullyQualifiedName = $"{Namespace.Content}.{Class.ClassName}.{className}";
+                var fieldName = GenerateFieldName(tagHelper);
+
+                _tagHelpers.Add(tagHelper, (className, fullyQualifiedName, fieldName));
+
+                return true;
+            }
+
+            public string GetClassName(TagHelperDescriptor taghelper)
+            {
+                return _tagHelpers[taghelper].className;
+            }
+
+            public string GetFullyQualifiedName(TagHelperDescriptor taghelper)
+            {
+                return _tagHelpers[taghelper].fullyQualifiedName;
+            }
+
+            public string GetFieldName(TagHelperDescriptor taghelper)
+            {
+                return _tagHelpers[taghelper].fieldName;
+            }
+
+            private static string GenerateFieldName(TagHelperDescriptor tagHelper)
+            {
+                return $"__{tagHelper.GetViewComponentName()}ViewComponentTagHelper";
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperTargetExtension.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperTargetExtension.cs
new file mode 100644
index 0000000000..a56e86fdca
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTagHelperTargetExtension.cs
@@ -0,0 +1,183 @@
+// 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.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    internal class ViewComponentTagHelperTargetExtension : IViewComponentTagHelperTargetExtension
+    {
+        private static readonly string[] PublicModifiers = new[] { "public" };
+
+        public string TagHelperTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper";
+
+        public string ViewComponentHelperTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.IViewComponentHelper";
+
+        public string ViewComponentHelperVariableName { get; set; } = "_helper";
+
+        public string ViewComponentInvokeMethodName { get; set; } = "InvokeAsync";
+
+        public string HtmlAttributeNotBoundAttributeTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute";
+
+        public string ViewContextAttributeTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute";
+
+        public string ViewContextTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext";
+
+        public string ViewContextPropertyName { get; set; } = "ViewContext";
+
+        public string HtmlTargetElementAttributeTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute";
+
+        public string TagHelperProcessMethodName { get; set; } = "ProcessAsync";
+
+        public string TagHelperContextTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext";
+
+        public string TagHelperContextVariableName { get; set; } = "context";
+
+        public string TagHelperOutputTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput";
+
+        public string TagHelperOutputVariableName { get; set; } = "output";
+
+        public string TagHelperOutputTagNamePropertyName { get; set; } = "TagName";
+
+        public string TagHelperOutputContentPropertyName { get; set; } = "Content";
+
+        public string TagHelperContentSetMethodName { get; set; } = "SetHtmlContent";
+
+        public string TagHelperContentVariableName { get; set; } = "content";
+
+        public string IViewContextAwareTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware";
+
+        public string IViewContextAwareContextualizeMethodName { get; set; } = "Contextualize";
+
+        public void WriteViewComponentTagHelper(CodeRenderingContext context, ViewComponentTagHelperIntermediateNode node)
+        {
+            // Add target element.
+            WriteTargetElementString(context.CodeWriter, node.TagHelper);
+
+            // Initialize declaration.
+            using (context.CodeWriter.BuildClassDeclaration(
+                PublicModifiers,
+                node.ClassName,
+                TagHelperTypeName,
+                interfaces: null,
+                typeParameters: null))
+            {
+                // Add view component helper.
+                context.CodeWriter.WriteVariableDeclaration(
+                    $"private readonly {ViewComponentHelperTypeName}",
+                    ViewComponentHelperVariableName,
+                    value: null);
+
+                // Add constructor.
+                WriteConstructorString(context.CodeWriter, node.ClassName);
+
+                // Add attributes.
+                WriteAttributeDeclarations(context.CodeWriter, node.TagHelper);
+
+                // Add process method.
+                WriteProcessMethodString(context.CodeWriter, node.TagHelper);
+            }
+        }
+
+        private void WriteConstructorString(CodeWriter writer, string className)
+        {
+            writer.Write("public ")
+                .Write(className)
+                .Write("(")
+                .Write($"{ViewComponentHelperTypeName} helper")
+                .WriteLine(")");
+            using (writer.BuildScope())
+            {
+                writer.WriteStartAssignment(ViewComponentHelperVariableName)
+                    .Write("helper")
+                    .WriteLine(";");
+            }
+        }
+
+        private void WriteAttributeDeclarations(CodeWriter writer, TagHelperDescriptor tagHelper)
+        {
+            writer.Write("[")
+              .Write(HtmlAttributeNotBoundAttributeTypeName)
+              .WriteParameterSeparator()
+              .Write(ViewContextAttributeTypeName)
+              .WriteLine("]");
+
+            writer.WriteAutoPropertyDeclaration(
+                PublicModifiers,
+                ViewContextTypeName,
+                ViewContextPropertyName);
+
+            foreach (var attribute in tagHelper.BoundAttributes)
+            {
+                writer.WriteAutoPropertyDeclaration(
+                    PublicModifiers,
+                    attribute.TypeName,
+                    attribute.GetPropertyName());
+
+                if (attribute.IndexerTypeName != null)
+                {
+                    writer.Write(" = ")
+                        .WriteStartNewObject(attribute.TypeName)
+                        .WriteEndMethodInvocation();
+                }
+            }
+        }
+
+        private void WriteProcessMethodString(CodeWriter writer, TagHelperDescriptor tagHelper)
+        {
+            using (writer.BuildMethodDeclaration(
+                    $"public override async",
+                    $"global::{typeof(Task).FullName}",
+                    TagHelperProcessMethodName,
+                    new Dictionary<string, string>()
+                    {
+                        { TagHelperContextTypeName, TagHelperContextVariableName },
+                        { TagHelperOutputTypeName, TagHelperOutputVariableName }
+                    }))
+            {
+                writer.WriteInstanceMethodInvocation(
+                    $"({ViewComponentHelperVariableName} as {IViewContextAwareTypeName})?",
+                    IViewContextAwareContextualizeMethodName,
+                    new[] { ViewContextPropertyName });
+
+                var methodParameters = GetMethodParameters(tagHelper);
+                writer.Write("var ")
+                    .WriteStartAssignment(TagHelperContentVariableName)
+                    .WriteInstanceMethodInvocation($"await {ViewComponentHelperVariableName}", ViewComponentInvokeMethodName, methodParameters);
+                writer.WriteStartAssignment($"{TagHelperOutputVariableName}.{TagHelperOutputTagNamePropertyName}")
+                    .WriteLine("null;");
+                writer.WriteInstanceMethodInvocation(
+                    $"{TagHelperOutputVariableName}.{TagHelperOutputContentPropertyName}",
+                    TagHelperContentSetMethodName,
+                    new[] { TagHelperContentVariableName });
+            }
+        }
+
+        private string[] GetMethodParameters(TagHelperDescriptor tagHelper)
+        {
+            var propertyNames = tagHelper.BoundAttributes.Select(attribute => attribute.GetPropertyName());
+            var joinedPropertyNames = string.Join(", ", propertyNames);
+            var parametersString = $"new {{ { joinedPropertyNames } }}";
+            var viewComponentName = tagHelper.GetViewComponentName();
+            var methodParameters = new[] { $"\"{viewComponentName}\"", parametersString };
+            return methodParameters;
+        }
+
+        private void WriteTargetElementString(CodeWriter writer, TagHelperDescriptor tagHelper)
+        {
+            Debug.Assert(tagHelper.TagMatchingRules.Count() == 1);
+
+            var rule = tagHelper.TagMatchingRules.First();
+
+            writer.Write("[")
+                .WriteStartMethodInvocation(HtmlTargetElementAttributeTypeName)
+                .WriteStringLiteral(rule.TagName)
+                .WriteLine(")]");
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTypeVisitor.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTypeVisitor.cs
new file mode 100644
index 0000000000..01eb3fffaa
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTypeVisitor.cs
@@ -0,0 +1,88 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    internal class ViewComponentTypeVisitor : SymbolVisitor
+    {
+        private readonly INamedTypeSymbol _viewComponentAttribute;
+        private readonly INamedTypeSymbol _nonViewComponentAttribute;
+        private readonly List<INamedTypeSymbol> _results;
+
+        public ViewComponentTypeVisitor(
+            INamedTypeSymbol viewComponentAttribute,
+            INamedTypeSymbol nonViewComponentAttribute,
+            List<INamedTypeSymbol> results)
+        {
+            _viewComponentAttribute = viewComponentAttribute;
+            _nonViewComponentAttribute = nonViewComponentAttribute;
+            _results = results;
+        }
+
+        public override void VisitNamedType(INamedTypeSymbol symbol)
+        {
+            if (IsViewComponent(symbol))
+            {
+                _results.Add(symbol);
+            }
+
+            if (symbol.DeclaredAccessibility != Accessibility.Public)
+            {
+                return;
+            }
+
+            foreach (var member in symbol.GetTypeMembers())
+            {
+                Visit(member);
+            }
+        }
+
+        public override void VisitNamespace(INamespaceSymbol symbol)
+        {
+            foreach (var member in symbol.GetMembers())
+            {
+                Visit(member);
+            }
+        }
+
+        internal bool IsViewComponent(INamedTypeSymbol symbol)
+        {
+            if (_viewComponentAttribute == null)
+            {
+                return false;
+            }
+
+            if (symbol.DeclaredAccessibility != Accessibility.Public ||
+                symbol.IsAbstract ||
+                symbol.IsGenericType ||
+                AttributeIsDefined(symbol, _nonViewComponentAttribute))
+            {
+                return false;
+            }
+
+            return symbol.Name.EndsWith(ViewComponentTypes.ViewComponentSuffix) ||
+                AttributeIsDefined(symbol, _viewComponentAttribute);
+        }
+
+        private static bool AttributeIsDefined(INamedTypeSymbol type, INamedTypeSymbol queryAttribute)
+        {
+            if (type == null || queryAttribute == null)
+            {
+                return false;
+            }
+
+            var attribute = type.GetAttributes().Where(a => a.AttributeClass == queryAttribute).FirstOrDefault();
+
+            if (attribute != null)
+            {
+                return true;
+            }
+
+            return AttributeIsDefined(type.BaseType, queryAttribute);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTypes.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTypes.cs
new file mode 100644
index 0000000000..cd7e2771be
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/ViewComponentTypes.cs
@@ -0,0 +1,35 @@
+// 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;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    internal static class ViewComponentTypes
+    {
+        public const string Assembly = "Microsoft.AspNetCore.Mvc.ViewFeatures";
+
+        public static readonly Version AssemblyVersion = new Version(1, 1, 0, 0);
+
+        public const string ViewComponentSuffix = "ViewComponent";
+
+        public const string ViewComponentAttribute = "Microsoft.AspNetCore.Mvc.ViewComponentAttribute";
+
+        public const string NonViewComponentAttribute = "Microsoft.AspNetCore.Mvc.NonViewComponentAttribute";
+
+        public const string GenericTask = "System.Threading.Tasks.Task`1";
+
+        public const string Task = "System.Threading.Tasks.Task";
+
+        public const string IDictionary = "System.Collections.Generic.IDictionary`2";
+
+        public const string AsyncMethodName = "InvokeAsync";
+
+        public const string SyncMethodName = "Invoke";
+
+        public static class ViewComponent
+        {
+            public const string Name = "Name";
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/baseline.netcore.json b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/baseline.netcore.json
new file mode 100644
index 0000000000..87b3d074f3
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/baseline.netcore.json
@@ -0,0 +1,1180 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.AssemblyAttributeInjectionPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IInjectTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteInjectProperty",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_TypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MemberName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MemberName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IInjectTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteInjectProperty",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IInjectTargetExtension",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InstrumentationPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IViewComponentTagHelperTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteViewComponentTagHelper",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ModelDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetModelType",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ModelExpressionPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.MvcViewDocumentClassifierPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.DocumentClassifierPassBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsMatch",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnDocumentStructureCreated",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "namespace",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode"
+            },
+            {
+              "Name": "class",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "MvcViewDocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.NamespaceDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.PageDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_RouteTemplate",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DirectiveNode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryGetPageDirective",
+          "Parameters": [
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            },
+            {
+              "Name": "pageDirective",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.PageDirective",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.PagesPropertyInjectionPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.RazorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.RazorPageDocumentClassifierPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.DocumentClassifierPassBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsMatch",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnDocumentStructureCreated",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "namespace",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode"
+            },
+            {
+              "Name": "class",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "RazorPageDocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "RouteTemplateKey",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.TagHelperDescriptorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "IsViewComponentKind",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetViewComponentName",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperConventions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Kind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperDescriptorProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.RazorEngineFeatureBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ClassName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ClassName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelper",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagHelper",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperMetadata",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriterExtensions+CSharpCodeWritingScope",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IDisposable"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "writer",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter"
+            },
+            {
+              "Name": "tabSize",
+              "Type": "System.Int32",
+              "DefaultValue": "4"
+            },
+            {
+              "Name": "autoSpace",
+              "Type": "System.Boolean",
+              "DefaultValue": "True"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTypes+ViewComponent",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"Name\""
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/baseline.netframework.json b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/baseline.netframework.json
new file mode 100644
index 0000000000..9386496226
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/baseline.netframework.json
@@ -0,0 +1,982 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.AssemblyAttributeInjectionPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IInjectTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.CodeGeneration.ICodeTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteInjectProperty",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectIntermediateNode",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.Intermediate.ExtensionIntermediateNode",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_TypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MemberName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MemberName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeVisitor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteNode",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeTarget"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectTargetExtension",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IInjectTargetExtension"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteInjectProperty",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeRenderingContext"
+            },
+            {
+              "Name": "node",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InjectIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IInjectTargetExtension",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.InstrumentationPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ModelDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetModelType",
+          "Parameters": [
+            {
+              "Name": "document",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ModelExpressionPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.MvcViewDocumentClassifierPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.DocumentClassifierPassBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsMatch",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnDocumentStructureCreated",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "namespace",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode"
+            },
+            {
+              "Name": "class",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "MvcViewDocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.NamespaceDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.PageDirective",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_RouteTemplate",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DirectiveNode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryGetPageDirective",
+          "Parameters": [
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            },
+            {
+              "Name": "pageDirective",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.PageDirective",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Directive",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Language.DirectiveDescriptor",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.PagesPropertyInjectionPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.RazorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Register",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectEngineBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.RazorPageDocumentClassifierPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.DocumentClassifierPassBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsMatch",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnDocumentStructureCreated",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "namespace",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.NamespaceDeclarationIntermediateNode"
+            },
+            {
+              "Name": "class",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.ClassDeclarationIntermediateNode"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.MethodDeclarationIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "RazorPageDocumentKind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.TagHelperDescriptorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "IsViewComponentKind",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetViewComponentName",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptor"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperConventions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Kind",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperDescriptorProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.RazorEngineFeatureBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.Language.TagHelperDescriptorProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.ITagHelperDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperMetadata",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTagHelperPass",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteCore",
+          "Parameters": [
+            {
+              "Name": "codeDocument",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorCodeDocument"
+            },
+            {
+              "Name": "documentNode",
+              "Type": "Microsoft.AspNetCore.Razor.Language.Intermediate.DocumentIntermediateNode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriterExtensions+CSharpCodeWritingScope",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IDisposable"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "writer",
+              "Type": "Microsoft.AspNetCore.Razor.Language.CodeGeneration.CodeWriter"
+            },
+            {
+              "Name": "tabSize",
+              "Type": "System.Int32",
+              "DefaultValue": "4"
+            },
+            {
+              "Name": "autoSpace",
+              "Type": "System.Boolean",
+              "DefaultValue": "True"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.ViewComponentTypes+ViewComponent",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "\"Name\""
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ExtensionInitializer.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ExtensionInitializer.cs
index eeb3246f74..8c650ebedb 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ExtensionInitializer.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ExtensionInitializer.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Components;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirective.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirective.cs
index fcb874dc29..4282ea559f 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirective.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirective.cs
@@ -44,6 +44,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             
             protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
             {
+                if (documentNode.DocumentKind != RazorPageDocumentClassifierPass.RazorPageDocumentKind &&
+                   documentNode.DocumentKind != MvcViewDocumentClassifierPass.MvcViewDocumentKind)
+                {
+                    // Not a MVC file. Skip.
+                    return;
+                }
+
                 var visitor = new Visitor();
                 visitor.Visit(documentNode);
                 var modelType = ModelDirective.GetModelType(documentNode);
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj
index 401d07c030..afa5ecd679 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj
@@ -2,19 +2,14 @@
 
   <PropertyGroup>
     <Description>ASP.NET Core design time hosting infrastructure for the Razor view engine.</Description>
-    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <PackageTags>$(PackageTags);aspnetcoremvc</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\Microsoft.AspNetCore.Razor.Language\CodeGeneration\CodeWriterExtensions.cs">
-      <Link>Shared\CodeWriterExtensions.cs</Link>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="build\**\*.props" PackagePath="build\" />
-    <Content Include="build\**\*.targets" PackagePath="build\" />
+    <Compile Include="..\Microsoft.AspNetCore.Razor.Language\CodeGeneration\CodeWriterExtensions.cs" Link="Shared\CodeWriterExtensions.cs" />
+    <Compile Include="..\Microsoft.AspNetCore.Razor.Language\CSharpIdentifier.cs" Link="Shared\CSharpIdentifier.cs" />
+    <Compile Include="..\Microsoft.AspNetCore.Razor.Language\Checksum.cs" Link="Shared\Checksum.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/MvcViewDocumentClassifierPass.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/MvcViewDocumentClassifierPass.cs
index 57e9ad23a2..975cf90666 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/MvcViewDocumentClassifierPass.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/MvcViewDocumentClassifierPass.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Text;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
@@ -31,12 +30,12 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             {
                 // It's possible for a Razor document to not have a file path.
                 // Eg. When we try to generate code for an in memory document like default imports.
-                var checksum = BytesToString(codeDocument.Source.GetChecksum());
+                var checksum = Checksum.BytesToString(codeDocument.Source.GetChecksum());
                 @class.ClassName = $"AspNetCore_{checksum}";
             }
             else
             {
-                @class.ClassName = CSharpIdentifier.GetClassNameFromPath(filePath);
+                @class.ClassName = GetClassNameFromPath(filePath);
             }
 
             @class.BaseType = "global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>";
@@ -51,21 +50,21 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             method.ReturnType = $"global::{typeof(System.Threading.Tasks.Task).FullName}";
         }
 
-        private static string BytesToString(byte[] bytes)
+        private static string GetClassNameFromPath(string path)
         {
-            if (bytes == null)
+            const string cshtmlExtension = ".cshtml";
+
+            if (string.IsNullOrEmpty(path))
             {
-                throw new ArgumentNullException(nameof(bytes));
+                return path;
             }
 
-            var result = new StringBuilder(bytes.Length);
-            for (var i = 0; i < bytes.Length; i++)
+            if (path.EndsWith(cshtmlExtension, StringComparison.OrdinalIgnoreCase))
             {
-                // The x2 format means lowercase hex, where each byte is a 2-character string.
-                result.Append(bytes[i].ToString("x2"));
+                path = path.Substring(0, path.Length - cshtmlExtension.Length);
             }
 
-            return result.ToString();
+            return CSharpIdentifier.SanitizeIdentifier(path);
         }
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/NamespaceDirective.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/NamespaceDirective.cs
index ea3bc40bc1..1a809c0629 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/NamespaceDirective.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/NamespaceDirective.cs
@@ -115,7 +115,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             for (var i = 0; i < segments.Length - 1; i++)
             {
                 builder.Append('.');
-                builder.Append(CSharpIdentifier.SanitizeClassName(segments[i]));
+                builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[i]));
             }
 
             return builder.ToString();
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Properties/AssemblyInfo.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Properties/AssemblyInfo.cs
index b5caca17dd..7d8a47bc67 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Properties/AssemblyInfo.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/Properties/AssemblyInfo.cs
@@ -5,8 +5,7 @@ using System.Runtime.CompilerServices;
 using Microsoft.AspNetCore.Mvc.Razor.Extensions;
 using Microsoft.AspNetCore.Razor.Language;
 
-[assembly: ProvideRazorExtensionInitializer("MVC-2.0", typeof(ExtensionInitializer))]
-[assembly: ProvideRazorExtensionInitializer("MVC-2.1", typeof(ExtensionInitializer))]
+[assembly: ProvideRazorExtensionInitializer("MVC-3.0", typeof(ExtensionInitializer))]
 
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorExtensions.cs
index ff5fcaad68..04febb17d6 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorExtensions.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorExtensions.cs
@@ -22,7 +22,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             NamespaceDirective.Register(builder);
             PageDirective.Register(builder);
 
-            FunctionsDirective.Register(builder);
             InheritsDirective.Register(builder);
             SectionDirective.Register(builder);
 
@@ -41,50 +40,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             builder.Features.Add(new RazorPageDocumentClassifierPass());
             builder.Features.Add(new MvcViewDocumentClassifierPass());
             builder.Features.Add(new AssemblyAttributeInjectionPass());
-            builder.Features.Add(new InstrumentationPass());
 
             builder.SetImportFeature(new MvcImportProjectFeature());
         }
-
-        #region Obsolete
-        [Obsolete("This method is obsolete and will be removed in a future version.")]
-        public static void Register(IRazorEngineBuilder builder)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            InjectDirective.Register(builder);
-            ModelDirective.Register(builder);
-            NamespaceDirective.Register(builder);
-            PageDirective.Register(builder);
-
-            FunctionsDirective.Register(builder);
-            InheritsDirective.Register(builder);
-            SectionDirective.Register(builder);
-
-            builder.Features.Add(new DefaultTagHelperDescriptorProvider());
-            builder.Features.Add(new ViewComponentTagHelperDescriptorProvider());
-
-            builder.AddTargetExtension(new ViewComponentTagHelperTargetExtension());
-            builder.AddTargetExtension(new TemplateTargetExtension()
-            {
-                TemplateTypeName = "global::Microsoft.AspNetCore.Mvc.Razor.HelperResult",
-            });
-
-            builder.Features.Add(new ModelExpressionPass());
-            builder.Features.Add(new PagesPropertyInjectionPass());
-            builder.Features.Add(new ViewComponentTagHelperPass());
-            builder.Features.Add(new RazorPageDocumentClassifierPass());
-            builder.Features.Add(new MvcViewDocumentClassifierPass());
-
-            if (!builder.DesignTime)
-            {
-                builder.Features.Add(new AssemblyAttributeInjectionPass());
-                builder.Features.Add(new InstrumentationPass());
-            }
-        }
-        #endregion
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorPageDocumentClassifierPass.cs b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorPageDocumentClassifierPass.cs
index 9af7873874..c6c0df9345 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorPageDocumentClassifierPass.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorPageDocumentClassifierPass.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Diagnostics;
-using System.Text;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
@@ -58,12 +57,12 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             {
                 // It's possible for a Razor document to not have a file path.
                 // Eg. When we try to generate code for an in memory document like default imports.
-                var checksum = BytesToString(codeDocument.Source.GetChecksum());
+                var checksum = Checksum.BytesToString(codeDocument.Source.GetChecksum());
                 @class.ClassName = $"AspNetCore_{checksum}";
             }
             else
             {
-                @class.ClassName = CSharpIdentifier.GetClassNameFromPath(filePath);
+                @class.ClassName = GetClassNameFromPath(filePath);
             }
 
             @class.Modifiers.Clear();
@@ -144,21 +143,21 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             }
         }
 
-        private static string BytesToString(byte[] bytes)
+        private static string GetClassNameFromPath(string path)
         {
-            if (bytes == null)
+            const string cshtmlExtension = ".cshtml";
+
+            if (string.IsNullOrEmpty(path))
             {
-                throw new ArgumentNullException(nameof(bytes));
+                return path;
             }
 
-            var result = new StringBuilder(bytes.Length);
-            for (var i = 0; i < bytes.Length; i++)
+            if (path.EndsWith(cshtmlExtension, StringComparison.OrdinalIgnoreCase))
             {
-                // The x2 format means lowercase hex, where each byte is a 2-character string.
-                result.Append(bytes[i].ToString("x2"));
+                path = path.Substring(0, path.Length - cshtmlExtension.Length);
             }
 
-            return result.ToString();
+            return CSharpIdentifier.SanitizeIdentifier(path);
         }
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/breakingchanges.netcore.json b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/breakingchanges.netcore.json
new file mode 100644
index 0000000000..5f5b6444f6
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/breakingchanges.netcore.json
@@ -0,0 +1,11 @@
+[
+  {
+    "TypeId": "public static class Microsoft.AspNetCore.Mvc.Razor.Extensions.RazorExtensions",
+    "MemberId": "public static System.Void Register(Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder builder)",
+    "Kind": "Removal"
+  },
+  {
+    "TypeId": "public class Microsoft.AspNetCore.Mvc.Razor.Extensions.InstrumentationPass : Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase, Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+    "Kind": "Removal"
+  }
+]
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/breakingchanges.netframework.json b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/breakingchanges.netframework.json
new file mode 100644
index 0000000000..5f5b6444f6
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/breakingchanges.netframework.json
@@ -0,0 +1,11 @@
+[
+  {
+    "TypeId": "public static class Microsoft.AspNetCore.Mvc.Razor.Extensions.RazorExtensions",
+    "MemberId": "public static System.Void Register(Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder builder)",
+    "Kind": "Removal"
+  },
+  {
+    "TypeId": "public class Microsoft.AspNetCore.Mvc.Razor.Extensions.InstrumentationPass : Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase, Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+    "Kind": "Removal"
+  }
+]
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Extensions.props b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Extensions.props
deleted file mode 100644
index c968ea7b3a..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Extensions.props
+++ /dev/null
@@ -1,40 +0,0 @@
-<Project>
-  <!-- 
-      MSBuild support for Razor code generation that targets ASP.NET Core MVC 2.X
-
-      The properties and items here are designed to be read by CPS so they should be just simple evaluation-time values
-      and should not require targets to initialize. 
-  -->
-  <PropertyGroup>
-    <!-- 
-      Set the primary configuration supported by this pacakge as the default configuration for Razor. 
-    -->
-    <RazorDefaultConfiguration Condition="'$(RazorDefaultConfiguration)'==''">MVC-2.1</RazorDefaultConfiguration>
-
-    <!--
-      MVC uses a ProvideApplicationPartFactoryAttribute on the generated assembly to load compiled views from assembly. Set this to false, to prevent generating this attribute.
-    -->
-    <GenerateProvideApplicationPartFactoryAttribute>true</GenerateProvideApplicationPartFactoryAttribute>
-
-    <!-- Override for testing. This path is only correct inside a nuget package. -->
-    <_MvcExtensionAssemblyPath Condition="'$(_MvcExtensionAssemblyPath)'==''">$(MSBuildThisFileDirectory)..\..\lib\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll</_MvcExtensionAssemblyPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!--
-      While technically the assembly in this package can provide support for the MVC-2.0 configuration, don't declare
-      it here. The IDE is hardcoded to inject 2.0 support when needed. The settings flowing through MSBuild should reflect
-      the project's runtime.
-    -->
-    <RazorConfiguration Include="MVC-2.1">
-      <Extensions>MVC-2.1;$(CustomRazorExtension)</Extensions>
-    </RazorConfiguration>
-  </ItemGroup>
-
-  <ItemGroup>
-    <RazorExtension Include="MVC-2.1">
-      <AssemblyName>Microsoft.AspNetCore.Mvc.Razor.Extensions</AssemblyName>
-      <AssemblyFilePath>$(_MvcExtensionAssemblyPath)</AssemblyFilePath>
-    </RazorExtension>
-  </ItemGroup>
-</Project>
diff --git a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Extensions.targets b/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Extensions.targets
deleted file mode 100644
index ffe642e283..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.Extensions.targets
+++ /dev/null
@@ -1,36 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <!--
-      Determines if the Sdk is allowed to add additional attributes to the project assembly.
-      For instance, MVC will generally want to add attributes to support view discovery and runtime compilation.
-    -->
-    <GenerateRazorAssemblyInfo Condition="'$(GenerateRazorAssemblyInfo)'==''">true</GenerateRazorAssemblyInfo>
-
-    <!--
-      MVC will generally want to add support for runtime compilation, but only for applications.
-    -->
-    <GenerateRazorHostingAssemblyInfo Condition="'$(GenerateRazorHostingAssemblyInfo)'=='' AND '$(OutputType)'=='exe'">$(GenerateRazorAssemblyInfo)</GenerateRazorHostingAssemblyInfo>
-
-    <!--
-      Use the suffix .Views when producing compiled view assemblies. This matches the requirements for Mvc's ViewsFeatureProvider.
-    -->
-    <RazorTargetNameSuffix Condition="'$(RazorTargetNameSuffix)'==''">.Views</RazorTargetNameSuffix>
-
-    <!--
-      The type name of the ApplicationPartFactory applied to the generated Razor file.
-    -->
-    <ProvideApplicationPartFactoryAttributeTypeName Condition="'$(ProvideApplicationPartFactoryAttributeTypeName)' == ''">Microsoft.AspNetCore.Mvc.ApplicationParts.CompiledRazorAssemblyApplicationPartFactory, Microsoft.AspNetCore.Mvc.Razor</ProvideApplicationPartFactoryAttributeTypeName>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(GenerateRazorAssemblyInfo)'=='true' AND '$(ResolvedRazorCompileToolset)'=='RazorSdk' AND ('$(RazorCompileOnBuild)' == 'true' OR '$(RazorCompileOnPublish)' == 'true')">
-    <_RazorAssemblyAttribute Include="Microsoft.AspNetCore.Mvc.ApplicationParts.RelatedAssemblyAttribute">
-      <_Parameter1>$(RazorTargetName)</_Parameter1>
-    </_RazorAssemblyAttribute>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(GenerateProvideApplicationPartFactoryAttribute)' == 'true' AND '$(ProvideApplicationPartFactoryAttributeTypeName)'!=''">
-    <RazorTargetAssemblyAttribute Include="Microsoft.AspNetCore.Mvc.ApplicationParts.ProvideApplicationPartFactoryAttribute">
-      <_Parameter1>$(ProvideApplicationPartFactoryAttributeTypeName)</_Parameter1>
-    </RazorTargetAssemblyAttribute>
-  </ItemGroup>
-</Project>
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.csproj b/src/Razor/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.csproj
deleted file mode 100644
index 083a24e847..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.csproj
+++ /dev/null
@@ -1,84 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains MSBuild support for Razor.</Description>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
-
-    <!-- This project doesn't have any code, so don't include it in the .nupkg -->
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-
-    <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
-  </PropertyGroup>
-
-  <!--
-    Building this package is somewhat complicated because we need to Publish some other projects
-    that have different TFM's including one with multiple TFMs.
-
-    We then need to include the output of those projects in our output directory (where it will be used
-    by tests) and in the nukpg.
-  -->
-  <!-- These are tools that need to be included in the package. -->
-
-  <PropertyGroup>
-    <ToolProject>..\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj</ToolProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="$(ToolProject)" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)' == 'netcoreapp2.0'" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)'==''">
-    <!-- Binaries produced in this project -->
-    <SignedPackageFile Include="$(MSBuildProjectDirectory)\$(OutputPath)\tools/rzc.dll" Certificate="$(AssemblySigningCertName)" />
-
-    <!-- Third-party assemblies -->
-    <SignedPackageFile Include="$(MSBuildProjectDirectory)\$(OutputPath)\tools/Newtonsoft.Json.dll" Certificate="$(AssemblySigning3rdPartyCertName)" />
-
-    <!-- Binaries that should be signed by corefx/roslyn -->
-    <ExcludePackageFileFromSigning Include="$(MSBuildProjectDirectory)\$(OutputPath)\tools/Microsoft.CodeAnalysis.CSharp.dll" />
-    <ExcludePackageFileFromSigning Include="$(MSBuildProjectDirectory)\$(OutputPath)\tools/Microsoft.CodeAnalysis.dll" />
-    <ExcludePackageFileFromSigning Include="$(MSBuildProjectDirectory)\$(OutputPath)\tools/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll" />
-    <ExcludePackageFileFromSigning Include="$(MSBuildProjectDirectory)\$(OutputPath)\tools/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll" />
-  </ItemGroup>
-
-  <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec">
-
-    <PropertyGroup>
-      <!-- Make sure we create a symbols.nupkg. -->
-      <IncludeSymbols>true</IncludeSymbols>
-
-      <!-- RepositoryCommit is only available when "build" runs, but not during dotnet pack -->
-      <RepositoryCommit Condition="'$(RepositoryCommit)' == ''">unknown</RepositoryCommit>
-
-      <NuspecProperties>
-        id=$(PackageId);
-        version=$(PackageVersion);
-        authors=$(Authors);
-        description=$(Description);
-        tags=$(PackageTags.Replace(';', ' '));
-        licenseUrl=$(PackageLicenseUrl);
-        projectUrl=$(PackageProjectUrl);
-        iconUrl=$(PackageIconUrl);
-        repositoryUrl=$(RepositoryUrl);
-        repositoryCommit=$(RepositoryCommit);
-        copyright=$(Copyright);
-
-        <!-- Include the assembly and symbols from the tools project -->
-        ToolFiles=$(OutputPath)tools\**\*;
-      </NuspecProperties>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="LayoutDependencies" AfterTargets="Build" BeforeTargets="PopulateNuspec">
-    <RemoveDir Directories="$(OutputPath)tools\" />
-    <MSBuild Projects="$(ToolProject)" Properties="PublishDir=$(MSBuildProjectDirectory)\$(OutputPath)tools\;TargetFramework=netcoreapp2.0" Targets="Publish" />
-
-    <ItemGroup>
-      <_RazorTool Include="$(OutputPath)tools\**\*" />
-    </ItemGroup>
-
-    <Error Text="_RazorTool is empty. This is a bug" Condition="'@(_RazorTool)'==''" />
-  </Target>
-
-</Project>
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.nuspec b/src/Razor/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.nuspec
deleted file mode 100644
index 47d16cd554..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.nuspec
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
-  <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <authors>$authors$</authors>
-    <description>$description$</description>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <tags>$tags$</tags>
-    <licenseUrl>$licenseUrl$</licenseUrl>
-    <projectUrl>$projectUrl$</projectUrl>
-    <iconUrl>$iconUrl$</iconUrl>
-    <repository type="git" url="$repositoryUrl$" commit="$repositoryCommit$" />
-    <copyright>$copyright$</copyright>
-    <dependencies>
-      <group targetFramework=".NETStandard2.0" />
-    </dependencies>
-  </metadata>
-
-  <files>
-    <file src="build\**\*.props" target="build\" />
-    <file src="build\**\*.targets" target="build\" />
-    <file src="buildMultiTargeting\**\*.props" target="buildMultiTargeting\" />
-    <file src="buildMultiTargeting\**\*.targets" target="buildMultiTargeting\" />
-    <file src="$TaskAssemblyNet46$" target="tasks\net46\" />
-    <file src="$TaskSymbolNet46$" target="tasks\net46\" />
-    <file src="$TaskAssemblyNetStandard$" target="tasks\netstandard2.0\" />
-    <file src="$TaskSymbolNetStandard$" target="tasks\netstandard2.0\" />
-    <file src="$ToolFiles$" target="tools\" exclude="**\*.xml" />
-  </files>
-</package>
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/baseline.netcore.json b/src/Razor/src/Microsoft.AspNetCore.Razor.Design/baseline.netcore.json
deleted file mode 100644
index 4491a03c76..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/baseline.netcore.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "AssemblyIdentity": "Microsoft.AspNetCore.Razor.Design, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
-  "Types": []
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/baseline.netframework.json b/src/Razor/src/Microsoft.AspNetCore.Razor.Design/baseline.netframework.json
deleted file mode 100644
index 7a73a41bfd..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/baseline.netframework.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.props b/src/Razor/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.props
deleted file mode 100644
index 81b2e3afe4..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.props
+++ /dev/null
@@ -1,45 +0,0 @@
-<Project ToolsVersion="14.0" TreatAsLocalProperty="_RazorTaskFolder;_RazorTaskAssembly">
-  <PropertyGroup>
-    <!--
-      Used by the Web SDK if the Razor SDK can be used for compilation. This needs to live in a nuget package (not in the SDK)
-      so that it only shows up in supported versions.
-    -->
-    <IsRazorCompilerReferenced>true</IsRazorCompilerReferenced>
-
-    <!-- 
-      Location of the CodeGeneration targets. The SDK uses this to import the file ensuring deterministic import order.
-    -->
-    <RazorCodeGenerationTargetsPath>$(MSBuildThisFileDirectory)Microsoft.AspNetCore.Razor.Design.CodeGeneration.targets</RazorCodeGenerationTargetsPath>
-
-    <!--
-      Configures the language version of Razor. Supported and default values differ depending on the version of
-      the packages in use.
-
-      Supported:
-        2.0
-        2.1
-        Latest = 2.1
-      
-      Default:
-        2.1
-    -->
-    <RazorLangVersion Condition="'$(RazorLangVersion)'==''">2.1</RazorLangVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- Override this to hijack the tasks and targets. Used by tests. -->
-    <_RazorMSBuildRoot Condition="'$(_RazorMSBuildRoot)'==''">$(MSBuildThisFileDirectory)..\..\</_RazorMSBuildRoot>
-    
-    <!-- Used to locate our tools -->
-    <_RazorToolAssembly Condition="'$(_RazorToolAssembly)'==''">$(_RazorMSBuildRoot)tools\rzc.dll</_RazorToolAssembly>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!--
-      Defines the ability to understand the configuration for the Razor language service provided by
-      the runtime/toolset packages. Introduced in 2.1
-    -->
-    <ProjectCapability Include="DotNetCoreRazorConfiguration"/>
-  </ItemGroup>
-
-</Project>
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/buildMultiTargeting/Microsoft.AspNetCore.Razor.Design.props b/src/Razor/src/Microsoft.AspNetCore.Razor.Design/buildMultiTargeting/Microsoft.AspNetCore.Razor.Design.props
deleted file mode 100644
index 227f58dea9..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/buildMultiTargeting/Microsoft.AspNetCore.Razor.Design.props
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project ToolsVersion="14.0">
-  <Import Project="..\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />
-</Project>
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CSharpIdentifier.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CSharpIdentifier.cs
new file mode 100644
index 0000000000..1ec6188aed
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/CSharpIdentifier.cs
@@ -0,0 +1,53 @@
+// 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.Globalization;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal static class CSharpIdentifier
+    {
+        // CSharp Spec §2.4.2
+        private static bool IsIdentifierStart(char character)
+        {
+            return char.IsLetter(character) ||
+                character == '_' ||
+                CharUnicodeInfo.GetUnicodeCategory(character) == UnicodeCategory.LetterNumber;
+        }
+
+        public static bool IsIdentifierPart(char character)
+        {
+            return char.IsDigit(character) ||
+                   IsIdentifierStart(character) ||
+                   IsIdentifierPartByUnicodeCategory(character);
+        }
+
+        private static bool IsIdentifierPartByUnicodeCategory(char character)
+        {
+            var category = CharUnicodeInfo.GetUnicodeCategory(character);
+
+            return category == UnicodeCategory.NonSpacingMark || // Mn
+                category == UnicodeCategory.SpacingCombiningMark || // Mc
+                category == UnicodeCategory.ConnectorPunctuation || // Pc
+                category == UnicodeCategory.Format; // Cf
+        }
+
+        public static string SanitizeIdentifier(string inputName)
+        {
+            if (!IsIdentifierStart(inputName[0]) && IsIdentifierPart(inputName[0]))
+            {
+                inputName = "_" + inputName;
+            }
+
+            var builder = new StringBuilder(inputName.Length);
+            for (var i = 0; i < inputName.Length; i++)
+            {
+                var ch = inputName[i];
+                builder.Append(IsIdentifierPart(ch) ? ch : '_');
+            }
+
+            return builder.ToString();
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/ClassifiedSpanVisitor.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/ClassifiedSpanVisitor.cs
new file mode 100644
index 0000000000..ec0e7977d0
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/ClassifiedSpanVisitor.cs
@@ -0,0 +1,312 @@
+// 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;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class ClassifiedSpanVisitor : SyntaxWalker
+    {
+        private RazorSourceDocument _source;
+        private List<ClassifiedSpanInternal> _spans;
+        private BlockKindInternal _currentBlockKind;
+        private SyntaxNode _currentBlock;
+
+        public ClassifiedSpanVisitor(RazorSourceDocument source)
+        {
+            _source = source;
+            _spans = new List<ClassifiedSpanInternal>();
+            _currentBlockKind = BlockKindInternal.Markup;
+        }
+
+        public IReadOnlyList<ClassifiedSpanInternal> ClassifiedSpans => _spans;
+
+        public override void VisitRazorCommentBlock(RazorCommentBlockSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Comment, razorCommentSyntax =>
+            {
+                WriteSpan(razorCommentSyntax.StartCommentTransition, SpanKindInternal.Transition, AcceptedCharactersInternal.None);
+                WriteSpan(razorCommentSyntax.StartCommentStar, SpanKindInternal.MetaCode, AcceptedCharactersInternal.None);
+
+                var comment = razorCommentSyntax.Comment;
+                if (comment.IsMissing)
+                {
+                    // We need to generate a classified span at this position. So insert a marker in its place.
+                    comment = (SyntaxToken)SyntaxFactory.Token(SyntaxKind.Marker, string.Empty).Green.CreateRed(razorCommentSyntax, razorCommentSyntax.StartCommentStar.EndPosition);
+                }
+                WriteSpan(comment, SpanKindInternal.Comment, AcceptedCharactersInternal.Any);
+
+                WriteSpan(razorCommentSyntax.EndCommentStar, SpanKindInternal.MetaCode, AcceptedCharactersInternal.None);
+                WriteSpan(razorCommentSyntax.EndCommentTransition, SpanKindInternal.Transition, AcceptedCharactersInternal.None);
+            });
+        }
+
+        public override void VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
+        {
+            if (node.Parent is CSharpStatementBodySyntax ||
+                node.Parent is CSharpExplicitExpressionBodySyntax ||
+                node.Parent is CSharpImplicitExpressionBodySyntax ||
+                node.Parent is RazorDirectiveBodySyntax ||
+                (_currentBlockKind == BlockKindInternal.Directive &&
+                node.Children.Count == 1 &&
+                node.Children[0] is CSharpStatementLiteralSyntax))
+            {
+                base.VisitCSharpCodeBlock(node);
+                return;
+            }
+
+            WriteBlock(node, BlockKindInternal.Statement, base.VisitCSharpCodeBlock);
+        }
+
+        public override void VisitCSharpStatement(CSharpStatementSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Statement, base.VisitCSharpStatement);
+        }
+
+        public override void VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Expression, base.VisitCSharpExplicitExpression);
+        }
+
+        public override void VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Expression, base.VisitCSharpImplicitExpression);
+        }
+
+        public override void VisitRazorDirective(RazorDirectiveSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Directive, base.VisitRazorDirective);
+        }
+
+        public override void VisitCSharpTemplateBlock(CSharpTemplateBlockSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Template, base.VisitCSharpTemplateBlock);
+        }
+
+        public override void VisitMarkupBlock(MarkupBlockSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Markup, base.VisitMarkupBlock);
+        }
+
+        public override void VisitMarkupTagHelperAttributeValue(MarkupTagHelperAttributeValueSyntax node)
+        {
+            // We don't generate a classified span when the attribute value is a simple literal value.
+            // This is done so we maintain the classified spans generated in 2.x which
+            // used ConditionalAttributeCollapser (combines markup literal attribute values into one span with no block parent).
+            if (node.Children.Count > 1 ||
+                (node.Children.Count == 1 && node.Children[0] is MarkupDynamicAttributeValueSyntax))
+            {
+                WriteBlock(node, BlockKindInternal.Markup, base.VisitMarkupTagHelperAttributeValue);
+                return;
+            }
+
+            base.VisitMarkupTagHelperAttributeValue(node);
+        }
+
+        public override void VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Tag, base.VisitMarkupTagBlock);
+        }
+
+        public override void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Tag, base.VisitMarkupTagHelperElement);
+        }
+
+        public override void VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
+        {
+            foreach (var child in node.Children)
+            {
+                if (child is MarkupTagHelperAttributeSyntax attribute)
+                {
+                    Visit(attribute);
+                }
+            }
+        }
+
+        public override void VisitMarkupTagHelperEndTag(MarkupTagHelperEndTagSyntax node)
+        {
+            // We don't want to generate a classified span for a tag helper end tag. Do nothing.
+        }
+
+        public override void VisitMarkupAttributeBlock(MarkupAttributeBlockSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Markup, n =>
+            {
+                var equalsSyntax = SyntaxFactory.MarkupTextLiteral(new SyntaxList<SyntaxToken>(node.EqualsToken));
+                var mergedAttributePrefix = MergeTextLiteralSpans(node.NamePrefix, node.Name, node.NameSuffix, equalsSyntax, node.ValuePrefix);
+                Visit(mergedAttributePrefix);
+                Visit(node.Value);
+                Visit(node.ValueSuffix);
+            });
+        }
+
+        public override void VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
+        {
+            Visit(node.Value);
+        }
+
+        public override void VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Markup, n =>
+            {
+                var mergedAttributePrefix = MergeTextLiteralSpans(node.NamePrefix, node.Name);
+                Visit(mergedAttributePrefix);
+            });
+        }
+
+        public override void VisitMarkupCommentBlock(MarkupCommentBlockSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.HtmlComment, base.VisitMarkupCommentBlock);
+        }
+
+        public override void VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Markup, base.VisitMarkupDynamicAttributeValue);
+        }
+
+        public override void VisitRazorMetaCode(RazorMetaCodeSyntax node)
+        {
+            WriteSpan(node, SpanKindInternal.MetaCode);
+            base.VisitRazorMetaCode(node);
+        }
+
+        public override void VisitCSharpTransition(CSharpTransitionSyntax node)
+        {
+            WriteSpan(node, SpanKindInternal.Transition);
+            base.VisitCSharpTransition(node);
+        }
+
+        public override void VisitMarkupTransition(MarkupTransitionSyntax node)
+        {
+            WriteSpan(node, SpanKindInternal.Transition);
+            base.VisitMarkupTransition(node);
+        }
+
+        public override void VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+        {
+            WriteSpan(node, SpanKindInternal.Code);
+            base.VisitCSharpStatementLiteral(node);
+        }
+
+        public override void VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+        {
+            WriteSpan(node, SpanKindInternal.Code);
+            base.VisitCSharpExpressionLiteral(node);
+        }
+
+        public override void VisitCSharpEphemeralTextLiteral(CSharpEphemeralTextLiteralSyntax node)
+        {
+            WriteSpan(node, SpanKindInternal.Code);
+            base.VisitCSharpEphemeralTextLiteral(node);
+        }
+
+        public override void VisitUnclassifiedTextLiteral(UnclassifiedTextLiteralSyntax node)
+        {
+            WriteSpan(node, SpanKindInternal.None);
+            base.VisitUnclassifiedTextLiteral(node);
+        }
+
+        public override void VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
+        {
+            WriteSpan(node, SpanKindInternal.Markup);
+            base.VisitMarkupLiteralAttributeValue(node);
+        }
+
+        public override void VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+        {
+            if (node.Parent is MarkupLiteralAttributeValueSyntax)
+            {
+                base.VisitMarkupTextLiteral(node);
+                return;
+            }
+
+            WriteSpan(node, SpanKindInternal.Markup);
+            base.VisitMarkupTextLiteral(node);
+        }
+
+        public override void VisitMarkupEphemeralTextLiteral(MarkupEphemeralTextLiteralSyntax node)
+        {
+            WriteSpan(node, SpanKindInternal.Markup);
+            base.VisitMarkupEphemeralTextLiteral(node);
+        }
+
+        private void WriteBlock<TNode>(TNode node, BlockKindInternal kind, Action<TNode> handler) where TNode : SyntaxNode
+        {
+            var previousBlock = _currentBlock;
+            var previousKind = _currentBlockKind;
+
+            _currentBlock = node;
+            _currentBlockKind = kind;
+
+            handler(node);
+
+            _currentBlock = previousBlock;
+            _currentBlockKind = previousKind;
+        }
+
+        private void WriteSpan(SyntaxNode node, SpanKindInternal kind, AcceptedCharactersInternal? acceptedCharacters = null)
+        {
+            if (node.IsMissing)
+            {
+                return;
+            }
+
+            var spanSource = node.GetSourceSpan(_source);
+            var blockSource = _currentBlock.GetSourceSpan(_source);
+            if (!acceptedCharacters.HasValue)
+            {
+                acceptedCharacters = AcceptedCharactersInternal.Any;
+                var context = node.GetSpanContext();
+                if (context != null)
+                {
+                    acceptedCharacters = context.EditHandler.AcceptedCharacters;
+                }
+            }
+
+            var span = new ClassifiedSpanInternal(spanSource, blockSource, kind, _currentBlockKind, acceptedCharacters.Value);
+            _spans.Add(span);
+        }
+
+        private MarkupTextLiteralSyntax MergeTextLiteralSpans(params MarkupTextLiteralSyntax[] literalSyntaxes)
+        {
+            if (literalSyntaxes == null || literalSyntaxes.Length == 0)
+            {
+                return null;
+            }
+
+            SyntaxNode parent = null;
+            var position = 0;
+            var seenFirstLiteral = false;
+            var builder = Syntax.InternalSyntax.SyntaxListBuilder.Create();
+
+            foreach (var syntax in literalSyntaxes)
+            {
+                if (syntax == null)
+                {
+                    continue;
+                }
+                else if (!seenFirstLiteral)
+                {
+                    // Set the parent and position of the merged literal to the value of the first non-null literal.
+                    parent = syntax.Parent;
+                    position = syntax.Position;
+                    seenFirstLiteral = true;
+                }
+
+                foreach (var token in syntax.LiteralTokens)
+                {
+                    builder.Add(token.Green);
+                }
+            }
+
+            var mergedLiteralSyntax = Syntax.InternalSyntax.SyntaxFactory.MarkupTextLiteral(
+                builder.ToList<Syntax.InternalSyntax.SyntaxToken>());
+
+            return (MarkupTextLiteralSyntax)mergedLiteralSyntax.CreateRed(parent, position);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Components/CodeGenerationConstants.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Components/CodeGenerationConstants.cs
new file mode 100644
index 0000000000..35c176a678
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Components/CodeGenerationConstants.cs
@@ -0,0 +1,27 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    // Constants for method names used in code-generation
+    // Keep these in sync with the actual definitions
+    internal static class CodeGenerationConstants
+    {
+        public static class RazorComponent
+        {
+            public const string FullTypeName = "Microsoft.AspNetCore.Components.Component";
+            public const string BuildRenderTree = "BuildRenderTree";
+            public const string BuildRenderTreeParameter = "builder";
+        }
+
+        public static class RenderTreeBuilder
+        {
+            public const string FullTypeName = "Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder";
+        }
+
+        public static class InjectDirective
+        {
+            public const string FullTypeName = "Microsoft.AspNetCore.Razor.Components.InjectAttribute";
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Components/ComponentDocumentClassifierPass.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Components/ComponentDocumentClassifierPass.cs
new file mode 100644
index 0000000000..29afa982af
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Components/ComponentDocumentClassifierPass.cs
@@ -0,0 +1,139 @@
+// 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;
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal class ComponentDocumentClassifierPass : DocumentClassifierPassBase
+    {
+        public static readonly string ComponentDocumentKind = "component.1.0";
+        private static readonly object BuildRenderTreeBaseCallAnnotation = new object();
+        private static readonly char[] PathSeparators = new char[] { '/', '\\' };
+        private static readonly char[] NamespaceSeparators = new char[] { '.' };
+
+        protected override string DocumentKind => ComponentDocumentKind;
+
+        // Ensure this runs before the MVC classifiers which have Order = 0
+        public override int Order => -100;
+
+        protected override bool IsMatch(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            return codeDocument.GetInputDocumentKind() == InputDocumentKind.Component;
+        }
+
+        protected override void OnDocumentStructureCreated(RazorCodeDocument codeDocument, NamespaceDeclarationIntermediateNode @namespace, ClassDeclarationIntermediateNode @class, MethodDeclarationIntermediateNode method)
+        {
+            base.OnDocumentStructureCreated(codeDocument, @namespace, @class, method);
+
+            if (!TryComputeNamespaceAndClass(
+                   codeDocument.Source.FilePath,
+                   codeDocument.Source.RelativePath,
+                   out var computedNamespace,
+                   out var computedClass))
+            {
+                // If we can't compute a nice namespace (no relative path) then just generate something
+                // mangled.
+                computedNamespace = "AspNetCore";
+                var checksum = Checksum.BytesToString(codeDocument.Source.GetChecksum());
+                computedClass = $"AspNetCore_{checksum}";
+            }
+
+            @namespace.Content = computedNamespace;
+
+            @class.ClassName = computedClass;
+            @class.BaseType = $"global::{CodeGenerationConstants.RazorComponent.FullTypeName}";
+            var filePath = codeDocument.Source.RelativePath ?? codeDocument.Source.FilePath;
+            if (string.IsNullOrEmpty(filePath))
+            {
+                // It's possible for a Razor document to not have a file path.
+                // Eg. When we try to generate code for an in memory document like default imports.
+                var checksum = Checksum.BytesToString(codeDocument.Source.GetChecksum());
+                @class.ClassName = $"AspNetCore_{checksum}";
+            }
+            else
+            {
+                @class.ClassName = CSharpIdentifier.SanitizeIdentifier(Path.GetFileNameWithoutExtension(filePath));
+            }
+
+            @class.Modifiers.Clear();
+            @class.Modifiers.Add("public");
+            @class.Modifiers.Add("sealed");
+
+            method.MethodName = CodeGenerationConstants.RazorComponent.BuildRenderTree;
+            method.ReturnType = "void";
+            method.Modifiers.Clear();
+            method.Modifiers.Add("public");
+            method.Modifiers.Add("override");
+
+            method.Parameters.Clear();
+            method.Parameters.Add(new MethodParameter()
+            {
+                TypeName = CodeGenerationConstants.RenderTreeBuilder.FullTypeName,
+                ParameterName = CodeGenerationConstants.RazorComponent.BuildRenderTreeParameter,
+            });
+
+            // We need to call the 'base' method as the first statement.
+            var callBase = new CSharpCodeIntermediateNode();
+            callBase.Annotations.Add(BuildRenderTreeBaseCallAnnotation, true);
+            callBase.Children.Add(new IntermediateToken
+            {
+                Kind = TokenKind.CSharp,
+                Content = $"base.{CodeGenerationConstants.RazorComponent.BuildRenderTree}({CodeGenerationConstants.RazorComponent.BuildRenderTreeParameter});"
+            });
+            method.Children.Insert(0, callBase);
+        }
+
+        private bool TryComputeNamespaceAndClass(string filePath, string relativePath, out string @namespace, out string @class)
+        {
+            if (filePath == null || relativePath == null || filePath.Length <= relativePath.Length)
+            {
+                @namespace = null;
+                @class = null;
+                return false;
+            }
+
+            // Try and infer a namespace from the project directory. We don't yet have the ability to pass
+            // the namespace through from the project.
+            var trimLength = relativePath.Length + (relativePath.StartsWith("/") ? 0 : 1);
+            var baseDirectory = filePath.Substring(0, filePath.Length - trimLength);
+
+            var lastSlash = baseDirectory.LastIndexOfAny(PathSeparators);
+            var baseNamespace = lastSlash == -1 ? baseDirectory : baseDirectory.Substring(lastSlash + 1);
+            if (string.IsNullOrEmpty(baseNamespace))
+            {
+                @namespace = null;
+                @class = null;
+                return false;
+            }
+
+            var builder = new StringBuilder();
+
+            // Sanitize the base namespace, but leave the dots.
+            var segments = baseNamespace.Split(NamespaceSeparators, StringSplitOptions.RemoveEmptyEntries);
+            builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[0]));
+            for (var i = 1; i < segments.Length; i++)
+            {
+                builder.Append('.');
+                builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[i]));
+            }
+
+            segments = relativePath.Split(PathSeparators, StringSplitOptions.RemoveEmptyEntries);
+
+            // Skip the last segment because it's the FileName.
+            for (var i = 0; i < segments.Length - 1; i++)
+            {
+                builder.Append('.');
+                builder.Append(CSharpIdentifier.SanitizeIdentifier(segments[i]));
+            }
+
+            @namespace = builder.ToString();
+            @class = CSharpIdentifier.SanitizeIdentifier(Path.GetFileNameWithoutExtension(relativePath));
+
+            return true;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Components/ComponentExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Components/ComponentExtensions.cs
new file mode 100644
index 0000000000..6f7a2affa4
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Components/ComponentExtensions.cs
@@ -0,0 +1,22 @@
+// 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;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    public static class ComponentExtensions
+    {
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            FunctionsDirective.Register(builder);
+            builder.Features.Add(new ComponentDocumentClassifierPass());
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultDirectiveSyntaxTreePass.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultDirectiveSyntaxTreePass.cs
index 54c733e0f1..65e578b5ce 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultDirectiveSyntaxTreePass.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultDirectiveSyntaxTreePass.cs
@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
@@ -23,37 +24,42 @@ namespace Microsoft.AspNetCore.Razor.Language
             {
                 throw new ArgumentNullException(nameof(syntaxTree));
             }
-
-            var sectionVerifier = new NestedSectionVerifier();
-            sectionVerifier.Verify(syntaxTree);
-
-            return syntaxTree;
+            
+            var sectionVerifier = new NestedSectionVerifier(syntaxTree);
+            return sectionVerifier.Verify();
         }
 
-        private class NestedSectionVerifier : ParserVisitor
+        private class NestedSectionVerifier : SyntaxRewriter
         {
             private int _nestedLevel;
+            private RazorSyntaxTree _syntaxTree;
 
-            public void Verify(RazorSyntaxTree tree)
+            public NestedSectionVerifier(RazorSyntaxTree syntaxTree)
             {
-                tree.Root.Accept(this);
+                _syntaxTree = syntaxTree;
             }
 
-            public override void VisitDirectiveBlock(DirectiveChunkGenerator chunkGenerator, Block block)
+            public RazorSyntaxTree Verify()
+            {
+                var root = Visit(_syntaxTree.Root);
+                var rewrittenTree = new DefaultRazorSyntaxTree(root, _syntaxTree.Source, _syntaxTree.Diagnostics, _syntaxTree.Options);
+                return rewrittenTree;
+            }
+
+            public override SyntaxNode VisitRazorDirective(RazorDirectiveSyntax node)
             {
                 if (_nestedLevel > 0)
                 {
-                    var directiveStart = block.Children.First(child => !child.IsBlock && ((Span)child).Kind == SpanKindInternal.Transition).Start;
+                    var directiveStart = node.Transition.GetSourceLocation(_syntaxTree.Source);
                     var errorLength = /* @ */ 1 + SectionDirective.Directive.Directive.Length;
                     var error = RazorDiagnosticFactory.CreateParsing_SectionsCannotBeNested(new SourceSpan(directiveStart, errorLength));
-                    chunkGenerator.Diagnostics.Add(error);
+                    node = node.AppendDiagnostic(error);
                 }
-
                 _nestedLevel++;
-
-                VisitDefault(block);
-
+                var result = base.VisitRazorDirective(node);
                 _nestedLevel--;
+
+                return result;
             }
         }
     }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptions.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptions.cs
index e521141628..6b694d9382 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptions.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptions.cs
@@ -10,13 +10,15 @@ namespace Microsoft.AspNetCore.Razor.Language
             int indentSize, 
             bool designTime, 
             bool suppressChecksum,
-            bool supressMetadataAttributes)
+            bool supressMetadataAttributes,
+            bool suppressPrimaryMethodBody)
         {
             IndentWithTabs = indentWithTabs;
             IndentSize = indentSize;
             DesignTime = designTime;
             SuppressChecksum = suppressChecksum;
             SuppressMetadataAttributes = supressMetadataAttributes;
+            SuppressPrimaryMethodBody = suppressPrimaryMethodBody;
         }
 
         public override bool DesignTime { get; }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptionsBuilder.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptionsBuilder.cs
index 8dd095a04e..7507ac0fee 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptionsBuilder.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorCodeGenerationOptionsBuilder.cs
@@ -31,10 +31,16 @@ namespace Microsoft.AspNetCore.Razor.Language
         public override bool IndentWithTabs { get; set; }
 
         public override bool SuppressChecksum { get; set; }
-        
+
         public override RazorCodeGenerationOptions Build()
         {
-            return new DefaultRazorCodeGenerationOptions(IndentWithTabs, IndentSize, DesignTime, SuppressChecksum, SuppressMetadataAttributes);
+            return new DefaultRazorCodeGenerationOptions(
+                IndentWithTabs,
+                IndentSize,
+                DesignTime,
+                SuppressChecksum,
+                SuppressMetadataAttributes,
+                SuppressPrimaryMethodBody);
         }
 
         public override void SetDesignTime(bool designTime)
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs
index a711567547..07e1ad44c8 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
@@ -46,8 +47,8 @@ namespace Microsoft.AspNetCore.Razor.Language
                 {
                     var import = imports[j];
 
-                    importsVisitor.FilePath = import.Source.FilePath;
-                    importsVisitor.VisitBlock(import.Root);
+                    importsVisitor.SourceDocument = import.Source;
+                    importsVisitor.Visit(import.Root);
                 }
 
                 importedUsings = importsVisitor.Usings;
@@ -56,10 +57,10 @@ namespace Microsoft.AspNetCore.Razor.Language
             var tagHelperPrefix = tagHelperContext?.Prefix;
             var visitor = new MainSourceVisitor(document, builder, tagHelperPrefix, syntaxTree.Options.FeatureFlags)
             {
-                FilePath = syntaxTree.Source.FilePath,
+                SourceDocument = syntaxTree.Source,
             };
 
-            visitor.VisitBlock(syntaxTree.Root);
+            visitor.Visit(syntaxTree.Root);
 
             // 1. Prioritize non-imported usings over imported ones.
             // 2. Don't import usings that already exist in primary document.
@@ -189,7 +190,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             public override int GetHashCode() => Namespace.GetHashCode();
         }
 
-        private class LoweringVisitor : ParserVisitor
+        private class LoweringVisitor : SyntaxWalker
         {
             protected readonly IntermediateNodeBuilder _builder;
             protected readonly DocumentIntermediateNode _document;
@@ -206,195 +207,208 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             public IReadOnlyList<UsingReference> Usings => _usings;
 
-            public string FilePath { get; set; }
+            public RazorSourceDocument SourceDocument { get; set; }
 
-            public override void VisitDirectiveToken(DirectiveTokenChunkGenerator chunkGenerator, Span span)
-            {
-                _builder.Add(new DirectiveTokenIntermediateNode()
-                {
-                    Content = span.Content,
-                    DirectiveToken = chunkGenerator.Descriptor,
-                    Source = BuildSourceSpanFromNode(span),
-                });
-            }
-
-            public override void VisitDirectiveBlock(DirectiveChunkGenerator chunkGenerator, Block block)
+            public override void VisitRazorDirective(RazorDirectiveSyntax node)
             {
                 IntermediateNode directiveNode;
-                if (IsMalformed(chunkGenerator.Diagnostics))
+                var descriptor = node.DirectiveDescriptor;
+
+                if (descriptor != null)
                 {
-                    directiveNode = new MalformedDirectiveIntermediateNode()
+                    var diagnostics = node.GetDiagnostics();
+
+                    // This is an extensible directive.
+                    if (IsMalformed(diagnostics))
                     {
-                        DirectiveName = chunkGenerator.Descriptor.Directive,
-                        Directive = chunkGenerator.Descriptor,
-                        Source = BuildSourceSpanFromNode(block),
-                    };
-                }
-                else
-                {
-                    directiveNode = new DirectiveIntermediateNode()
+                        directiveNode = new MalformedDirectiveIntermediateNode()
+                        {
+                            DirectiveName = descriptor.Directive,
+                            Directive = descriptor,
+                            Source = BuildSourceSpanFromNode(node),
+                        };
+                    }
+                    else
                     {
-                        DirectiveName = chunkGenerator.Descriptor.Directive,
-                        Directive = chunkGenerator.Descriptor,
-                        Source = BuildSourceSpanFromNode(block),
-                    };
+                        directiveNode = new DirectiveIntermediateNode()
+                        {
+                            DirectiveName = descriptor.Directive,
+                            Directive = descriptor,
+                            Source = BuildSourceSpanFromNode(node),
+                        };
+                    }
+
+                    for (var i = 0; i < diagnostics.Length; i++)
+                    {
+                        directiveNode.Diagnostics.Add(diagnostics[i]);
+                    }
+
+                    _builder.Push(directiveNode);
                 }
 
-                for (var i = 0; i < chunkGenerator.Diagnostics.Count; i++)
+                Visit(node.Body);
+
+                if (descriptor != null)
                 {
-                    directiveNode.Diagnostics.Add(chunkGenerator.Diagnostics[i]);
+                    _builder.Pop();
                 }
-
-                _builder.Push(directiveNode);
-
-                VisitDefault(block);
-
-                _builder.Pop();
             }
 
-            public override void VisitImportSpan(AddImportChunkGenerator chunkGenerator, Span span)
+            public override void VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
             {
-                var namespaceImport = chunkGenerator.Namespace.Trim();
-                var namespaceSpan = BuildSourceSpanFromNode(span);
-                _usings.Add(new UsingReference(namespaceImport, namespaceSpan));
+                var context = node.GetSpanContext();
+                if (context == null)
+                {
+                    base.VisitCSharpStatementLiteral(node);
+                    return;
+                }
+                else if (context.ChunkGenerator is DirectiveTokenChunkGenerator tokenChunkGenerator)
+                {
+                    _builder.Add(new DirectiveTokenIntermediateNode()
+                    {
+                        Content = node.GetContent(),
+                        DirectiveToken = tokenChunkGenerator.Descriptor,
+                        Source = BuildSourceSpanFromNode(node),
+                    });
+                }
+                else if (context.ChunkGenerator is AddImportChunkGenerator importChunkGenerator)
+                {
+                    var namespaceImport = importChunkGenerator.Namespace.Trim();
+                    var namespaceSpan = BuildSourceSpanFromNode(node);
+                    _usings.Add(new UsingReference(namespaceImport, namespaceSpan));
+                }
+                else if (context.ChunkGenerator is AddTagHelperChunkGenerator addTagHelperChunkGenerator)
+                {
+                    IntermediateNode directiveNode;
+                    if (IsMalformed(addTagHelperChunkGenerator.Diagnostics))
+                    {
+                        directiveNode = new MalformedDirectiveIntermediateNode()
+                        {
+                            DirectiveName = CSharpCodeParser.AddTagHelperDirectiveDescriptor.Directive,
+                            Directive = CSharpCodeParser.AddTagHelperDirectiveDescriptor,
+                            Source = BuildSourceSpanFromNode(node),
+                        };
+                    }
+                    else
+                    {
+                        directiveNode = new DirectiveIntermediateNode()
+                        {
+                            DirectiveName = CSharpCodeParser.AddTagHelperDirectiveDescriptor.Directive,
+                            Directive = CSharpCodeParser.AddTagHelperDirectiveDescriptor,
+                            Source = BuildSourceSpanFromNode(node),
+                        };
+                    }
+
+                    for (var i = 0; i < addTagHelperChunkGenerator.Diagnostics.Count; i++)
+                    {
+                        directiveNode.Diagnostics.Add(addTagHelperChunkGenerator.Diagnostics[i]);
+                    }
+
+                    _builder.Push(directiveNode);
+
+                    _builder.Add(new DirectiveTokenIntermediateNode()
+                    {
+                        Content = addTagHelperChunkGenerator.LookupText,
+                        DirectiveToken = CSharpCodeParser.AddTagHelperDirectiveDescriptor.Tokens.First(),
+                        Source = BuildSourceSpanFromNode(node),
+                    });
+
+                    _builder.Pop();
+                }
+                else if (context.ChunkGenerator is RemoveTagHelperChunkGenerator removeTagHelperChunkGenerator)
+                {
+                    IntermediateNode directiveNode;
+                    if (IsMalformed(removeTagHelperChunkGenerator.Diagnostics))
+                    {
+                        directiveNode = new MalformedDirectiveIntermediateNode()
+                        {
+                            DirectiveName = CSharpCodeParser.RemoveTagHelperDirectiveDescriptor.Directive,
+                            Directive = CSharpCodeParser.RemoveTagHelperDirectiveDescriptor,
+                            Source = BuildSourceSpanFromNode(node),
+                        };
+                    }
+                    else
+                    {
+                        directiveNode = new DirectiveIntermediateNode()
+                        {
+                            DirectiveName = CSharpCodeParser.RemoveTagHelperDirectiveDescriptor.Directive,
+                            Directive = CSharpCodeParser.RemoveTagHelperDirectiveDescriptor,
+                            Source = BuildSourceSpanFromNode(node),
+                        };
+                    }
+
+                    for (var i = 0; i < removeTagHelperChunkGenerator.Diagnostics.Count; i++)
+                    {
+                        directiveNode.Diagnostics.Add(removeTagHelperChunkGenerator.Diagnostics[i]);
+                    }
+
+                    _builder.Push(directiveNode);
+
+                    _builder.Add(new DirectiveTokenIntermediateNode()
+                    {
+                        Content = removeTagHelperChunkGenerator.LookupText,
+                        DirectiveToken = CSharpCodeParser.RemoveTagHelperDirectiveDescriptor.Tokens.First(),
+                        Source = BuildSourceSpanFromNode(node),
+                    });
+
+                    _builder.Pop();
+                }
+                else if (context.ChunkGenerator is TagHelperPrefixDirectiveChunkGenerator tagHelperPrefixChunkGenerator)
+                {
+                    IntermediateNode directiveNode;
+                    if (IsMalformed(tagHelperPrefixChunkGenerator.Diagnostics))
+                    {
+                        directiveNode = new MalformedDirectiveIntermediateNode()
+                        {
+                            DirectiveName = CSharpCodeParser.TagHelperPrefixDirectiveDescriptor.Directive,
+                            Directive = CSharpCodeParser.TagHelperPrefixDirectiveDescriptor,
+                            Source = BuildSourceSpanFromNode(node),
+                        };
+                    }
+                    else
+                    {
+                        directiveNode = new DirectiveIntermediateNode()
+                        {
+                            DirectiveName = CSharpCodeParser.TagHelperPrefixDirectiveDescriptor.Directive,
+                            Directive = CSharpCodeParser.TagHelperPrefixDirectiveDescriptor,
+                            Source = BuildSourceSpanFromNode(node),
+                        };
+                    }
+
+                    for (var i = 0; i < tagHelperPrefixChunkGenerator.Diagnostics.Count; i++)
+                    {
+                        directiveNode.Diagnostics.Add(tagHelperPrefixChunkGenerator.Diagnostics[i]);
+                    }
+
+                    _builder.Push(directiveNode);
+
+                    _builder.Add(new DirectiveTokenIntermediateNode()
+                    {
+                        Content = tagHelperPrefixChunkGenerator.Prefix,
+                        DirectiveToken = CSharpCodeParser.TagHelperPrefixDirectiveDescriptor.Tokens.First(),
+                        Source = BuildSourceSpanFromNode(node),
+                    });
+
+                    _builder.Pop();
+                }
+
+                base.VisitCSharpStatementLiteral(node);
             }
 
-            public override void VisitAddTagHelperSpan(AddTagHelperChunkGenerator chunkGenerator, Span span)
+            protected SourceSpan? BuildSourceSpanFromNode(SyntaxNode node)
             {
-                IntermediateNode directiveNode;
-                if (IsMalformed(chunkGenerator.Diagnostics))
-                {
-                    directiveNode = new MalformedDirectiveIntermediateNode()
-                    {
-                        DirectiveName = CSharpCodeParser.AddTagHelperDirectiveDescriptor.Directive,
-                        Directive = CSharpCodeParser.AddTagHelperDirectiveDescriptor,
-                        Source = BuildSourceSpanFromNode(span),
-                    };
-                }
-                else
-                {
-                    directiveNode = new DirectiveIntermediateNode()
-                    {
-                        DirectiveName = CSharpCodeParser.AddTagHelperDirectiveDescriptor.Directive,
-                        Directive = CSharpCodeParser.AddTagHelperDirectiveDescriptor,
-                        Source = BuildSourceSpanFromNode(span),
-                    };
-                }
-
-                for (var i = 0; i < chunkGenerator.Diagnostics.Count; i++)
-                {
-                    directiveNode.Diagnostics.Add(chunkGenerator.Diagnostics[i]);
-                }
-
-                _builder.Push(directiveNode);
-
-                _builder.Add(new DirectiveTokenIntermediateNode()
-                {
-                    Content = chunkGenerator.LookupText,
-                    DirectiveToken = CSharpCodeParser.AddTagHelperDirectiveDescriptor.Tokens.First(),
-                    Source = BuildSourceSpanFromNode(span),
-                });
-
-                _builder.Pop();
-            }
-
-            public override void VisitRemoveTagHelperSpan(RemoveTagHelperChunkGenerator chunkGenerator, Span span)
-            {
-                IntermediateNode directiveNode;
-                if (IsMalformed(chunkGenerator.Diagnostics))
-                {
-                    directiveNode = new MalformedDirectiveIntermediateNode()
-                    {
-                        DirectiveName = CSharpCodeParser.RemoveTagHelperDirectiveDescriptor.Directive,
-                        Directive = CSharpCodeParser.RemoveTagHelperDirectiveDescriptor,
-                        Source = BuildSourceSpanFromNode(span),
-                    };
-                }
-                else
-                {
-                    directiveNode = new DirectiveIntermediateNode()
-                    {
-                        DirectiveName = CSharpCodeParser.RemoveTagHelperDirectiveDescriptor.Directive,
-                        Directive = CSharpCodeParser.RemoveTagHelperDirectiveDescriptor,
-                        Source = BuildSourceSpanFromNode(span),
-                    };
-                }
-
-                for (var i = 0; i < chunkGenerator.Diagnostics.Count; i++)
-                {
-                    directiveNode.Diagnostics.Add(chunkGenerator.Diagnostics[i]);
-                }
-
-                _builder.Push(directiveNode);
-
-                _builder.Add(new DirectiveTokenIntermediateNode()
-                {
-                    Content = chunkGenerator.LookupText,
-                    DirectiveToken = CSharpCodeParser.RemoveTagHelperDirectiveDescriptor.Tokens.First(),
-                    Source = BuildSourceSpanFromNode(span),
-                });
-
-                _builder.Pop();
-            }
-
-            public override void VisitTagHelperPrefixDirectiveSpan(TagHelperPrefixDirectiveChunkGenerator chunkGenerator, Span span)
-            {
-                IntermediateNode directiveNode;
-                if (IsMalformed(chunkGenerator.Diagnostics))
-                {
-                    directiveNode = new MalformedDirectiveIntermediateNode()
-                    {
-                        DirectiveName = CSharpCodeParser.TagHelperPrefixDirectiveDescriptor.Directive,
-                        Directive = CSharpCodeParser.TagHelperPrefixDirectiveDescriptor,
-                        Source = BuildSourceSpanFromNode(span),
-                    };
-                }
-                else
-                {
-                    directiveNode = new DirectiveIntermediateNode()
-                    {
-                        DirectiveName = CSharpCodeParser.TagHelperPrefixDirectiveDescriptor.Directive,
-                        Directive = CSharpCodeParser.TagHelperPrefixDirectiveDescriptor,
-                        Source = BuildSourceSpanFromNode(span),
-                    };
-                }
-
-                for (var i = 0; i < chunkGenerator.Diagnostics.Count; i++)
-                {
-                    directiveNode.Diagnostics.Add(chunkGenerator.Diagnostics[i]);
-                }
-
-                _builder.Push(directiveNode);
-
-                _builder.Add(new DirectiveTokenIntermediateNode()
-                {
-                    Content = chunkGenerator.Prefix,
-                    DirectiveToken = CSharpCodeParser.TagHelperPrefixDirectiveDescriptor.Tokens.First(),
-                    Source = BuildSourceSpanFromNode(span),
-                });
-
-                _builder.Pop();
-            }
-
-            protected SourceSpan? BuildSourceSpanFromNode(SyntaxTreeNode node)
-            {
-                if (node == null || node.Start == SourceLocation.Undefined)
+                if (node == null)
                 {
                     return null;
                 }
 
-                var span = new SourceSpan(
-                    node.Start.FilePath ?? FilePath,
-                    node.Start.AbsoluteIndex,
-                    node.Start.LineIndex,
-                    node.Start.CharacterIndex,
-                    node.Length);
-                return span;
+                return node.GetSourceSpan(SourceDocument);
             }
         }
 
         private class MainSourceVisitor : LoweringVisitor
         {
+            private readonly HashSet<string> _renderedBoundAttributeNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
             private readonly string _tagHelperPrefix;
 
             public MainSourceVisitor(DocumentIntermediateNode document, IntermediateNodeBuilder builder, string tagHelperPrefix, RazorParserFeatureFlags featureFlags)
@@ -408,86 +422,144 @@ namespace Microsoft.AspNetCore.Razor.Language
             //  Name=checked
             //  Prefix= checked="
             //  Suffix="
-            public override void VisitAttributeBlock(AttributeBlockChunkGenerator chunkGenerator, Block block)
+            public override void VisitMarkupAttributeBlock(MarkupAttributeBlockSyntax node)
             {
-                _builder.Push(new HtmlAttributeIntermediateNode()
+                var prefixTokens = MergeLiterals(
+                    node.NamePrefix?.LiteralTokens,
+                    node.Name.LiteralTokens,
+                    node.NameSuffix?.LiteralTokens,
+                    node.EqualsToken == null ? new SyntaxList<SyntaxToken>() : new SyntaxList<SyntaxToken>(node.EqualsToken),
+                    node.ValuePrefix?.LiteralTokens);
+                var prefix = (MarkupTextLiteralSyntax)SyntaxFactory.MarkupTextLiteral(prefixTokens).Green.CreateRed(node, node.NamePrefix?.Position ?? node.Name.Position);
+
+                var name = node.Name.GetContent();
+                if (name.StartsWith("data-", StringComparison.OrdinalIgnoreCase) &&
+                    !_featureFlags.EXPERIMENTAL_AllowConditionalDataDashAttributes)
                 {
-                    AttributeName = chunkGenerator.Name,
-                    Prefix = chunkGenerator.Prefix,
-                    Suffix = chunkGenerator.Suffix,
-                    Source = BuildSourceSpanFromNode(block),
-                });
+                    Visit(prefix);
+                    Visit(node.Value);
+                    Visit(node.ValueSuffix);
+                }
+                else
+                {
+                    if (node.Value != null && node.Value.ChildNodes().All(c => c is MarkupLiteralAttributeValueSyntax))
+                    {
+                        // We need to do what ConditionalAttributeCollapser used to do.
+                        var literalAttributeValueNodes = node.Value.ChildNodes().Cast<MarkupLiteralAttributeValueSyntax>().ToArray();
+                        var valueTokens = SyntaxListBuilder<SyntaxToken>.Create();
+                        for (var i = 0; i < literalAttributeValueNodes.Length; i++)
+                        {
+                            var mergedValue = MergeAttributeValue(literalAttributeValueNodes[i]);
+                            valueTokens.AddRange(mergedValue.LiteralTokens);
+                        }
+                        var rewritten = SyntaxFactory.MarkupTextLiteral(valueTokens.ToList());
 
-                VisitDefault(block);
+                        var mergedLiterals = MergeLiterals(prefix?.LiteralTokens, rewritten.LiteralTokens, node.ValueSuffix?.LiteralTokens);
+                        var mergedAttribute = SyntaxFactory.MarkupTextLiteral(mergedLiterals).Green.CreateRed(node.Parent, node.Position);
+                        Visit(mergedAttribute);
+                    }
+                    else
+                    {
+                        _builder.Push(new HtmlAttributeIntermediateNode()
+                        {
+                            AttributeName = node.Name.GetContent(),
+                            Prefix = prefix.GetContent(),
+                            Suffix = node.ValueSuffix?.GetContent() ?? string.Empty,
+                            Source = BuildSourceSpanFromNode(node),
+                        });
 
-                _builder.Pop();
+                        VisitAttributeValue(node.Value);
+
+                        _builder.Pop();
+                    }
+                }
+            }
+
+            public override void VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
+            {
+                var name = node.Name.GetContent();
+                if (name.StartsWith("data-", StringComparison.OrdinalIgnoreCase) &&
+                    !_featureFlags.EXPERIMENTAL_AllowConditionalDataDashAttributes)
+                {
+                    base.VisitMarkupMinimizedAttributeBlock(node);
+                    return;
+                }
+
+                // Minimized attributes are just html content.
+                var literals = MergeLiterals(
+                    node.NamePrefix?.LiteralTokens,
+                    node.Name?.LiteralTokens);
+                var literal = SyntaxFactory.MarkupTextLiteral(literals).Green.CreateRed(node.Parent, node.Position);
+
+                Visit(literal);
             }
 
             // Example
             // <input checked="hello-world `@false`"/>
             //  Prefix= (space)
             //  Children will contain a token for @false.
-            public override void VisitDynamicAttributeBlock(DynamicAttributeBlockChunkGenerator chunkGenerator, Block block)
+            public override void VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
             {
-                var firstChild = block.Children.FirstOrDefault(c => c.IsBlock) as Block;
-                if (firstChild == null || firstChild.Type == BlockKindInternal.Expression)
+                var containsExpression = false;
+                var descendantNodes = node.DescendantNodes(n =>
+                {
+                    // Don't go into sub block. They may contain expressions but we only care about the top level.
+                    return !(n.Parent is CSharpCodeBlockSyntax);
+                });
+                foreach (var child in descendantNodes)
+                {
+                    if (child is CSharpImplicitExpressionSyntax || child is CSharpExplicitExpressionSyntax)
+                    {
+                        containsExpression = true;
+                    }
+                }
+
+                if (containsExpression)
                 {
                     _builder.Push(new CSharpExpressionAttributeValueIntermediateNode()
                     {
-                        Prefix = chunkGenerator.Prefix,
-                        Source = BuildSourceSpanFromNode(block),
+                        Prefix = node.Prefix?.GetContent() ?? string.Empty,
+                        Source = BuildSourceSpanFromNode(node),
                     });
                 }
                 else
                 {
                     _builder.Push(new CSharpCodeAttributeValueIntermediateNode()
                     {
-                        Prefix = chunkGenerator.Prefix,
-                        Source = BuildSourceSpanFromNode(block),
+                        Prefix = node.Prefix?.GetContent() ?? string.Empty,
+                        Source = BuildSourceSpanFromNode(node),
                     });
                 }
 
-                VisitDefault(block);
+                Visit(node.Value);
 
                 _builder.Pop();
             }
 
-            public override void VisitLiteralAttributeSpan(LiteralAttributeChunkGenerator chunkGenerator, Span span)
+            public override void VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
             {
                 _builder.Push(new HtmlAttributeValueIntermediateNode()
                 {
-                    Prefix = chunkGenerator.Prefix,
-                    Source = BuildSourceSpanFromNode(span),
+                    Prefix = node.Prefix?.GetContent() ?? string.Empty,
+                    Source = BuildSourceSpanFromNode(node),
                 });
 
-                var location = chunkGenerator.Value.Location;
-                SourceSpan? valueSpan = null;
-                if (location != SourceLocation.Undefined)
-                {
-                    valueSpan = new SourceSpan(
-                        location.FilePath ?? FilePath,
-                        location.AbsoluteIndex,
-                        location.LineIndex,
-                        location.CharacterIndex,
-                        chunkGenerator.Value.Value.Length);
-                }
-
                 _builder.Add(new IntermediateToken()
                 {
-                    Content = chunkGenerator.Value,
+                    Content = node.Value?.GetContent() ?? string.Empty,
                     Kind = TokenKind.Html,
-                    Source = valueSpan
+                    Source = BuildSourceSpanFromNode(node.Value)
                 });
 
                 _builder.Pop();
             }
 
-            public override void VisitTemplateBlock(TemplateBlockChunkGenerator chunkGenerator, Block block)
+            public override void VisitCSharpTemplateBlock(CSharpTemplateBlockSyntax node)
             {
                 var templateNode = new TemplateIntermediateNode();
                 _builder.Push(templateNode);
 
-                VisitDefault(block);
+                base.VisitCSharpTemplateBlock(node);
 
                 _builder.Pop();
 
@@ -503,7 +575,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                         var contentLength = templateNode.Children.Sum(child => child.Source?.Length ?? 0);
 
                         templateNode.Source = new SourceSpan(
-                            sourceRangeStart.Value.FilePath ?? FilePath,
+                            sourceRangeStart.Value.FilePath ?? SourceDocument.FilePath,
                             sourceRangeStart.Value.AbsoluteIndex,
                             sourceRangeStart.Value.LineIndex,
                             sourceRangeStart.Value.CharacterIndex,
@@ -518,11 +590,11 @@ namespace Microsoft.AspNetCore.Razor.Language
             //      @DateTime.@*This is a comment*@Now
             //
             // We need to capture this in the IR so that we can give each piece the correct source mappings
-            public override void VisitExpressionBlock(ExpressionChunkGenerator chunkGenerator, Block block)
+            public override void VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
             {
                 if (_builder.Current is CSharpExpressionAttributeValueIntermediateNode)
                 {
-                    VisitDefault(block);
+                    base.VisitCSharpExplicitExpression(node);
                     return;
                 }
 
@@ -530,7 +602,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
                 _builder.Push(expressionNode);
 
-                VisitDefault(block);
+                base.VisitCSharpExplicitExpression(node);
 
                 _builder.Pop();
 
@@ -546,7 +618,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                         var contentLength = expressionNode.Children.Sum(child => child.Source?.Length ?? 0);
 
                         expressionNode.Source = new SourceSpan(
-                            sourceRangeStart.Value.FilePath ?? FilePath,
+                            sourceRangeStart.Value.FilePath ?? SourceDocument.FilePath,
                             sourceRangeStart.Value.AbsoluteIndex,
                             sourceRangeStart.Value.LineIndex,
                             sourceRangeStart.Value.CharacterIndex,
@@ -555,57 +627,120 @@ namespace Microsoft.AspNetCore.Razor.Language
                 }
             }
 
-            public override void VisitExpressionSpan(ExpressionChunkGenerator chunkGenerator, Span span)
+            public override void VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
             {
-                _builder.Add(new IntermediateToken()
+                if (_builder.Current is CSharpExpressionAttributeValueIntermediateNode)
                 {
-                    Content = span.Content,
-                    Kind = TokenKind.CSharp,
-                    Source = BuildSourceSpanFromNode(span),
-                });
-            }
+                    base.VisitCSharpImplicitExpression(node);
+                    return;
+                }
 
-            public override void VisitStatementSpan(StatementChunkGenerator chunkGenerator, Span span)
-            {
-                var isAttributeValue = _builder.Current is CSharpCodeAttributeValueIntermediateNode;
+                var expressionNode = new CSharpExpressionIntermediateNode();
 
-                if (!isAttributeValue)
+                _builder.Push(expressionNode);
+
+                base.VisitCSharpImplicitExpression(node);
+
+                _builder.Pop();
+
+                if (expressionNode.Children.Count > 0)
                 {
-                    var statementNode = new CSharpCodeIntermediateNode()
+                    var sourceRangeStart = expressionNode
+                        .Children
+                        .FirstOrDefault(child => child.Source != null)
+                        ?.Source;
+
+                    if (sourceRangeStart != null)
                     {
-                        Source = BuildSourceSpanFromNode(span)
-                    };
-                    _builder.Push(statementNode);
+                        var contentLength = expressionNode.Children.Sum(child => child.Source?.Length ?? 0);
+
+                        expressionNode.Source = new SourceSpan(
+                            sourceRangeStart.Value.FilePath ?? SourceDocument.FilePath,
+                            sourceRangeStart.Value.AbsoluteIndex,
+                            sourceRangeStart.Value.LineIndex,
+                            sourceRangeStart.Value.CharacterIndex,
+                            contentLength);
+                    }
+                }
+            }
+
+            public override void VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+            {
+                if (_builder.Current is TagHelperHtmlAttributeIntermediateNode)
+                {
+                    // If we are top level in a tag helper HTML attribute, we want to be rendered as markup.
+                    // This case happens for duplicate non-string bound attributes. They would be initially be categorized as
+                    // CSharp but since they are duplicate, they should just be markup.
+                    var markupLiteral = SyntaxFactory.MarkupTextLiteral(node.LiteralTokens).Green.CreateRed(node.Parent, node.Position);
+                    Visit(markupLiteral);
+                    return;
                 }
 
                 _builder.Add(new IntermediateToken()
                 {
-                    Content = span.Content,
+                    Content = node.GetContent(),
                     Kind = TokenKind.CSharp,
-                    Source = BuildSourceSpanFromNode(span),
+                    Source = BuildSourceSpanFromNode(node),
                 });
 
-                if (!isAttributeValue)
-                {
-                    _builder.Pop();
-                }
+                base.VisitCSharpExpressionLiteral(node);
             }
 
-            public override void VisitMarkupSpan(MarkupChunkGenerator chunkGenerator, Span span)
+            public override void VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
             {
-                if (span.Tokens.Count == 1)
+                var context = node.GetSpanContext();
+                if (context == null || context.ChunkGenerator is StatementChunkGenerator)
                 {
-                    var token = span.Tokens[0] as HtmlToken;
+                    var isAttributeValue = _builder.Current is CSharpCodeAttributeValueIntermediateNode;
+
+                    if (!isAttributeValue)
+                    {
+                        var statementNode = new CSharpCodeIntermediateNode()
+                        {
+                            Source = BuildSourceSpanFromNode(node)
+                        };
+                        _builder.Push(statementNode);
+                    }
+
+                    _builder.Add(new IntermediateToken()
+                    {
+                        Content = node.GetContent(),
+                        Kind = TokenKind.CSharp,
+                        Source = BuildSourceSpanFromNode(node),
+                    });
+
+                    if (!isAttributeValue)
+                    {
+                        _builder.Pop();
+                    }
+                }
+
+                base.VisitCSharpStatementLiteral(node);
+            }
+
+            public override void VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+            {
+                var context = node.GetSpanContext();
+                if (context != null && context.ChunkGenerator == SpanChunkGenerator.Null)
+                {
+                    base.VisitMarkupTextLiteral(node);
+                    return;
+                }
+
+                if (node.LiteralTokens.Count == 1)
+                {
+                    var token = node.LiteralTokens[0];
                     if (token != null &&
-                        token.Type == HtmlTokenType.Unknown &&
+                        token.Kind == SyntaxKind.Marker &&
                         token.Content.Length == 0)
                     {
                         // We don't want to create IR nodes for marker tokens.
+                        base.VisitMarkupTextLiteral(node);
                         return;
                     }
                 }
 
-                var source = BuildSourceSpanFromNode(span);
+                var source = BuildSourceSpanFromNode(node);
                 var currentChildren = _builder.Current.Children;
                 if (currentChildren.Count > 0 && currentChildren[currentChildren.Count - 1] is HtmlContentIntermediateNode)
                 {
@@ -613,7 +748,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
                     if (existingHtmlContent.Source == null && source == null)
                     {
-                        Combine(existingHtmlContent, span);
+                        Combine(existingHtmlContent, node);
+                        base.VisitMarkupTextLiteral(node);
                         return;
                     }
 
@@ -622,7 +758,8 @@ namespace Microsoft.AspNetCore.Razor.Language
                         existingHtmlContent.Source.Value.FilePath == source.Value.FilePath &&
                         existingHtmlContent.Source.Value.AbsoluteIndex + existingHtmlContent.Source.Value.Length == source.Value.AbsoluteIndex)
                     {
-                        Combine(existingHtmlContent, span);
+                        Combine(existingHtmlContent, node);
+                        base.VisitMarkupTextLiteral(node);
                         return;
                     }
                 }
@@ -635,23 +772,20 @@ namespace Microsoft.AspNetCore.Razor.Language
 
                 _builder.Add(new IntermediateToken()
                 {
-                    Content = span.Content,
+                    Content = node.GetContent(),
                     Kind = TokenKind.Html,
                     Source = source,
                 });
 
                 _builder.Pop();
+
+                base.VisitMarkupTextLiteral(node);
             }
 
-            public override void VisitTagHelperBlock(TagHelperChunkGenerator chunkGenerator, Block block)
+            public override void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
             {
-                var tagHelperBlock = block as TagHelperBlock;
-                if (tagHelperBlock == null)
-                {
-                    return;
-                }
-
-                var tagName = tagHelperBlock.TagName;
+                var info = node.TagHelperInfo;
+                var tagName = info.TagName;
                 if (_tagHelperPrefix != null)
                 {
                     tagName = tagName.Substring(_tagHelperPrefix.Length);
@@ -660,11 +794,11 @@ namespace Microsoft.AspNetCore.Razor.Language
                 var tagHelperNode = new TagHelperIntermediateNode()
                 {
                     TagName = tagName,
-                    TagMode = tagHelperBlock.TagMode,
-                    Source = BuildSourceSpanFromNode(block)
+                    TagMode = info.TagMode,
+                    Source = BuildSourceSpanFromNode(node)
                 };
 
-                foreach (var tagHelper in tagHelperBlock.Binding.Descriptors)
+                foreach (var tagHelper in info.BindingResult.Descriptors)
                 {
                     tagHelperNode.TagHelpers.Add(tagHelper);
                 }
@@ -673,22 +807,223 @@ namespace Microsoft.AspNetCore.Razor.Language
 
                 _builder.Push(new TagHelperBodyIntermediateNode());
 
-                VisitDefault(block);
+                foreach (var item in node.Body)
+                {
+                    Visit(item);
+                }
 
                 _builder.Pop(); // Pop InitializeTagHelperStructureIntermediateNode
 
-                AddTagHelperAttributes(tagHelperBlock.Attributes, tagHelperBlock.Binding);
+                Visit(node.StartTag);
 
                 _builder.Pop(); // Pop TagHelperIntermediateNode
+
+                // No need to visit the end tag because we don't write any IR for it.
+
+                // We don't want to track attributes from a previous tag helper element.
+                _renderedBoundAttributeNames.Clear();
             }
 
-            private void Combine(HtmlContentIntermediateNode node, Span span)
+            public override void VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
+            {
+                foreach (var child in node.Children)
+                {
+                    if (child is MarkupTagHelperAttributeSyntax || child is MarkupMinimizedTagHelperAttributeSyntax)
+                    {
+                        Visit(child);
+                    }
+                }
+            }
+
+            public override void VisitMarkupMinimizedTagHelperAttribute(MarkupMinimizedTagHelperAttributeSyntax node)
+            {
+                if (!_featureFlags.AllowMinimizedBooleanTagHelperAttributes)
+                {
+                    // Minimized attributes are not valid for non-boolean bound attributes. TagHelperBlockRewriter
+                    // has already logged an error if it was a non-boolean bound attribute; so we can skip.
+                    return;
+                }
+
+                var element = node.FirstAncestorOrSelf<MarkupTagHelperElementSyntax>();
+                var descriptors = element.TagHelperInfo.BindingResult.Descriptors;
+                var attributeName = node.Name.GetContent();
+                var associatedDescriptors = descriptors.Where(descriptor =>
+                    descriptor.BoundAttributes.Any(attributeDescriptor => TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, attributeDescriptor)));
+
+                if (associatedDescriptors.Any() && _renderedBoundAttributeNames.Add(attributeName))
+                {
+                    foreach (var associatedDescriptor in associatedDescriptors)
+                    {
+                        var associatedAttributeDescriptor = associatedDescriptor.BoundAttributes.First(a =>
+                        {
+                            return TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, a);
+                        });
+
+                        var expectsBooleanValue = associatedAttributeDescriptor.ExpectsBooleanValue(attributeName);
+
+                        if (!expectsBooleanValue)
+                        {
+                            // We do not allow minimized non-boolean bound attributes.
+                            return;
+                        }
+
+                        var setTagHelperProperty = new TagHelperPropertyIntermediateNode()
+                        {
+                            AttributeName = attributeName,
+                            BoundAttribute = associatedAttributeDescriptor,
+                            TagHelper = associatedDescriptor,
+                            AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure,
+                            Source = null,
+                            IsIndexerNameMatch = TagHelperMatchingConventions.SatisfiesBoundAttributeIndexer(attributeName, associatedAttributeDescriptor),
+                        };
+
+                        _builder.Add(setTagHelperProperty);
+                    }
+                }
+                else
+                {
+                    var addHtmlAttribute = new TagHelperHtmlAttributeIntermediateNode()
+                    {
+                        AttributeName = attributeName,
+                        AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure
+                    };
+
+                    _builder.Add(addHtmlAttribute);
+                }
+            }
+
+            public override void VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
+            {
+                var element = node.FirstAncestorOrSelf<MarkupTagHelperElementSyntax>();
+                var descriptors = element.TagHelperInfo.BindingResult.Descriptors;
+                var attributeName = node.Name.GetContent();
+                var attributeValueNode = node.Value;
+                var associatedDescriptors = descriptors.Where(descriptor =>
+                    descriptor.BoundAttributes.Any(attributeDescriptor => TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, attributeDescriptor)));
+
+                if (associatedDescriptors.Any() && _renderedBoundAttributeNames.Add(attributeName))
+                {
+                    foreach (var associatedDescriptor in associatedDescriptors)
+                    {
+                        var associatedAttributeDescriptor = associatedDescriptor.BoundAttributes.First(a =>
+                        {
+                            return TagHelperMatchingConventions.CanSatisfyBoundAttribute(attributeName, a);
+                        });
+
+                        var setTagHelperProperty = new TagHelperPropertyIntermediateNode()
+                        {
+                            AttributeName = attributeName,
+                            BoundAttribute = associatedAttributeDescriptor,
+                            TagHelper = associatedDescriptor,
+                            AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure,
+                            Source = BuildSourceSpanFromNode(attributeValueNode),
+                            IsIndexerNameMatch = TagHelperMatchingConventions.SatisfiesBoundAttributeIndexer(attributeName, associatedAttributeDescriptor),
+                        };
+
+                        _builder.Push(setTagHelperProperty);
+                        VisitAttributeValue(attributeValueNode);
+                        _builder.Pop();
+                    }
+                }
+                else
+                {
+                    var addHtmlAttribute = new TagHelperHtmlAttributeIntermediateNode()
+                    {
+                        AttributeName = attributeName,
+                        AttributeStructure = node.TagHelperAttributeInfo.AttributeStructure
+                    };
+
+                    _builder.Push(addHtmlAttribute);
+                    VisitAttributeValue(attributeValueNode);
+                    _builder.Pop();
+                }
+            }
+
+            private void VisitAttributeValue(SyntaxNode node)
+            {
+                if (node == null)
+                {
+                    return;
+                }
+
+                IReadOnlyList<SyntaxNode> children = node.ChildNodes();
+                var position = node.Position;
+                if (children.First() is MarkupBlockSyntax markupBlock &&
+                    markupBlock.Children.Count == 2 &&
+                    markupBlock.Children[0] is MarkupTextLiteralSyntax &&
+                    markupBlock.Children[1] is MarkupEphemeralTextLiteralSyntax)
+                {
+                    // This is a special case when we have an attribute like attr="@@foo".
+                    // In this case, we want the foo to be written out as HtmlContent and not HtmlAttributeValue.
+                    Visit(markupBlock);
+                    children = children.Skip(1).ToList();
+                    position = children.Count > 0 ? children[0].Position : position;
+                }
+
+                if (children.All(c => c is MarkupLiteralAttributeValueSyntax))
+                {
+                    var literalAttributeValueNodes = children.Cast<MarkupLiteralAttributeValueSyntax>().ToArray();
+                    var valueTokens = SyntaxListBuilder<SyntaxToken>.Create();
+                    for (var i = 0; i < literalAttributeValueNodes.Length; i++)
+                    {
+                        var mergedValue = MergeAttributeValue(literalAttributeValueNodes[i]);
+                        valueTokens.AddRange(mergedValue.LiteralTokens);
+                    }
+                    var rewritten = SyntaxFactory.MarkupTextLiteral(valueTokens.ToList()).Green.CreateRed(node.Parent, position);
+                    Visit(rewritten);
+                }
+                else if (children.All(c => c is MarkupTextLiteralSyntax))
+                {
+                    var builder = SyntaxListBuilder<SyntaxToken>.Create();
+                    var markupLiteralArray = children.Cast<MarkupTextLiteralSyntax>();
+                    foreach (var literal in markupLiteralArray)
+                    {
+                        builder.AddRange(literal.LiteralTokens);
+                    }
+                    var rewritten = SyntaxFactory.MarkupTextLiteral(builder.ToList()).Green.CreateRed(node.Parent, position);
+                    Visit(rewritten);
+                }
+                else if (children.All(c => c is CSharpExpressionLiteralSyntax))
+                {
+                    var builder = SyntaxListBuilder<SyntaxToken>.Create();
+                    var expressionLiteralArray = children.Cast<CSharpExpressionLiteralSyntax>();
+                    SpanContext context = null;
+                    foreach (var literal in expressionLiteralArray)
+                    {
+                        context = literal.GetSpanContext();
+                        builder.AddRange(literal.LiteralTokens);
+                    }
+                    var rewritten = SyntaxFactory.CSharpExpressionLiteral(builder.ToList()).Green.CreateRed(node.Parent, position);
+                    rewritten = context != null ? rewritten.WithSpanContext(context) : rewritten;
+                    Visit(rewritten);
+                }
+                else
+                {
+                    Visit(node);
+                }
+            }
+
+            private MarkupTextLiteralSyntax MergeAttributeValue(MarkupLiteralAttributeValueSyntax node)
+            {
+                var valueTokens = MergeLiterals(node.Prefix?.LiteralTokens, node.Value?.LiteralTokens);
+                var rewritten = node.Prefix?.Update(valueTokens) ?? node.Value?.Update(valueTokens);
+                rewritten = (MarkupTextLiteralSyntax)rewritten?.Green.CreateRed(node, node.Position);
+                var originalContext = rewritten.GetSpanContext();
+                if (originalContext != null)
+                {
+                    rewritten = rewritten.WithSpanContext(new SpanContext(new MarkupChunkGenerator(), originalContext.EditHandler));
+                }
+
+                return rewritten;
+            }
+
+            private void Combine(HtmlContentIntermediateNode node, SyntaxNode item)
             {
                 node.Children.Add(new IntermediateToken()
                 {
-                    Content = span.Content,
+                    Content = item.GetContent(),
                     Kind = TokenKind.Html,
-                    Source = BuildSourceSpanFromNode(span),
+                    Source = BuildSourceSpanFromNode(item),
                 });
 
                 if (node.Source != null)
@@ -700,76 +1035,25 @@ namespace Microsoft.AspNetCore.Razor.Language
                         node.Source.Value.AbsoluteIndex,
                         node.Source.Value.LineIndex,
                         node.Source.Value.CharacterIndex,
-                        node.Source.Value.Length + span.Content.Length);
+                        node.Source.Value.Length + item.FullWidth);
                 }
             }
 
-            private void AddTagHelperAttributes(IList<TagHelperAttributeNode> attributes, TagHelperBinding tagHelperBinding)
+            private SyntaxList<SyntaxToken> MergeLiterals(params SyntaxList<SyntaxToken>?[] literals)
             {
-                var descriptors = tagHelperBinding.Descriptors;
-                var renderedBoundAttributeNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-                foreach (var attribute in attributes)
+                var builder = SyntaxListBuilder<SyntaxToken>.Create();
+                for (var i = 0; i < literals.Length; i++)
                 {
-                    var attributeValueNode = attribute.Value;
-                    var associatedDescriptors = descriptors.Where(descriptor =>
-                        descriptor.BoundAttributes.Any(attributeDescriptor => TagHelperMatchingConventions.CanSatisfyBoundAttribute(attribute.Name, attributeDescriptor)));
-
-                    if (associatedDescriptors.Any() && renderedBoundAttributeNames.Add(attribute.Name))
+                    var literal = literals[i];
+                    if (!literal.HasValue)
                     {
-                        var isMinimizedAttribute = attributeValueNode == null;
-                        if (isMinimizedAttribute && !_featureFlags.AllowMinimizedBooleanTagHelperAttributes)
-                        {
-                            // Minimized attributes are not valid for non-boolean bound attributes. TagHelperBlockRewriter
-                            // has already logged an error if it was a non-boolean bound attribute; so we can skip.
-                            continue;
-                        }
-
-                        foreach (var associatedDescriptor in associatedDescriptors)
-                        {
-                            var associatedAttributeDescriptor = associatedDescriptor.BoundAttributes.First(a =>
-                            {
-                                return TagHelperMatchingConventions.CanSatisfyBoundAttribute(attribute.Name, a);
-                            });
-
-                            var expectsBooleanValue = associatedAttributeDescriptor.ExpectsBooleanValue(attribute.Name);
-
-                            if (isMinimizedAttribute && !expectsBooleanValue)
-                            {
-                                // We do not allow minimized non-boolean bound attributes.
-                                continue;
-                            }
-
-                            var setTagHelperProperty = new TagHelperPropertyIntermediateNode()
-                            {
-                                AttributeName = attribute.Name,
-                                BoundAttribute = associatedAttributeDescriptor,
-                                TagHelper = associatedDescriptor,
-                                AttributeStructure = attribute.AttributeStructure,
-                                Source = BuildSourceSpanFromNode(attributeValueNode),
-                                IsIndexerNameMatch = TagHelperMatchingConventions.SatisfiesBoundAttributeIndexer(attribute.Name, associatedAttributeDescriptor),
-                            };
-
-                            _builder.Push(setTagHelperProperty);
-                            attributeValueNode?.Accept(this);
-                            _builder.Pop();
-                        }
+                        continue;
                     }
-                    else
-                    {
-                        var addHtmlAttribute = new TagHelperHtmlAttributeIntermediateNode()
-                        {
-                            AttributeName = attribute.Name,
-                            AttributeStructure = attribute.AttributeStructure
-                        };
 
-                        _builder.Push(addHtmlAttribute);
-                        if (attributeValueNode != null)
-                        {
-                            attributeValueNode.Accept(this);
-                        }
-                        _builder.Pop();
-                    }
+                    builder.AddRange(literal.Value);
                 }
+
+                return builder.ToList();
             }
         }
 
@@ -827,8 +1111,8 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
         }
 
-        private static bool IsMalformed(List<RazorDiagnostic> diagnostics)
-            => diagnostics.Count > 0 && diagnostics.Any(diagnostic => diagnostic.Severity == RazorDiagnosticSeverity.Error);
+        private static bool IsMalformed(IEnumerable<RazorDiagnostic> diagnostics)
+            => diagnostics.Any(diagnostic => diagnostic.Severity == RazorDiagnosticSeverity.Error);
     }
 #pragma warning restore CS0618 // Type or member is obsolete
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorProjectFileSystem.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorProjectFileSystem.cs
index 2600ce5efe..9283088cd1 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorProjectFileSystem.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorProjectFileSystem.cs
@@ -49,6 +49,10 @@ namespace Microsoft.AspNetCore.Razor.Language
             var absolutePath = NormalizeAndEnsureValidPath(path);
 
             var file = new FileInfo(absolutePath);
+            if (!absolutePath.StartsWith(absoluteBasePath))
+            {
+                throw new InvalidOperationException($"The file '{file.FullName}' is not a descendent of the base path '{absoluteBasePath}'.");
+            }
 
             var relativePhysicalPath = file.FullName.Substring(absoluteBasePath.Length + 1); // Include leading separator
             var filePath = "/" + relativePhysicalPath.Replace(Path.DirectorySeparatorChar, '/');
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorSyntaxTree.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorSyntaxTree.cs
index 4b6d43fe06..018dbfe5fb 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorSyntaxTree.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorSyntaxTree.cs
@@ -1,15 +1,17 @@
 // 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;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
     internal class DefaultRazorSyntaxTree : RazorSyntaxTree
     {
         public DefaultRazorSyntaxTree(
-            Block root,
+            SyntaxNode root,
             RazorSourceDocument source,
             IReadOnlyList<RazorDiagnostic> diagnostics,
             RazorParserOptions options)
@@ -24,7 +26,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public override RazorParserOptions Options { get; }
 
-        internal override Block Root { get; }
+        internal override SyntaxNode Root { get; }
 
         public override RazorSourceDocument Source { get; }
     }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorTagHelperBinderPhase.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorTagHelperBinderPhase.cs
index aa0668a539..c15aaff04e 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorTagHelperBinderPhase.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorTagHelperBinderPhase.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
@@ -39,11 +40,11 @@ namespace Microsoft.AspNetCore.Razor.Language
                 for (var i = 0; i < imports.Count; i++)
                 {
                     var import = imports[i];
-                    visitor.VisitBlock(import.Root);
+                    visitor.Visit(import.Root);
                 }
             }
 
-            visitor.VisitBlock(syntaxTree.Root);
+            visitor.Visit(syntaxTree.Root);
 
             var tagHelperPrefix = visitor.TagHelperPrefix;
             descriptors = visitor.Matches.ToArray();
@@ -57,21 +58,9 @@ namespace Microsoft.AspNetCore.Razor.Language
                 return;
             }
 
-            var errorSink = new ErrorSink();
-            var rewriter = new TagHelperParseTreeRewriter(tagHelperPrefix, descriptors, syntaxTree.Options.FeatureFlags);
-
-            var root = syntaxTree.Root;
-            root = rewriter.Rewrite(root, errorSink);
-
-            var errorList = new List<RazorDiagnostic>();
-            errorList.AddRange(errorSink.Errors);
-
-            errorList.AddRange(descriptors.SelectMany(d => d.GetAllDiagnostics()));
-
-            var diagnostics = CombineErrors(syntaxTree.Diagnostics, errorList);
-
-            var newSyntaxTree = RazorSyntaxTree.Create(root, syntaxTree.Source, diagnostics, syntaxTree.Options);
-            codeDocument.SetSyntaxTree(newSyntaxTree);
+            var rewrittenSyntaxTree = TagHelperParseTreeRewriter.Rewrite(syntaxTree, tagHelperPrefix, descriptors);
+            
+            codeDocument.SetSyntaxTree(rewrittenSyntaxTree);
         }
 
         private static bool MatchesDirective(TagHelperDescriptor descriptor, string typePattern, string assemblyName)
@@ -97,25 +86,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             return string.Equals(descriptor.Name, typePattern, StringComparison.Ordinal);
         }
 
-        private static int GetErrorLength(string directiveText)
-        {
-            var nonNullLength = directiveText == null ? 1 : directiveText.Length;
-            var normalizeEmptyStringLength = Math.Max(nonNullLength, 1);
-
-            return normalizeEmptyStringLength;
-        }
-
-        private IReadOnlyList<RazorDiagnostic> CombineErrors(IReadOnlyList<RazorDiagnostic> errors1, IReadOnlyList<RazorDiagnostic> errors2)
-        {
-            var combinedErrors = new List<RazorDiagnostic>(errors1.Count + errors2.Count);
-            combinedErrors.AddRange(errors1);
-            combinedErrors.AddRange(errors2);
-
-            return combinedErrors;
-        }
-
-        // Internal for testing.
-        internal class DirectiveVisitor : ParserVisitor
+        internal class DirectiveVisitor : SyntaxRewriter
         {
             private IReadOnlyList<TagHelperDescriptor> _tagHelpers;
 
@@ -128,62 +99,80 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             public HashSet<TagHelperDescriptor> Matches { get; } = new HashSet<TagHelperDescriptor>();
 
-            public override void VisitAddTagHelperSpan(AddTagHelperChunkGenerator chunkGenerator, Span span)
+            public override SyntaxNode VisitRazorDirective(RazorDirectiveSyntax node)
             {
-                if (chunkGenerator.AssemblyName == null)
+                var descendantLiterals = node.DescendantNodes();
+                foreach (var child in descendantLiterals)
                 {
-                    // Skip this one, it's an error
-                    return;
-                }
-
-                if (!AssemblyContainsTagHelpers(chunkGenerator.AssemblyName, _tagHelpers))
-                {
-                    // No tag helpers in the assembly.
-                    return;
-                }
-
-                for (var i = 0; i < _tagHelpers.Count; i++)
-                {
-                    var tagHelper = _tagHelpers[i];
-                    if (MatchesDirective(tagHelper, chunkGenerator.TypePattern, chunkGenerator.AssemblyName))
+                    if (!(child is CSharpStatementLiteralSyntax literal))
                     {
-                        Matches.Add(tagHelper);
+                        continue;
+                    }
+
+                    var context = literal.GetSpanContext();
+                    if (context == null)
+                    {
+                        // We can't find a chunk generator.
+                        continue;
+                    }
+                    else if (context.ChunkGenerator is AddTagHelperChunkGenerator addTagHelper)
+                    {
+                        if (addTagHelper.AssemblyName == null)
+                        {
+                            // Skip this one, it's an error
+                            continue;
+                        }
+
+                        if (!AssemblyContainsTagHelpers(addTagHelper.AssemblyName, _tagHelpers))
+                        {
+                            // No tag helpers in the assembly.
+                            continue;
+                        }
+
+                        for (var i = 0; i < _tagHelpers.Count; i++)
+                        {
+                            var tagHelper = _tagHelpers[i];
+                            if (MatchesDirective(tagHelper, addTagHelper.TypePattern, addTagHelper.AssemblyName))
+                            {
+                                Matches.Add(tagHelper);
+                            }
+                        }
+                    }
+                    else if (context.ChunkGenerator is RemoveTagHelperChunkGenerator removeTagHelper)
+                    {
+                        if (removeTagHelper.AssemblyName == null)
+                        {
+                            // Skip this one, it's an error
+                            continue;
+                        }
+
+
+                        if (!AssemblyContainsTagHelpers(removeTagHelper.AssemblyName, _tagHelpers))
+                        {
+                            // No tag helpers in the assembly.
+                            continue;
+                        }
+
+                        for (var i = 0; i < _tagHelpers.Count; i++)
+                        {
+                            var tagHelper = _tagHelpers[i];
+                            if (MatchesDirective(tagHelper, removeTagHelper.TypePattern, removeTagHelper.AssemblyName))
+                            {
+                                Matches.Remove(tagHelper);
+                            }
+                        }
+                    }
+                    else if (context.ChunkGenerator is TagHelperPrefixDirectiveChunkGenerator tagHelperPrefix)
+                    {
+                        if (!string.IsNullOrEmpty(tagHelperPrefix.DirectiveText))
+                        {
+                            // We only expect to see a single one of these per file, but that's enforced at another level.
+                            TagHelperPrefix = tagHelperPrefix.DirectiveText;
+                        }
                     }
                 }
-            }
 
-            public override void VisitRemoveTagHelperSpan(RemoveTagHelperChunkGenerator chunkGenerator, Span span)
-            {
-                if (chunkGenerator.AssemblyName == null)
-                {
-                    // Skip this one, it's an error
-                    return;
-                }
-
-
-                if (!AssemblyContainsTagHelpers(chunkGenerator.AssemblyName, _tagHelpers))
-                {
-                    // No tag helpers in the assembly.
-                    return;
-                }
-
-                for (var i = 0; i < _tagHelpers.Count; i++)
-                {
-                    var tagHelper = _tagHelpers[i];
-                    if (MatchesDirective(tagHelper, chunkGenerator.TypePattern, chunkGenerator.AssemblyName))
-                    {
-                        Matches.Remove(tagHelper);
-                    }
-                }
-            }
-
-            public override void VisitTagHelperPrefixDirectiveSpan(TagHelperPrefixDirectiveChunkGenerator chunkGenerator, Span span)
-            {
-                if (!string.IsNullOrEmpty(chunkGenerator.DirectiveText))
-                {
-                    // We only expect to see a single one of these per file, but that's enforced at another level.
-                    TagHelperPrefix = chunkGenerator.DirectiveText;
-                }
+                return base.VisitRazorDirective(node);
             }
 
             private bool AssemblyContainsTagHelpers(string assemblyName, IReadOnlyList<TagHelperDescriptor> tagHelpers)
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveTokenEditHandler.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveTokenEditHandler.cs
index 308c274518..c84d8b0c67 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveTokenEditHandler.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DirectiveTokenEditHandler.cs
@@ -4,18 +4,19 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
     internal class DirectiveTokenEditHandler : SpanEditHandler
     {
-        public DirectiveTokenEditHandler(Func<string, IEnumerable<IToken>> tokenizer) : base(tokenizer)
+        public DirectiveTokenEditHandler(Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> tokenizer) : base(tokenizer)
         {
         }
 
-        protected override PartialParseResultInternal CanAcceptChange(Span target, SourceChange change)
+        protected override PartialParseResultInternal CanAcceptChange(SyntaxNode target, SourceChange change)
         {
-            if (AcceptedCharacters == AcceptedCharactersInternal.NonWhiteSpace)
+            if (AcceptedCharacters == AcceptedCharactersInternal.NonWhitespace)
             {
                 var originalText = change.GetOriginalText(target);
                 var editedContent = change.GetEditedContent(target);
@@ -30,7 +31,6 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
 
             return PartialParseResultInternal.Rejected;
-
         }
 
         private static bool ContainsWhitespace(string content)
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DesignTimeDirectiveTargetExtension.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DesignTimeDirectiveTargetExtension.cs
index 316c255bfe..29cc438fbb 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DesignTimeDirectiveTargetExtension.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/DesignTimeDirectiveTargetExtension.cs
@@ -65,15 +65,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                         }
 
                         // {node.Content} __typeHelper = default({node.Content});
-
-                        context.AddSourceMappingFor(node);
-                        context.CodeWriter
-                            .Write(node.Content)
-                            .Write(" ")
-                            .WriteStartAssignment(TypeHelper)
-                            .Write("default(")
-                            .Write(node.Content)
-                            .WriteLine(");");
+                        using (context.CodeWriter.BuildLinePragma(node.Source))
+                        {
+                            context.AddSourceMappingFor(node);
+                            context.CodeWriter
+                                .Write(node.Content)
+                                .Write(" ")
+                                .WriteStartAssignment(TypeHelper)
+                                .Write("default(")
+                                .Write(node.Content)
+                                .WriteLine(");");
+                        }
                         break;
 
                     case DirectiveTokenKind.Member:
@@ -86,16 +88,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                         }
 
                         // global::System.Object {node.content} = null;
-
-                        context.CodeWriter
+                        using (context.CodeWriter.BuildLinePragma(node.Source))
+                        {
+                            context.CodeWriter
                             .Write("global::")
                             .Write(typeof(object).FullName)
                             .Write(" ");
 
-                        context.AddSourceMappingFor(node);
-                        context.CodeWriter
-                            .Write(node.Content)
-                            .WriteLine(" = null;");
+                            context.AddSourceMappingFor(node);
+                            context.CodeWriter
+                                .Write(node.Content)
+                                .WriteLine(" = null;");
+                        }
                         break;
 
                     case DirectiveTokenKind.Namespace:
@@ -108,46 +112,50 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
                         }
 
                         // global::System.Object __typeHelper = nameof({node.Content});
-
-                        context.CodeWriter
+                        using (context.CodeWriter.BuildLinePragma(node.Source))
+                        {
+                            context.CodeWriter
                             .Write("global::")
                             .Write(typeof(object).FullName)
                             .Write(" ")
                             .WriteStartAssignment(TypeHelper);
 
-                        context.CodeWriter.Write("nameof(");
+                            context.CodeWriter.Write("nameof(");
 
-                        context.AddSourceMappingFor(node);
-                        context.CodeWriter
-                            .Write(node.Content)
-                            .WriteLine(");");
+                            context.AddSourceMappingFor(node);
+                            context.CodeWriter
+                                .Write(node.Content)
+                                .WriteLine(");");
+                        }
                         break;
 
                     case DirectiveTokenKind.String:
 
                         // global::System.Object __typeHelper = "{node.Content}";
-
-                        context.CodeWriter
+                        using (context.CodeWriter.BuildLinePragma(node.Source))
+                        {
+                            context.CodeWriter
                             .Write("global::")
                             .Write(typeof(object).FullName)
                             .Write(" ")
                             .WriteStartAssignment(TypeHelper);
 
-                        if (node.Content.StartsWith("\"", StringComparison.Ordinal))
-                        {
-                            context.AddSourceMappingFor(node);
-                            context.CodeWriter.Write(node.Content);
-                        }
-                        else
-                        {
-                            context.CodeWriter.Write("\"");
-                            context.AddSourceMappingFor(node);
-                            context.CodeWriter
-                                .Write(node.Content)
-                                .Write("\"");
-                        }
+                            if (node.Content.StartsWith("\"", StringComparison.Ordinal))
+                            {
+                                context.AddSourceMappingFor(node);
+                                context.CodeWriter.Write(node.Content);
+                            }
+                            else
+                            {
+                                context.CodeWriter.Write("\"");
+                                context.AddSourceMappingFor(node);
+                                context.CodeWriter
+                                    .Write(node.Content)
+                                    .Write("\"");
+                            }
 
-                        context.CodeWriter.WriteLine(";");
+                            context.CodeWriter.WriteLine(";");
+                        }
                         break;
                 }
                 context.CodeWriter.CurrentIndent = originalIndent;
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/EliminateMethodBodyPass.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/EliminateMethodBodyPass.cs
new file mode 100644
index 0000000000..96d336ca72
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/EliminateMethodBodyPass.cs
@@ -0,0 +1,71 @@
+// 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;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+
+namespace Microsoft.AspNetCore.Razor.Language.Extensions
+{
+    internal sealed class EliminateMethodBodyPass : IntermediateNodePassBase, IRazorOptimizationPass
+    {
+        // Run early in the optimization phase
+        public override int Order => int.MinValue;
+
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+        {
+            if (codeDocument == null)
+            {
+                throw new ArgumentNullException(nameof(codeDocument));
+            }
+
+            if (documentNode == null)
+            {
+                throw new ArgumentNullException(nameof(documentNode));
+            }
+
+            var codeGenerationOptions = codeDocument.GetCodeGenerationOptions();
+            if (codeGenerationOptions == null || !codeGenerationOptions.SuppressPrimaryMethodBody)
+            {
+                return;
+            }
+
+            var method = documentNode.FindPrimaryMethod();
+            if (method == null)
+            {
+                return;
+            }
+
+            method.Children.Clear();
+
+            // After we clear all of the method body there might be some unused fields, which can be
+            // blocking if compiling with warnings as errors. Suppress this warning so that it doesn't
+            // get annoying in VS.
+            documentNode.Children.Insert(documentNode.Children.IndexOf(documentNode.FindPrimaryNamespace()), new CSharpCodeIntermediateNode()
+            {
+                Children =
+                {
+                    // Field is assigned but never used
+                    new IntermediateToken()
+                    {
+                        Content = "#pragma warning disable 0414" + Environment.NewLine,
+                        Kind = TokenKind.CSharp,
+                    },
+
+                    // Field is never assigned
+                    new IntermediateToken()
+                    {
+                        Content = "#pragma warning disable 0649" + Environment.NewLine,
+                        Kind = TokenKind.CSharp,
+                    },
+
+                    // Field is never used
+                    new IntermediateToken()
+                    {
+                        Content = "#pragma warning disable 0169" + Environment.NewLine,
+                        Kind = TokenKind.CSharp,
+                    },
+                },
+            });
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/HtmlNodeOptimizationPass.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/HtmlNodeOptimizationPass.cs
index ea3d754554..1b327aa032 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/HtmlNodeOptimizationPass.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/HtmlNodeOptimizationPass.cs
@@ -22,14 +22,11 @@ namespace Microsoft.AspNetCore.Razor.Language
                 throw new ArgumentNullException(nameof(syntaxTree));
             }
 
-            var conditionalAttributeCollapser = new ConditionalAttributeCollapser();
-            var rewritten = conditionalAttributeCollapser.Rewrite(syntaxTree.Root);
-
-            var whitespaceRewriter = new WhiteSpaceRewriter();
-            rewritten = whitespaceRewriter.Rewrite(rewritten);
+            var whitespaceRewriter = new WhitespaceRewriter();
+            var rewritten = whitespaceRewriter.Visit(syntaxTree.Root);
 
             var rewrittenSyntaxTree = RazorSyntaxTree.Create(rewritten, syntaxTree.Source, syntaxTree.Diagnostics, syntaxTree.Options);
             return rewrittenSyntaxTree;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/InputDocumentKind.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/InputDocumentKind.cs
new file mode 100644
index 0000000000..7adf2bd8b5
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Intermediate/InputDocumentKind.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Intermediate
+{
+    internal static class InputDocumentKind
+    {
+        public static readonly string Component = "component";
+
+        public static readonly string MvcFile = "mvc";
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AcceptedCharactersInternal.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AcceptedCharactersInternal.cs
index f6b658f769..9838a182b5 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AcceptedCharactersInternal.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AcceptedCharactersInternal.cs
@@ -10,13 +10,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     {
         None = 0,
         NewLine = 1,
-        WhiteSpace = 2,
+        Whitespace = 2,
 
-        NonWhiteSpace = 4,
+        NonWhitespace = 4,
 
-        AllWhiteSpace = NewLine | WhiteSpace,
-        Any = AllWhiteSpace | NonWhiteSpace,
+        AllWhitespace = NewLine | Whitespace,
+        Any = AllWhitespace | NonWhitespace,
 
-        AnyExceptNewline = NonWhiteSpace | WhiteSpace
+        AnyExceptNewline = NonWhitespace | Whitespace
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AddImportChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AddImportChunkGenerator.cs
index 0d7b9de155..4cee1abe3e 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AddImportChunkGenerator.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AddImportChunkGenerator.cs
@@ -14,23 +14,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public string Namespace { get; }
 
-        public override void Accept(ParserVisitor visitor, Span span)
-        {
-            visitor.VisitImportSpan(this, span);
-        }
-
-        public override void GenerateChunk(Span target, ChunkGeneratorContext context)
-        {
-            var ns = Namespace;
-
-            if (!string.IsNullOrEmpty(ns) && char.IsWhiteSpace(ns[0]))
-            {
-                ns = ns.Substring(1);
-            }
-
-            //context.ChunkTreeBuilder.AddUsingChunk(ns, target);
-        }
-
         public override string ToString()
         {
             return "Import:" + Namespace + ";";
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AddTagHelperChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AddTagHelperChunkGenerator.cs
index f446be12c0..2df86b32de 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AddTagHelperChunkGenerator.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AddTagHelperChunkGenerator.cs
@@ -35,11 +35,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public List<RazorDiagnostic> Diagnostics { get; }
 
-        public override void Accept(ParserVisitor visitor, Span span)
-        {
-            visitor.VisitAddTagHelperSpan(this, span);
-        }
-
         /// <inheritdoc />
         public override bool Equals(object obj)
         {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AttributeBlockChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AttributeBlockChunkGenerator.cs
deleted file mode 100644
index de77a1746d..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AttributeBlockChunkGenerator.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// 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;
-using System.Globalization;
-using Microsoft.Extensions.Internal;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class AttributeBlockChunkGenerator : ParentChunkGenerator
-    {
-        public AttributeBlockChunkGenerator(string name, LocationTagged<string> prefix, LocationTagged<string> suffix)
-        {
-            Name = name;
-            Prefix = prefix;
-            Suffix = suffix;
-        }
-
-        public string Name { get; }
-
-        public LocationTagged<string> Prefix { get; }
-
-        public LocationTagged<string> Suffix { get; }
-
-        public override void GenerateStartParentChunk(Block target, ChunkGeneratorContext context)
-        {
-            //var chunk = context.ChunkTreeBuilder.StartParentChunk<CodeAttributeChunk>(target);
-
-            //chunk.Attribute = Name;
-            //chunk.Prefix = Prefix;
-            //chunk.Suffix = Suffix;
-        }
-
-        public override void GenerateEndParentChunk(Block target, ChunkGeneratorContext context)
-        {
-            //context.ChunkTreeBuilder.EndParentChunk();
-        }
-
-        public override void Accept(ParserVisitor visitor, Block block)
-        {
-            visitor.VisitAttributeBlock(this, block);
-        }
-
-        public override string ToString()
-        {
-            return string.Format(CultureInfo.CurrentCulture, "Attr:{0},{1:F},{2:F}", Name, Prefix, Suffix);
-        }
-
-        public override bool Equals(object obj)
-        {
-            var other = obj as AttributeBlockChunkGenerator;
-            return other != null &&
-                string.Equals(other.Name, Name, StringComparison.Ordinal) &&
-                Equals(other.Prefix, Prefix) &&
-                Equals(other.Suffix, Suffix);
-        }
-
-        public override int GetHashCode()
-        {
-            var hashCodeCombiner = HashCodeCombiner.Start();
-            hashCodeCombiner.Add(Name, StringComparer.Ordinal);
-            hashCodeCombiner.Add(Prefix);
-            hashCodeCombiner.Add(Suffix);
-
-            return hashCodeCombiner;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AutoCompleteEditHandler.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AutoCompleteEditHandler.cs
index 3aecb29a52..2514377780 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AutoCompleteEditHandler.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/AutoCompleteEditHandler.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
@@ -11,18 +12,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     {
         private static readonly int TypeHashCode = typeof(AutoCompleteEditHandler).GetHashCode();
 
-        public AutoCompleteEditHandler(Func<string, IEnumerable<IToken>> tokenizer)
+        public AutoCompleteEditHandler(Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> tokenizer)
             : base(tokenizer)
         {
         }
 
-        public AutoCompleteEditHandler(Func<string, IEnumerable<IToken>> tokenizer, bool autoCompleteAtEndOfSpan)
+        public AutoCompleteEditHandler(Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> tokenizer, bool autoCompleteAtEndOfSpan)
             : this(tokenizer)
         {
             AutoCompleteAtEndOfSpan = autoCompleteAtEndOfSpan;
         }
 
-        public AutoCompleteEditHandler(Func<string, IEnumerable<IToken>> tokenizer, AcceptedCharactersInternal accepted)
+        public AutoCompleteEditHandler(Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> tokenizer, AcceptedCharactersInternal accepted)
             : base(tokenizer, accepted)
         {
         }
@@ -31,7 +32,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public string AutoCompleteString { get; set; }
 
-        protected override PartialParseResultInternal CanAcceptChange(Span target, SourceChange change)
+        protected override PartialParseResultInternal CanAcceptChange(SyntaxNode target, SourceChange change)
         {
             if (((AutoCompleteAtEndOfSpan && IsAtEndOfSpan(target, change)) || IsAtEndOfFirstLine(target, change)) &&
                 change.IsInsert &&
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/Block.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/Block.cs
deleted file mode 100644
index ee7cc135f1..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/Block.cs
+++ /dev/null
@@ -1,288 +0,0 @@
-// 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;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using Microsoft.Extensions.Internal;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class Block : SyntaxTreeNode
-    {
-        private int? _length;
-
-        public Block(BlockBuilder source)
-            : this(source.Type, source.Children, source.ChunkGenerator)
-        {
-            source.Reset();
-        }
-
-        protected Block(BlockKindInternal? type, IReadOnlyList<SyntaxTreeNode> children, IParentChunkGenerator generator)
-        {
-            if (type == null)
-            {
-                throw new InvalidOperationException(Resources.Block_Type_Not_Specified);
-            }
-
-            Type = type.Value;
-            Children = children;
-            ChunkGenerator = generator;
-
-            // Perf: Avoid allocating an enumerator.
-            for (var i = 0; i < Children.Count; i++)
-            {
-                Children[i].Parent = this;
-            }
-        }
-        public IParentChunkGenerator ChunkGenerator { get; }
-
-        public BlockKindInternal Type { get; }
-
-        public IReadOnlyList<SyntaxTreeNode> Children { get; }
-
-        public override bool IsBlock => true;
-
-        public override SourceLocation Start
-        {
-            get
-            {
-                var child = Children.FirstOrDefault();
-                if (child == null)
-                {
-                    return SourceLocation.Zero;
-                }
-                else
-                {
-                    return child.Start;
-                }
-            }
-        }
-
-        public override int Length
-        {
-            get
-            {
-                if (_length == null)
-                {
-                    var length = 0;
-                    for (var i = 0; i < Children.Count; i++)
-                    {
-                        length += Children[i].Length;
-                    }
-
-                    _length = length;
-                }
-
-                return _length.Value;
-            }
-        }
-
-
-        public virtual IEnumerable<Span> Flatten()
-        {
-            // Perf: Avoid allocating an enumerator.
-            for (var i = 0; i < Children.Count; i++)
-            {
-                var element = Children[i];
-                var span = element as Span;
-                if (span != null)
-                {
-                    yield return span;
-                }
-                else
-                {
-                    var block = element as Block;
-                    foreach (Span childSpan in block.Flatten())
-                    {
-                        yield return childSpan;
-                    }
-                }
-            }
-        }
-
-        public Span FindFirstDescendentSpan()
-        {
-            SyntaxTreeNode current = this;
-            while (current != null && current.IsBlock)
-            {
-                current = ((Block)current).Children.FirstOrDefault();
-            }
-            return current as Span;
-        }
-
-        public Span FindLastDescendentSpan()
-        {
-            SyntaxTreeNode current = this;
-            while (current != null && current.IsBlock)
-            {
-                current = ((Block)current).Children.LastOrDefault();
-            }
-            return current as Span;
-        }
-
-        public virtual Span LocateOwner(SourceChange change) => LocateOwner(change, Children);
-
-        protected static Span LocateOwner(SourceChange change, IEnumerable<SyntaxTreeNode> elements)
-        {
-            // Ask each child recursively
-            Span owner = null;
-            foreach (var element in elements)
-            {
-                var span = element as Span;
-                if (span == null)
-                {
-                    owner = ((Block)element).LocateOwner(change);
-                }
-                else
-                {
-                    if (change.Span.AbsoluteIndex < span.Start.AbsoluteIndex)
-                    {
-                        // Early escape for cases where changes overlap multiple spans
-                        // In those cases, the span will return false, and we don't want to search the whole tree
-                        // So if the current span starts after the change, we know we've searched as far as we need to
-                        break;
-                    }
-                    owner = span.EditHandler.OwnsChange(span, change) ? span : owner;
-                }
-
-                if (owner != null)
-                {
-                    break;
-                }
-            }
-            return owner;
-        }
-
-        public override string ToString()
-        {
-            return string.Format(
-                CultureInfo.CurrentCulture,
-                "{0} Block at {1}::{2} (Gen:{3})",
-                Type,
-                Start,
-                Length,
-                ChunkGenerator);
-        }
-
-        public override bool Equals(object obj)
-        {
-            var other = obj as Block;
-            return other != null &&
-                Type == other.Type &&
-                Equals(ChunkGenerator, other.ChunkGenerator) &&
-                ChildrenEqual(Children, other.Children);
-        }
-
-        public override int GetHashCode()
-        {
-            var hashCodeCombiner = HashCodeCombiner.Start();
-            hashCodeCombiner.Add(Type);
-            hashCodeCombiner.Add(ChunkGenerator);
-            hashCodeCombiner.Add(Children);
-
-            return hashCodeCombiner;
-        }
-
-        private static bool ChildrenEqual(IEnumerable<SyntaxTreeNode> left, IEnumerable<SyntaxTreeNode> right)
-        {
-            IEnumerator<SyntaxTreeNode> leftEnum = left.GetEnumerator();
-            IEnumerator<SyntaxTreeNode> rightEnum = right.GetEnumerator();
-            while (leftEnum.MoveNext())
-            {
-                if (!rightEnum.MoveNext() || // More items in left than in right
-                    !Equals(leftEnum.Current, rightEnum.Current))
-                {
-                    // Nodes are not equal
-                    return false;
-                }
-            }
-            if (rightEnum.MoveNext())
-            {
-                // More items in right than left
-                return false;
-            }
-            return true;
-        }
-
-        public override bool EquivalentTo(SyntaxTreeNode node)
-        {
-            var other = node as Block;
-            if (other == null || other.Type != Type)
-            {
-                return false;
-            }
-
-            return Enumerable.SequenceEqual(Children, other.Children, EquivalenceComparer.Default);
-        }
-
-        public override int GetEquivalenceHash()
-        {
-            var hashCodeCombiner = HashCodeCombiner.Start();
-            hashCodeCombiner.Add(Type);
-            foreach (var child in Children)
-            {
-                hashCodeCombiner.Add(child.GetEquivalenceHash());
-            }
-
-            return hashCodeCombiner.CombinedHash;
-        }
-
-        public override void Accept(ParserVisitor visitor)
-        {
-            visitor.VisitBlock(this);
-        }
-
-        public override SyntaxTreeNode Clone()
-        {
-            var blockBuilder = new BlockBuilder(this);
-
-            blockBuilder.Children.Clear();
-            for (var i = 0; i < Children.Count; i++)
-            {
-                var clonedChild = Children[i].Clone();
-                blockBuilder.Children.Add(clonedChild);
-            }
-
-            return blockBuilder.Build();
-        }
-
-        internal void ChildChanged()
-        {
-            // A node in our graph has changed. We'll need to recompute our length the next time we're asked for it.
-            _length = null;
-
-            Parent?.ChildChanged();
-        }
-
-        private class EquivalenceComparer : IEqualityComparer<SyntaxTreeNode>
-        {
-            public static readonly EquivalenceComparer Default = new EquivalenceComparer();
-
-            private EquivalenceComparer()
-            {
-            }
-
-            public bool Equals(SyntaxTreeNode nodeX, SyntaxTreeNode nodeY)
-            {
-                if (nodeX == nodeY)
-                {
-                    return true;
-                }
-
-                return nodeX != null && nodeX.EquivalentTo(nodeY);
-            }
-
-            public int GetHashCode(SyntaxTreeNode node)
-            {
-                if (node == null)
-                {
-                    throw new ArgumentNullException(nameof(node));
-                }
-
-                return node.GetEquivalenceHash();
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/BlockBuilder.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/BlockBuilder.cs
deleted file mode 100644
index 3e3905c4a7..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/BlockBuilder.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// 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.Collections.Generic;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class BlockBuilder
-    {
-        public BlockBuilder()
-        {
-            Reset();
-        }
-
-        public BlockBuilder(Block original)
-        {
-            Type = original.Type;
-            Children = new List<SyntaxTreeNode>(original.Children);
-            ChunkGenerator = original.ChunkGenerator;
-        }
-
-        public IParentChunkGenerator ChunkGenerator { get; set; }
-
-        public BlockKindInternal? Type { get; set; }
-
-        public List<SyntaxTreeNode> Children { get; private set; }
-
-        public virtual Block Build()
-        {
-            return new Block(this);
-        }
-
-        public virtual void Reset()
-        {
-            Type = null;
-            Children = new List<SyntaxTreeNode>();
-            ChunkGenerator = ParentChunkGenerator.Null;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/BlockExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/BlockExtensions.cs
deleted file mode 100644
index 232baf7ee9..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/BlockExtensions.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal static class BlockExtensions
-    {
-        public static void LinkNodes(this Block self)
-        {
-            Span first = null;
-            Span previous = null;
-            foreach (Span span in self.Flatten())
-            {
-                if (first == null)
-                {
-                    first = span;
-                }
-                span.Previous = previous;
-
-                if (previous != null)
-                {
-                    previous.Next = span;
-                }
-                previous = span;
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpCodeParser.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpCodeParser.cs
index a75c983fec..44612ee18c 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpCodeParser.cs
@@ -5,17 +5,18 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
-    internal class CSharpCodeParser : TokenizerBackedParser<CSharpTokenizer, CSharpToken, CSharpTokenType>
+    internal class CSharpCodeParser : TokenizerBackedParser<CSharpTokenizer>
     {
         private static HashSet<char> InvalidNonWhitespaceNameCharacters = new HashSet<char>(new[]
         {
             '@', '!', '<', '/', '?', '[', '>', ']', '=', '"', '\'', '*'
         });
 
-        private static readonly Func<CSharpToken, bool> IsValidStatementSpacingToken =
+        private static readonly Func<SyntaxToken, bool> IsValidStatementSpacingToken =
             IsSpacingToken(includeNewLines: true, includeComments: true);
 
         internal static readonly DirectiveDescriptor AddTagHelperDirectiveDescriptor = DirectiveDescriptor.CreateDirective(
@@ -69,8 +70,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         private readonly ISet<string> CurrentKeywords = new HashSet<string>(DefaultKeywords);
 
-        private Dictionary<string, Action> _directiveParsers = new Dictionary<string, Action>(StringComparer.Ordinal);
-        private Dictionary<CSharpKeyword, Action<bool>> _keywordParsers = new Dictionary<CSharpKeyword, Action<bool>>();
+        private Dictionary<CSharpKeyword, Action<SyntaxListBuilder<RazorSyntaxNode>, CSharpTransitionSyntax>> _keywordParserMap = new Dictionary<CSharpKeyword, Action<SyntaxListBuilder<RazorSyntaxNode>, CSharpTransitionSyntax>>();
+        private Dictionary<string, Action<SyntaxListBuilder<RazorSyntaxNode>, CSharpTransitionSyntax>> _directiveParserMap = new Dictionary<string, Action<SyntaxListBuilder<RazorSyntaxNode>, CSharpTransitionSyntax>>(StringComparer.Ordinal);
 
         public CSharpCodeParser(ParserContext context)
             : this(directives: Enumerable.Empty<DirectiveDescriptor>(), context: context)
@@ -91,9 +92,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
 
             Keywords = new HashSet<string>();
-            SetUpKeywords();
-            SetupDirectives(directives);
-            SetUpExpressions();
+            SetupKeywordParsers();
+            SetupExpressionParsers();
+            SetupDirectiveParsers(directives);
         }
 
         public HtmlMarkupParser HtmlParser { get; set; }
@@ -102,262 +103,146 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public bool IsNested { get; set; }
 
-        protected override bool TokenTypeEquals(CSharpTokenType x, CSharpTokenType y) => x == y;
-
-        protected void MapDirectives(Action handler, params string[] directives)
+        public CSharpCodeBlockSyntax ParseBlock()
         {
-            foreach (var directive in directives)
+            if (Context == null)
             {
-                _directiveParsers.Add(directive, () =>
-                {
-                    handler();
-                    Context.SeenDirectives.Add(directive);
-                });
-
-                Keywords.Add(directive);
-
-                // These C# keywords are reserved for use in directives. It's an error to use them outside of
-                // a directive. This code removes the error generation if the directive *is* registered.
-                if (string.Equals(directive, "class", StringComparison.OrdinalIgnoreCase))
-                {
-                    _keywordParsers.Remove(CSharpKeyword.Class);
-                }
-                else if (string.Equals(directive, "namespace", StringComparison.OrdinalIgnoreCase))
-                {
-                    _keywordParsers.Remove(CSharpKeyword.Namespace);
-                }
+                throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
             }
-        }
 
-        protected bool TryGetDirectiveHandler(string directive, out Action handler)
-        {
-            return _directiveParsers.TryGetValue(directive, out handler);
-        }
-
-        private void MapExpressionKeyword(Action<bool> handler, CSharpKeyword keyword)
-        {
-            _keywordParsers.Add(keyword, handler);
-
-            // Expression keywords don't belong in the regular keyword list
-        }
-
-        private void MapKeywords(Action<bool> handler, params CSharpKeyword[] keywords)
-        {
-            MapKeywords(handler, topLevel: true, keywords: keywords);
-        }
-
-        private void MapKeywords(Action<bool> handler, bool topLevel, params CSharpKeyword[] keywords)
-        {
-            foreach (var keyword in keywords)
+            if (EndOfFile)
             {
-                _keywordParsers.Add(keyword, handler);
-                if (topLevel)
-                {
-                    Keywords.Add(CSharpLanguageCharacteristics.GetKeyword(keyword));
-                }
+                // Nothing to parse.
+                return null;
             }
-        }
 
-        [Conditional("DEBUG")]
-        internal void Assert(CSharpKeyword expectedKeyword)
-        {
-            Debug.Assert(CurrentToken.Type == CSharpTokenType.Keyword &&
-                CurrentToken.Keyword.HasValue &&
-                CurrentToken.Keyword.Value == expectedKeyword);
-        }
-
-        protected internal bool At(CSharpKeyword keyword)
-        {
-            return At(CSharpTokenType.Keyword) &&
-                CurrentToken.Keyword.HasValue &&
-                CurrentToken.Keyword.Value == keyword;
-        }
-
-        protected internal bool AcceptIf(CSharpKeyword keyword)
-        {
-            if (At(keyword))
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            using (PushSpanContextConfig(DefaultSpanContextConfig))
             {
-                AcceptAndMoveNext();
-                return true;
-            }
-            return false;
-        }
-
-        protected static Func<CSharpToken, bool> IsSpacingToken(bool includeNewLines, bool includeComments)
-        {
-            return token => token.Type == CSharpTokenType.WhiteSpace ||
-                          (includeNewLines && token.Type == CSharpTokenType.NewLine) ||
-                          (includeComments && token.Type == CSharpTokenType.Comment);
-        }
-
-        public override void ParseBlock()
-        {
-            using (PushSpanConfig(DefaultSpanConfig))
-            {
-                if (Context == null)
-                {
-                    throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
-                }
-
-                Span.Start = CurrentLocation;
-
-                // Unless changed, the block is a statement block
-                using (Context.Builder.StartBlock(BlockKindInternal.Statement))
+                var builder = pooledResult.Builder;
+                try
                 {
                     NextToken();
 
+                    // Unless changed, the block is a statement block
                     AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                    builder.Add(OutputTokensAsStatementLiteral());
 
-                    var current = CurrentToken;
-                    if (At(CSharpTokenType.StringLiteral) &&
+                    // We are usually called when the other parser sees a transition '@'. Look for it.
+                    SyntaxToken transitionToken = null;
+                    if (At(SyntaxKind.StringLiteral) &&
                         CurrentToken.Content.Length > 0 &&
                         CurrentToken.Content[0] == SyntaxConstants.TransitionCharacter)
                     {
-                        var split = Language.SplitToken(CurrentToken, 1, CSharpTokenType.Transition);
-                        current = split.Item1;
+                        var split = Language.SplitToken(CurrentToken, 1, SyntaxKind.Transition);
+                        transitionToken = split.Item1;
 
                         // Back up to the end of the transition
                         Context.Source.Position -= split.Item2.Content.Length;
                         NextToken();
                     }
-                    else if (At(CSharpTokenType.Transition))
+                    else if (At(SyntaxKind.Transition))
                     {
-                        NextToken();
+                        transitionToken = EatCurrentToken();
                     }
 
-                    // Accept "@" if we see it, but if we don't, that's OK. We assume we were started for a good reason
-                    if (current.Type == CSharpTokenType.Transition)
+                    if (transitionToken == null)
                     {
-                        if (Span.Tokens.Count > 0)
+                        transitionToken = SyntaxFactory.MissingToken(SyntaxKind.Transition);
+                    }
+
+                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                    var transition = GetNodeWithSpanContext(SyntaxFactory.CSharpTransition(transitionToken));
+
+                    if (At(SyntaxKind.LeftBrace))
+                    {
+                        var statementBody = ParseStatementBody();
+                        var statement = SyntaxFactory.CSharpStatement(transition, statementBody);
+                        builder.Add(statement);
+                    }
+                    else if (At(SyntaxKind.LeftParenthesis))
+                    {
+                        var expressionBody = ParseExplicitExpressionBody();
+                        var expression = SyntaxFactory.CSharpExplicitExpression(transition, expressionBody);
+                        builder.Add(expression);
+                    }
+                    else if (At(SyntaxKind.Identifier))
+                    {
+                        if (!TryParseDirective(builder, transition, CurrentToken.Content))
                         {
-                            Output(SpanKindInternal.Code);
+                            if (string.Equals(
+                                CurrentToken.Content,
+                                SyntaxConstants.CSharp.HelperKeyword,
+                                StringComparison.Ordinal))
+                            {
+                                var diagnostic = RazorDiagnosticFactory.CreateParsing_HelperDirectiveNotAvailable(
+                                    new SourceSpan(CurrentStart, CurrentToken.Content.Length));
+                                CurrentToken.SetDiagnostics(new[] { diagnostic });
+                                Context.ErrorSink.OnError(diagnostic);
+                            }
+
+                            var implicitExpressionBody = ParseImplicitExpressionBody();
+                            var implicitExpression = SyntaxFactory.CSharpImplicitExpression(transition, implicitExpressionBody);
+                            builder.Add(implicitExpression);
                         }
-                        AtTransition(current);
+                    }
+                    else if (At(SyntaxKind.Keyword))
+                    {
+                        if (!TryParseDirective(builder, transition, CurrentToken.Content) &&
+                            !TryParseKeyword(builder, transition))
+                        {
+                            // Not a directive or a special keyword. Just parse as an implicit expression.
+                            var implicitExpressionBody = ParseImplicitExpressionBody();
+                            var implicitExpression = SyntaxFactory.CSharpImplicitExpression(transition, implicitExpressionBody);
+                            builder.Add(implicitExpression);
+                        }
+
+                        builder.Add(OutputTokensAsStatementLiteral());
                     }
                     else
                     {
-                        // No "@" => Jump straight to AfterTransition
-                        AfterTransition();
-                    }
-
-                    Output(SpanKindInternal.Code);
-                }
-            }
-        }
-
-        private void DefaultSpanConfig(SpanBuilder span)
-        {
-            span.EditHandler = SpanEditHandler.CreateDefault(Language.TokenizeString);
-            span.ChunkGenerator = new StatementChunkGenerator();
-        }
-
-        private void AtTransition(CSharpToken current)
-        {
-            Debug.Assert(current.Type == CSharpTokenType.Transition);
-            Accept(current);
-            Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-            Span.ChunkGenerator = SpanChunkGenerator.Null;
-
-            // Output the "@" span and continue here
-            Output(SpanKindInternal.Transition);
-            AfterTransition();
-        }
-
-        private void AfterTransition()
-        {
-            using (PushSpanConfig(DefaultSpanConfig))
-            {
-                EnsureCurrent();
-                try
-                {
-                    // What type of block is this?
-                    if (!EndOfFile)
-                    {
-                        if (CurrentToken.Type == CSharpTokenType.LeftParenthesis)
+                        // Invalid character
+                        SpanContext.ChunkGenerator = new ExpressionChunkGenerator();
+                        SpanContext.EditHandler = new ImplicitExpressionEditHandler(
+                            Language.TokenizeString,
+                            CurrentKeywords,
+                            acceptTrailingDot: IsNested)
                         {
-                            Context.Builder.CurrentBlock.Type = BlockKindInternal.Expression;
-                            Context.Builder.CurrentBlock.ChunkGenerator = new ExpressionChunkGenerator();
-                            ExplicitExpression();
-                            return;
+                            AcceptedCharacters = AcceptedCharactersInternal.NonWhitespace
+                        };
+
+                        AcceptMarkerTokenIfNecessary();
+                        var expressionLiteral = SyntaxFactory.CSharpCodeBlock(OutputTokensAsExpressionLiteral());
+                        var expressionBody = SyntaxFactory.CSharpImplicitExpressionBody(expressionLiteral);
+                        var expressionBlock = SyntaxFactory.CSharpImplicitExpression(transition, expressionBody);
+                        builder.Add(expressionBlock);
+
+                        if (At(SyntaxKind.Whitespace) || At(SyntaxKind.NewLine))
+                        {
+                            Context.ErrorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_UnexpectedWhiteSpaceAtStartOfCodeBlock(
+                                    new SourceSpan(CurrentStart, CurrentToken.Content.Length)));
                         }
-                        else if (CurrentToken.Type == CSharpTokenType.Identifier)
+                        else if (EndOfFile)
                         {
-                            if (TryGetDirectiveHandler(CurrentToken.Content, out var handler))
-                            {
-                                Span.ChunkGenerator = SpanChunkGenerator.Null;
-                                handler();
-                                return;
-                            }
-                            else
-                            {
-                                if (string.Equals(
-                                    CurrentToken.Content,
-                                    SyntaxConstants.CSharp.HelperKeyword,
-                                    StringComparison.Ordinal))
-                                {
-                                    Context.ErrorSink.OnError(
-                                        RazorDiagnosticFactory.CreateParsing_HelperDirectiveNotAvailable(
-                                            new SourceSpan(CurrentStart, CurrentToken.Content.Length)));
-                                }
-
-                                Context.Builder.CurrentBlock.Type = BlockKindInternal.Expression;
-                                Context.Builder.CurrentBlock.ChunkGenerator = new ExpressionChunkGenerator();
-                                ImplicitExpression();
-                                return;
-                            }
+                            Context.ErrorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_UnexpectedEndOfFileAtStartOfCodeBlock(
+                                    new SourceSpan(CurrentStart, contentLength: 1 /* end of file */)));
                         }
-                        else if (CurrentToken.Type == CSharpTokenType.Keyword)
+                        else
                         {
-                            if (TryGetDirectiveHandler(CurrentToken.Content, out var handler))
-                            {
-                                Span.ChunkGenerator = SpanChunkGenerator.Null;
-                                handler();
-                                return;
-                            }
-                            else
-                            {
-                                KeywordBlock(topLevel: true);
-                                return;
-                            }
-                        }
-                        else if (CurrentToken.Type == CSharpTokenType.LeftBrace)
-                        {
-                            VerbatimBlock();
-                            return;
+                            Context.ErrorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_UnexpectedCharacterAtStartOfCodeBlock(
+                                    new SourceSpan(CurrentStart, CurrentToken.Content.Length),
+                                    CurrentToken.Content));
                         }
                     }
 
-                    // Invalid character
-                    Context.Builder.CurrentBlock.Type = BlockKindInternal.Expression;
-                    Context.Builder.CurrentBlock.ChunkGenerator = new ExpressionChunkGenerator();
-                    AddMarkerTokenIfNecessary();
-                    Span.ChunkGenerator = new ExpressionChunkGenerator();
-                    Span.EditHandler = new ImplicitExpressionEditHandler(
-                        Language.TokenizeString,
-                        CurrentKeywords,
-                        acceptTrailingDot: IsNested)
-                    {
-                        AcceptedCharacters = AcceptedCharactersInternal.NonWhiteSpace
-                    };
-                    if (At(CSharpTokenType.WhiteSpace) || At(CSharpTokenType.NewLine))
-                    {
-                        Context.ErrorSink.OnError(
-                            RazorDiagnosticFactory.CreateParsing_UnexpectedWhiteSpaceAtStartOfCodeBlock(
-                                new SourceSpan(CurrentStart, CurrentToken.Content.Length)));
-                    }
-                    else if (EndOfFile)
-                    {
-                        Context.ErrorSink.OnError(
-                            RazorDiagnosticFactory.CreateParsing_UnexpectedEndOfFileAtStartOfCodeBlock(
-                                new SourceSpan(CurrentStart, contentLength: 1 /* end of file */)));
-                    }
-                    else
-                    {
-                        Context.ErrorSink.OnError(
-                            RazorDiagnosticFactory.CreateParsing_UnexpectedCharacterAtStartOfCodeBlock(
-                                new SourceSpan(CurrentStart, CurrentToken.Content.Length),
-                                CurrentToken.Content));
-                    }
+                    Debug.Assert(TokenBuilder.Count == 0, "We should not have any tokens left.");
+
+                    var codeBlock = SyntaxFactory.CSharpCodeBlock(builder.ToList());
+                    return codeBlock;
                 }
                 finally
                 {
@@ -367,75 +252,90 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        private void VerbatimBlock()
+        private CSharpExplicitExpressionBodySyntax ParseExplicitExpressionBody()
         {
-            Assert(CSharpTokenType.LeftBrace);
-            var block = new Block(Resources.BlockName_Code, CurrentStart);
-            AcceptAndMoveNext();
+            var block = new Block(Resources.BlockName_ExplicitExpression, CurrentStart);
+            Assert(SyntaxKind.LeftParenthesis);
+            var leftParenToken = EatCurrentToken();
+            var leftParen = OutputAsMetaCode(leftParenToken);
 
-            // Set up the "{" span and output
-            Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-            Span.ChunkGenerator = SpanChunkGenerator.Null;
-            Output(SpanKindInternal.MetaCode);
-
-            // Set up auto-complete and parse the code block
-            var editHandler = new AutoCompleteEditHandler(Language.TokenizeString);
-            Span.EditHandler = editHandler;
-            CodeBlock(false, block);
-
-            Span.ChunkGenerator = new StatementChunkGenerator();
-            AddMarkerTokenIfNecessary();
-            if (!At(CSharpTokenType.RightBrace))
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
             {
-                editHandler.AutoCompleteString = "}";
-            }
-            Output(SpanKindInternal.Code);
-
-            if (Optional(CSharpTokenType.RightBrace))
-            {
-                // Set up the "}" span
-                Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                Span.ChunkGenerator = SpanChunkGenerator.Null;
-            }
-
-            if (!IsNested)
-            {
-                EnsureCurrent();
-                if (At(CSharpTokenType.NewLine) ||
-                    (At(CSharpTokenType.WhiteSpace) && NextIs(CSharpTokenType.NewLine)))
+                var expressionBuilder = pooledResult.Builder;
+                using (PushSpanContextConfig(ExplicitExpressionSpanContextConfig))
                 {
-                    Context.NullGenerateWhitespaceAndNewLine = true;
+                    var success = Balance(
+                        expressionBuilder,
+                        BalancingModes.BacktrackOnFailure |
+                            BalancingModes.NoErrorOnFailure |
+                            BalancingModes.AllowCommentsAndTemplates,
+                        SyntaxKind.LeftParenthesis,
+                        SyntaxKind.RightParenthesis,
+                        block.Start);
+
+                    if (!success)
+                    {
+                        AcceptUntil(SyntaxKind.LessThan);
+                        Context.ErrorSink.OnError(
+                            RazorDiagnosticFactory.CreateParsing_ExpectedEndOfBlockBeforeEOF(
+                                new SourceSpan(block.Start, contentLength: 1 /* ( */), block.Name, ")", "("));
+                    }
+
+                    // If necessary, put an empty-content marker token here
+                    AcceptMarkerTokenIfNecessary();
+                    expressionBuilder.Add(OutputTokensAsExpressionLiteral());
                 }
+
+                var expressionBlock = SyntaxFactory.CSharpCodeBlock(expressionBuilder.ToList());
+
+                RazorMetaCodeSyntax rightParen = null;
+                if (At(SyntaxKind.RightParenthesis))
+                {
+                    rightParen = OutputAsMetaCode(EatCurrentToken());
+                }
+                else
+                {
+                    var missingToken = SyntaxFactory.MissingToken(SyntaxKind.RightParenthesis);
+                    rightParen = OutputAsMetaCode(missingToken, SpanContext.EditHandler.AcceptedCharacters);
+                }
+                if (!EndOfFile)
+                {
+                    PutCurrentBack();
+                }
+
+                return SyntaxFactory.CSharpExplicitExpressionBody(leftParen, expressionBlock, rightParen);
+            }
+        }
+
+        private CSharpImplicitExpressionBodySyntax ParseImplicitExpressionBody(bool async = false)
+        {
+            var accepted = AcceptedCharactersInternal.NonWhitespace;
+            if (async)
+            {
+                // Async implicit expressions include the "await" keyword and therefore need to allow spaces to
+                // separate the "await" and the following code.
+                accepted = AcceptedCharactersInternal.AnyExceptNewline;
             }
 
-            Output(SpanKindInternal.MetaCode);
-        }
-
-        private void ImplicitExpression()
-        {
-            ImplicitExpression(AcceptedCharactersInternal.NonWhiteSpace);
-        }
-
-        // Async implicit expressions include the "await" keyword and therefore need to allow spaces to
-        // separate the "await" and the following code.
-        private void AsyncImplicitExpression()
-        {
-            ImplicitExpression(AcceptedCharactersInternal.AnyExceptNewline);
-        }
-
-        private void ImplicitExpression(AcceptedCharactersInternal acceptedCharacters)
-        {
-            Context.Builder.CurrentBlock.Type = BlockKindInternal.Expression;
-            Context.Builder.CurrentBlock.ChunkGenerator = new ExpressionChunkGenerator();
-
-            using (PushSpanConfig(span =>
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
             {
-                span.EditHandler = new ImplicitExpressionEditHandler(
+                var expressionBuilder = pooledResult.Builder;
+                ParseImplicitExpression(expressionBuilder, accepted);
+                var codeBlock = SyntaxFactory.CSharpCodeBlock(expressionBuilder.ToList());
+                return SyntaxFactory.CSharpImplicitExpressionBody(codeBlock);
+            }
+        }
+
+        private void ParseImplicitExpression(in SyntaxListBuilder<RazorSyntaxNode> builder, AcceptedCharactersInternal acceptedCharacters)
+        {
+            using (PushSpanContextConfig(spanContext =>
+            {
+                spanContext.EditHandler = new ImplicitExpressionEditHandler(
                     Language.TokenizeString,
                     Keywords,
                     acceptTrailingDot: IsNested);
-                span.EditHandler.AcceptedCharacters = acceptedCharacters;
-                span.ChunkGenerator = new ExpressionChunkGenerator();
+                spanContext.EditHandler.AcceptedCharacters = acceptedCharacters;
+                spanContext.ChunkGenerator = new ExpressionChunkGenerator();
             }))
             {
                 do
@@ -445,80 +345,80 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         AcceptAndMoveNext();
                     }
                 }
-                while (MethodCallOrArrayIndex(acceptedCharacters));
+                while (ParseMethodCallOrArrayIndex(builder, acceptedCharacters));
 
                 PutCurrentBack();
-                Output(SpanKindInternal.Code);
+                builder.Add(OutputTokensAsExpressionLiteral());
             }
         }
 
-        private bool MethodCallOrArrayIndex(AcceptedCharactersInternal acceptedCharacters)
+        private bool ParseMethodCallOrArrayIndex(in SyntaxListBuilder<RazorSyntaxNode> builder, AcceptedCharactersInternal acceptedCharacters)
         {
             if (!EndOfFile)
             {
-                if (CurrentToken.Type == CSharpTokenType.LeftParenthesis ||
-                    CurrentToken.Type == CSharpTokenType.LeftBracket)
+                if (CurrentToken.Kind == SyntaxKind.LeftParenthesis ||
+                    CurrentToken.Kind == SyntaxKind.LeftBracket)
                 {
                     // If we end within "(", whitespace is fine
-                    Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
 
-                    CSharpTokenType right;
+                    SyntaxKind right;
                     bool success;
 
-                    using (PushSpanConfig((span, prev) =>
+                    using (PushSpanContextConfig((spanContext, prev) =>
                     {
-                        prev(span);
-                        span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+                        prev(spanContext);
+                        spanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
                     }))
                     {
-                        right = Language.FlipBracket(CurrentToken.Type);
-                        success = Balance(BalancingModes.BacktrackOnFailure | BalancingModes.AllowCommentsAndTemplates);
+                        right = Language.FlipBracket(CurrentToken.Kind);
+                        success = Balance(builder, BalancingModes.BacktrackOnFailure | BalancingModes.AllowCommentsAndTemplates);
                     }
 
                     if (!success)
                     {
-                        AcceptUntil(CSharpTokenType.LessThan);
+                        AcceptUntil(SyntaxKind.LessThan);
                     }
                     if (At(right))
                     {
                         AcceptAndMoveNext();
 
                         // At the ending brace, restore the initial accepted characters.
-                        Span.EditHandler.AcceptedCharacters = acceptedCharacters;
+                        SpanContext.EditHandler.AcceptedCharacters = acceptedCharacters;
                     }
-                    return MethodCallOrArrayIndex(acceptedCharacters);
+                    return ParseMethodCallOrArrayIndex(builder, acceptedCharacters);
                 }
-                if (At(CSharpTokenType.QuestionMark))
+                if (At(SyntaxKind.QuestionMark))
                 {
                     var next = Lookahead(count: 1);
 
                     if (next != null)
                     {
-                        if (next.Type == CSharpTokenType.Dot)
+                        if (next.Kind == SyntaxKind.Dot)
                         {
                             // Accept null conditional dot operator (?.).
                             AcceptAndMoveNext();
                             AcceptAndMoveNext();
 
                             // If the next piece after the ?. is a keyword or identifier then we want to continue.
-                            return At(CSharpTokenType.Identifier) || At(CSharpTokenType.Keyword);
+                            return At(SyntaxKind.Identifier) || At(SyntaxKind.Keyword);
                         }
-                        else if (next.Type == CSharpTokenType.LeftBracket)
+                        else if (next.Kind == SyntaxKind.LeftBracket)
                         {
                             // We're at the ? for a null conditional bracket operator (?[).
                             AcceptAndMoveNext();
 
                             // Accept the [ and any content inside (it will attempt to balance).
-                            return MethodCallOrArrayIndex(acceptedCharacters);
+                            return ParseMethodCallOrArrayIndex(builder, acceptedCharacters);
                         }
                     }
                 }
-                else if (At(CSharpTokenType.Dot))
+                else if (At(SyntaxKind.Dot))
                 {
                     var dot = CurrentToken;
                     if (NextToken())
                     {
-                        if (At(CSharpTokenType.Identifier) || At(CSharpTokenType.Keyword))
+                        if (At(SyntaxKind.Identifier) || At(SyntaxKind.Keyword))
                         {
                             // Accept the dot and return to the start
                             Accept(dot);
@@ -540,7 +440,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         Accept(dot);
                     }
                 }
-                else if (!At(CSharpTokenType.WhiteSpace) && !At(CSharpTokenType.NewLine))
+                else if (!At(SyntaxKind.Whitespace) && !At(SyntaxKind.NewLine))
                 {
                     PutCurrentBack();
                 }
@@ -550,746 +450,107 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return false;
         }
 
-        protected void CompleteBlock()
+        private CSharpStatementBodySyntax ParseStatementBody(Block block = null)
         {
-            CompleteBlock(insertMarkerIfNecessary: true);
-        }
-
-        protected void CompleteBlock(bool insertMarkerIfNecessary)
-        {
-            CompleteBlock(insertMarkerIfNecessary, captureWhitespaceToEndOfLine: insertMarkerIfNecessary);
-        }
-
-        protected void CompleteBlock(bool insertMarkerIfNecessary, bool captureWhitespaceToEndOfLine)
-        {
-            if (insertMarkerIfNecessary && Context.Builder.LastAcceptedCharacters != AcceptedCharactersInternal.Any)
+            Assert(SyntaxKind.LeftBrace);
+            block = block ?? new Block(Resources.BlockName_Code, CurrentStart);
+            var leftBrace = OutputAsMetaCode(EatExpectedToken(SyntaxKind.LeftBrace));
+            CSharpCodeBlockSyntax codeBlock = null;
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
             {
-                AddMarkerTokenIfNecessary();
-            }
-
-            EnsureCurrent();
-
-            // Read whitespace, but not newlines
-            // If we're not inserting a marker span, we don't need to capture whitespace
-            if (!Context.WhiteSpaceIsSignificantToAncestorBlock &&
-                Context.Builder.CurrentBlock.Type != BlockKindInternal.Expression &&
-                captureWhitespaceToEndOfLine &&
-                !Context.DesignTimeMode &&
-                !IsNested)
-            {
-                CaptureWhitespaceAtEndOfCodeOnlyLine();
-            }
-            else
-            {
-                PutCurrentBack();
-            }
-        }
-
-        private void CaptureWhitespaceAtEndOfCodeOnlyLine()
-        {
-            var whitespace = ReadWhile(token => token.Type == CSharpTokenType.WhiteSpace);
-            if (At(CSharpTokenType.NewLine))
-            {
-                Accept(whitespace);
-                AcceptAndMoveNext();
-                PutCurrentBack();
-            }
-            else
-            {
-                PutCurrentBack();
-                PutBack(whitespace);
-            }
-        }
-
-        private void ConfigureExplicitExpressionSpan(SpanBuilder sb)
-        {
-            sb.EditHandler = SpanEditHandler.CreateDefault(Language.TokenizeString);
-            sb.ChunkGenerator = new ExpressionChunkGenerator();
-        }
-
-        private void ExplicitExpression()
-        {
-            var block = new Block(Resources.BlockName_ExplicitExpression, CurrentStart);
-            Assert(CSharpTokenType.LeftParenthesis);
-            AcceptAndMoveNext();
-            Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-            Span.ChunkGenerator = SpanChunkGenerator.Null;
-            Output(SpanKindInternal.MetaCode);
-            using (PushSpanConfig(ConfigureExplicitExpressionSpan))
-            {
-                var success = Balance(
-                    BalancingModes.BacktrackOnFailure |
-                        BalancingModes.NoErrorOnFailure |
-                        BalancingModes.AllowCommentsAndTemplates,
-                    CSharpTokenType.LeftParenthesis,
-                    CSharpTokenType.RightParenthesis,
-                    block.Start);
-
-                if (!success)
-                {
-                    AcceptUntil(CSharpTokenType.LessThan);
-                    Context.ErrorSink.OnError(
-                        RazorDiagnosticFactory.CreateParsing_ExpectedEndOfBlockBeforeEOF(
-                            new SourceSpan(block.Start, contentLength: 1 /* ( */), block.Name, ")", "("));
-                }
-
-                // If necessary, put an empty-content marker token here
-                if (Span.Tokens.Count == 0)
-                {
-                    Accept(new CSharpToken(string.Empty, CSharpTokenType.Unknown));
-                }
-
-                // Output the content span and then capture the ")"
-                Output(SpanKindInternal.Code);
-            }
-            Optional(CSharpTokenType.RightParenthesis);
-            if (!EndOfFile)
-            {
-                PutCurrentBack();
-            }
-            Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-            Span.ChunkGenerator = SpanChunkGenerator.Null;
-            CompleteBlock(insertMarkerIfNecessary: false);
-            Output(SpanKindInternal.MetaCode);
-        }
-
-        private void Template()
-        {
-            if (Context.Builder.ActiveBlocks.Any(block => block.Type == BlockKindInternal.Template))
-            {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_InlineMarkupBlocksCannotBeNested(
-                        new SourceSpan(CurrentStart, contentLength: 1 /* @ */)));
-            }
-            Output(SpanKindInternal.Code);
-            using (Context.Builder.StartBlock(BlockKindInternal.Template))
-            {
-                Context.Builder.CurrentBlock.ChunkGenerator = new TemplateBlockChunkGenerator();
-                PutCurrentBack();
-                OtherParserBlock();
-            }
-        }
-
-        private void OtherParserBlock()
-        {
-            ParseWithOtherParser(p => p.ParseBlock());
-        }
-
-        private void SectionBlock(string left, string right, bool caseSensitive)
-        {
-            ParseWithOtherParser(p => p.ParseRazorBlock(Tuple.Create(left, right), caseSensitive));
-        }
-
-        private void NestedBlock()
-        {
-            Output(SpanKindInternal.Code);
-
-            var wasNested = IsNested;
-            IsNested = true;
-            using (PushSpanConfig())
-            {
-                ParseBlock();
-            }
-
-            Span.Start = CurrentLocation;
-            Initialize(Span);
-            IsNested = wasNested;
-            NextToken();
-        }
-
-        protected override bool IsAtEmbeddedTransition(bool allowTemplatesAndComments, bool allowTransitions)
-        {
-            // No embedded transitions in C#, so ignore that param
-            return allowTemplatesAndComments
-                   && ((Language.IsTransition(CurrentToken)
-                        && NextIs(CSharpTokenType.LessThan, CSharpTokenType.Colon, CSharpTokenType.DoubleColon))
-                       || Language.IsCommentStart(CurrentToken));
-        }
-
-        protected override void HandleEmbeddedTransition()
-        {
-            if (Language.IsTransition(CurrentToken))
-            {
-                PutCurrentBack();
-                Template();
-            }
-            else if (Language.IsCommentStart(CurrentToken))
-            {
-                RazorComment();
-            }
-        }
-
-        private void ParseWithOtherParser(Action<HtmlMarkupParser> parseAction)
-        {
-            // When transitioning to the HTML parser we no longer want to act as if we're in a nested C# state.
-            // For instance, if <div>@hello.</div> is in a nested C# block we don't want the trailing '.' to be handled
-            // as C#; it should be handled as a period because it's wrapped in markup.
-            var wasNested = IsNested;
-            IsNested = false;
-
-            using (PushSpanConfig())
-            {
-                parseAction(HtmlParser);
-            }
-
-            Span.Start = CurrentLocation;
-            Initialize(Span);
-
-            IsNested = wasNested;
-
-            NextToken();
-        }
-
-        private void SetUpKeywords()
-        {
-            MapKeywords(
-                ConditionalBlock,
-                CSharpKeyword.For,
-                CSharpKeyword.Foreach,
-                CSharpKeyword.While,
-                CSharpKeyword.Switch,
-                CSharpKeyword.Lock);
-            MapKeywords(CaseStatement, false, CSharpKeyword.Case, CSharpKeyword.Default);
-            MapKeywords(IfStatement, CSharpKeyword.If);
-            MapKeywords(TryStatement, CSharpKeyword.Try);
-            MapKeywords(UsingKeyword, CSharpKeyword.Using);
-            MapKeywords(DoStatement, CSharpKeyword.Do);
-            MapKeywords(ReservedDirective, CSharpKeyword.Class, CSharpKeyword.Namespace);
-        }
-
-        protected virtual void ReservedDirective(bool topLevel)
-        {
-            Context.ErrorSink.OnError(
-                RazorDiagnosticFactory.CreateParsing_ReservedWord(
-                    new SourceSpan(CurrentStart, CurrentToken.Content.Length), CurrentToken.Content));
-                
-            AcceptAndMoveNext();
-            Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-            Span.ChunkGenerator = SpanChunkGenerator.Null;
-            Context.Builder.CurrentBlock.Type = BlockKindInternal.Directive;
-            CompleteBlock();
-            Output(SpanKindInternal.MetaCode);
-        }
-
-        private void KeywordBlock(bool topLevel)
-        {
-            HandleKeyword(topLevel, () =>
-            {
-                Context.Builder.CurrentBlock.Type = BlockKindInternal.Expression;
-                Context.Builder.CurrentBlock.ChunkGenerator = new ExpressionChunkGenerator();
-                ImplicitExpression();
-            });
-        }
-
-        private void CaseStatement(bool topLevel)
-        {
-            Assert(CSharpTokenType.Keyword);
-            Debug.Assert(CurrentToken.Keyword != null &&
-                         (CurrentToken.Keyword.Value == CSharpKeyword.Case ||
-                          CurrentToken.Keyword.Value == CSharpKeyword.Default));
-            AcceptUntil(CSharpTokenType.Colon);
-            Optional(CSharpTokenType.Colon);
-        }
-
-        private void DoStatement(bool topLevel)
-        {
-            Assert(CSharpKeyword.Do);
-            UnconditionalBlock();
-            WhileClause();
-            if (topLevel)
-            {
-                CompleteBlock();
-            }
-        }
-
-        private void WhileClause()
-        {
-            Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
-            var whitespace = SkipToNextImportantToken();
-
-            if (At(CSharpKeyword.While))
-            {
-                Accept(whitespace);
-                Assert(CSharpKeyword.While);
-                AcceptAndMoveNext();
-                AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
-                if (AcceptCondition() && Optional(CSharpTokenType.Semicolon))
-                {
-                    Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                }
-            }
-            else
-            {
-                PutCurrentBack();
-                PutBack(whitespace);
-            }
-        }
-
-        private void UsingKeyword(bool topLevel)
-        {
-            Assert(CSharpKeyword.Using);
-            var block = new Block(CurrentToken, CurrentStart);
-            AcceptAndMoveNext();
-            AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
-
-            if (At(CSharpTokenType.LeftParenthesis))
-            {
-                // using ( ==> Using Statement
-                UsingStatement(block);
-            }
-            else if (At(CSharpTokenType.Identifier) || At(CSharpKeyword.Static))
-            {
-                // using Identifier ==> Using Declaration
-                if (!topLevel)
-                {
-                    Context.ErrorSink.OnError(
-                        RazorDiagnosticFactory.CreateParsing_NamespaceImportAndTypeAliasCannotExistWithinCodeBlock(
-                            new SourceSpan(block.Start, block.Name.Length)));
-                    StandardStatement();
-                }
-                else
-                {
-                    UsingDeclaration();
-                }
-            }
-
-            if (topLevel)
-            {
-                CompleteBlock();
-            }
-        }
-
-        private void UsingDeclaration()
-        {
-            // Set block type to directive
-            Context.Builder.CurrentBlock.Type = BlockKindInternal.Directive;
-
-            var start = CurrentStart;
-            if (At(CSharpTokenType.Identifier))
-            {
-                // non-static using
-                NamespaceOrTypeName();
-                var whitespace = ReadWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
-                if (At(CSharpTokenType.Assign))
-                {
-                    // Alias
-                    Accept(whitespace);
-                    Assert(CSharpTokenType.Assign);
-                    AcceptAndMoveNext();
-
-                    AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
-
-                    // One more namespace or type name
-                    NamespaceOrTypeName();
-                }
-                else
-                {
-                    PutCurrentBack();
-                    PutBack(whitespace);
-                }
-            }
-            else if (At(CSharpKeyword.Static))
-            {
-                // static using
-                AcceptAndMoveNext();
-                AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
-                NamespaceOrTypeName();
-            }
-
-            Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.AnyExceptNewline;
-            Span.ChunkGenerator = new AddImportChunkGenerator(new LocationTagged<string>(
-                string.Concat(Span.Tokens.Skip(1).Select(s => s.Content)),
-                start));
-
-            // Optional ";"
-            if (EnsureCurrent())
-            {
-                Optional(CSharpTokenType.Semicolon);
-            }
-        }
-
-        // Used for parsing a qualified name like that which follows the `namespace` keyword.
-        //
-        // qualified-identifier:
-        //      identifier
-        //      qualified-identifier . identifier
-        protected bool QualifiedIdentifier(out int identifierLength)
-        {
-            var currentIdentifierLength = 0;
-            var expectingDot = false;
-            var tokens = ReadWhile(token =>
-            {
-                var type = token.Type;
-                if ((expectingDot && type == CSharpTokenType.Dot) ||
-                    (!expectingDot && type == CSharpTokenType.Identifier))
-                {
-                    expectingDot = !expectingDot;
-                    return true;
-                }
-
-                if (type != CSharpTokenType.WhiteSpace &&
-                    type != CSharpTokenType.NewLine)
-                {
-                    expectingDot = false;
-                    currentIdentifierLength += token.Content.Length;
-                }
-
-                return false;
-            });
-
-            identifierLength = currentIdentifierLength;
-            var validQualifiedIdentifier = expectingDot;
-            if (validQualifiedIdentifier)
-            {
-                foreach (var token in tokens)
-                {
-                    identifierLength += token.Content.Length;
-                    Accept(token);
-                }
-
-                return true;
-            }
-            else
-            {
-                PutCurrentBack();
-
-                foreach (var token in tokens)
-                {
-                    identifierLength += token.Content.Length;
-                    PutBack(token);
-                }
+                var builder = pooledResult.Builder;
+                // Set up auto-complete and parse the code block
+                var editHandler = new AutoCompleteEditHandler(Language.TokenizeString);
+                SpanContext.EditHandler = editHandler;
+                ParseCodeBlock(builder, block, acceptTerminatingBrace: false);
 
                 EnsureCurrent();
-                return false;
+                SpanContext.ChunkGenerator = new StatementChunkGenerator();
+                AcceptMarkerTokenIfNecessary();
+                if (!At(SyntaxKind.RightBrace))
+                {
+                    editHandler.AutoCompleteString = "}";
+                }
+                builder.Add(OutputTokensAsStatementLiteral());
+
+                codeBlock = SyntaxFactory.CSharpCodeBlock(builder.ToList());
             }
-        }
 
-        protected bool NamespaceOrTypeName()
-        {
-            if (Optional(CSharpTokenType.LeftParenthesis))
+            RazorMetaCodeSyntax rightBrace = null;
+            if (At(SyntaxKind.RightBrace))
             {
-                while (!Optional(CSharpTokenType.RightParenthesis) && !EndOfFile)
-                {
-                    Optional(CSharpTokenType.WhiteSpace);
-
-                    if (!NamespaceOrTypeName())
-                    {
-                        return false;
-                    }
-
-                    Optional(CSharpTokenType.WhiteSpace);
-                    Optional(CSharpTokenType.Identifier);
-                    Optional(CSharpTokenType.WhiteSpace);
-                    Optional(CSharpTokenType.Comma);
-                }
-
-                if (At(CSharpTokenType.WhiteSpace) && NextIs(CSharpTokenType.QuestionMark))
-                {
-                    // Only accept the whitespace if we are going to consume the next token.
-                    AcceptAndMoveNext();
-                }
-
-                Optional(CSharpTokenType.QuestionMark); // Nullable
-
-                return true;
-            }
-            else if (Optional(CSharpTokenType.Identifier) || Optional(CSharpTokenType.Keyword))
-            {
-                if (Optional(CSharpTokenType.DoubleColon))
-                {
-                    if (!Optional(CSharpTokenType.Identifier))
-                    {
-                        Optional(CSharpTokenType.Keyword);
-                    }
-                }
-                if (At(CSharpTokenType.LessThan))
-                {
-                    TypeArgumentList();
-                }
-                if (Optional(CSharpTokenType.Dot))
-                {
-                    NamespaceOrTypeName();
-                }
-
-                if (At(CSharpTokenType.WhiteSpace) && NextIs(CSharpTokenType.QuestionMark))
-                {
-                    // Only accept the whitespace if we are going to consume the next token.
-                    AcceptAndMoveNext();
-                }
-
-                Optional(CSharpTokenType.QuestionMark); // Nullable
-
-                if (At(CSharpTokenType.WhiteSpace) && NextIs(CSharpTokenType.LeftBracket))
-                {
-                    // Only accept the whitespace if we are going to consume the next token.
-                    AcceptAndMoveNext();
-                }
-
-                while (At(CSharpTokenType.LeftBracket))
-                {
-                    Balance(BalancingModes.None);
-                    Optional(CSharpTokenType.RightBracket);
-                }
-                return true;
+                rightBrace = OutputAsMetaCode(EatCurrentToken());
             }
             else
             {
-                return false;
+                rightBrace = OutputAsMetaCode(
+                    SyntaxFactory.MissingToken(SyntaxKind.RightBrace),
+                    SpanContext.EditHandler.AcceptedCharacters);
             }
-        }
 
-        private void TypeArgumentList()
-        {
-            Assert(CSharpTokenType.LessThan);
-            Balance(BalancingModes.None);
-            Optional(CSharpTokenType.GreaterThan);
-        }
-
-        private void UsingStatement(Block block)
-        {
-            Assert(CSharpTokenType.LeftParenthesis);
-
-            // Parse condition
-            if (AcceptCondition())
+            if (!IsNested)
             {
-                AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
-
-                // Parse code block
-                ExpectCodeBlock(block);
-            }
-        }
-
-        private void TryStatement(bool topLevel)
-        {
-            Assert(CSharpKeyword.Try);
-            UnconditionalBlock();
-            AfterTryClause();
-            if (topLevel)
-            {
-                CompleteBlock();
-            }
-        }
-
-        private void IfStatement(bool topLevel)
-        {
-            Assert(CSharpKeyword.If);
-            ConditionalBlock(topLevel: false);
-            AfterIfClause();
-            if (topLevel)
-            {
-                CompleteBlock();
-            }
-        }
-
-        private void AfterTryClause()
-        {
-            // Grab whitespace
-            var whitespace = SkipToNextImportantToken();
-
-            // Check for a catch or finally part
-            if (At(CSharpKeyword.Catch))
-            {
-                Accept(whitespace);
-                Assert(CSharpKeyword.Catch);
-                FilterableCatchBlock();
-                AfterTryClause();
-            }
-            else if (At(CSharpKeyword.Finally))
-            {
-                Accept(whitespace);
-                Assert(CSharpKeyword.Finally);
-                UnconditionalBlock();
-            }
-            else
-            {
-                // Return whitespace and end the block
-                PutCurrentBack();
-                PutBack(whitespace);
-                Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
-            }
-        }
-
-        private void AfterIfClause()
-        {
-            // Grab whitespace and razor comments
-            var whitespace = SkipToNextImportantToken();
-
-            // Check for an else part
-            if (At(CSharpKeyword.Else))
-            {
-                Accept(whitespace);
-                Assert(CSharpKeyword.Else);
-                ElseClause();
-            }
-            else
-            {
-                // No else, return whitespace
-                PutCurrentBack();
-                PutBack(whitespace);
-                Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
-            }
-        }
-
-        private void ElseClause()
-        {
-            if (!At(CSharpKeyword.Else))
-            {
-                return;
-            }
-            var block = new Block(CurrentToken, CurrentStart);
-
-            AcceptAndMoveNext();
-            AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
-            if (At(CSharpKeyword.If))
-            {
-                // ElseIf
-                block.Name = SyntaxConstants.CSharp.ElseIfKeyword;
-                ConditionalBlock(block);
-                AfterIfClause();
-            }
-            else if (!EndOfFile)
-            {
-                // Else
-                ExpectCodeBlock(block);
-            }
-        }
-
-        private void ExpectCodeBlock(Block block)
-        {
-            if (!EndOfFile)
-            {
-                // Check for "{" to make sure we're at a block
-                if (!At(CSharpTokenType.LeftBrace))
+                EnsureCurrent();
+                if (At(SyntaxKind.NewLine) ||
+                    (At(SyntaxKind.Whitespace) && NextIs(SyntaxKind.NewLine)))
                 {
-                    Context.ErrorSink.OnError(
-                        RazorDiagnosticFactory.CreateParsing_SingleLineControlFlowStatementsNotAllowed(
-                            new SourceSpan(CurrentStart, CurrentToken.Content.Length),
-                            Language.GetSample(CSharpTokenType.LeftBrace),
-                            CurrentToken.Content));
+                    Context.NullGenerateWhitespaceAndNewLine = true;
                 }
-
-                // Parse the statement and then we're done
-                Statement(block);
             }
+
+            return SyntaxFactory.CSharpStatementBody(leftBrace, codeBlock, rightBrace);
         }
 
-        private void UnconditionalBlock()
+        private void ParseCodeBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Block block, bool acceptTerminatingBrace = true)
         {
-            Assert(CSharpTokenType.Keyword);
-            var block = new Block(CurrentToken, CurrentStart);
-            AcceptAndMoveNext();
-            AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
-            ExpectCodeBlock(block);
-        }
-
-        private void FilterableCatchBlock()
-        {
-            Assert(CSharpKeyword.Catch);
-
-            var block = new Block(CurrentToken, CurrentStart);
-
-            // Accept "catch"
-            AcceptAndMoveNext();
-            AcceptWhile(IsValidStatementSpacingToken);
-
-            // Parse the catch condition if present. If not present, let the C# compiler complain.
-            if (AcceptCondition())
+            EnsureCurrent();
+            while (!EndOfFile && !At(SyntaxKind.RightBrace))
             {
-                AcceptWhile(IsValidStatementSpacingToken);
-
-                if (At(CSharpKeyword.When))
-                {
-                    // Accept "when".
-                    AcceptAndMoveNext();
-                    AcceptWhile(IsValidStatementSpacingToken);
-
-                    // Parse the filter condition if present. If not present, let the C# compiler complain.
-                    if (!AcceptCondition())
-                    {
-                        // Incomplete condition.
-                        return;
-                    }
-
-                    AcceptWhile(IsValidStatementSpacingToken);
-                }
-
-                ExpectCodeBlock(block);
+                // Parse a statement, then return here
+                ParseStatement(builder, block: block);
+                EnsureCurrent();
             }
-        }
 
-        private void ConditionalBlock(bool topLevel)
-        {
-            Assert(CSharpTokenType.Keyword);
-            var block = new Block(CurrentToken, CurrentStart);
-            ConditionalBlock(block);
-            if (topLevel)
+            if (EndOfFile)
             {
-                CompleteBlock();
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_ExpectedEndOfBlockBeforeEOF(
+                        new SourceSpan(block.Start, contentLength: 1 /* { OR } */), block.Name, "}", "{"));
             }
-        }
-
-        private void ConditionalBlock(Block block)
-        {
-            AcceptAndMoveNext();
-            AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
-
-            // Parse the condition, if present (if not present, we'll let the C# compiler complain)
-            if (AcceptCondition())
+            else if (acceptTerminatingBrace)
             {
-                AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
-                ExpectCodeBlock(block);
+                Assert(SyntaxKind.RightBrace);
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                AcceptAndMoveNext();
             }
         }
 
-        private bool AcceptCondition()
+        private void ParseStatement(in SyntaxListBuilder<RazorSyntaxNode> builder, Block block)
         {
-            if (At(CSharpTokenType.LeftParenthesis))
-            {
-                var complete = Balance(BalancingModes.BacktrackOnFailure | BalancingModes.AllowCommentsAndTemplates);
-                if (!complete)
-                {
-                    AcceptUntil(CSharpTokenType.NewLine);
-                }
-                else
-                {
-                    Optional(CSharpTokenType.RightParenthesis);
-                }
-                return complete;
-            }
-            return true;
-        }
-
-        private void Statement()
-        {
-            Statement(null);
-        }
-
-        private void Statement(Block block)
-        {
-            Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
-
+            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
             // Accept whitespace but always keep the last whitespace node so we can put it back if necessary
-            var lastWhitespace = AcceptWhiteSpaceInLines();
-
+            var lastWhitespace = AcceptWhitespaceInLines();
             if (EndOfFile)
             {
                 if (lastWhitespace != null)
                 {
                     Accept(lastWhitespace);
                 }
+
+                builder.Add(OutputTokensAsStatementLiteral());
                 return;
             }
 
-            var type = CurrentToken.Type;
-            var loc = CurrentStart;
+            var kind = CurrentToken.Kind;
+            var location = CurrentStart;
 
             // Both cases @: and @:: are triggered as markup, second colon in second case will be triggered as a plain text
-            var isSingleLineMarkup = type == CSharpTokenType.Transition &&
-                (NextIs(CSharpTokenType.Colon, CSharpTokenType.DoubleColon));
+            var isSingleLineMarkup = kind == SyntaxKind.Transition &&
+                (NextIs(SyntaxKind.Colon, SyntaxKind.DoubleColon));
 
             var isMarkup = isSingleLineMarkup ||
-                type == CSharpTokenType.LessThan ||
-                (type == CSharpTokenType.Transition && NextIs(CSharpTokenType.LessThan));
+                kind == SyntaxKind.LessThan ||
+                (kind == SyntaxKind.Transition && NextIs(SyntaxKind.LessThan));
 
             if (Context.DesignTimeMode || !isMarkup)
             {
@@ -1321,90 +582,89 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             if (isMarkup)
             {
-                if (type == CSharpTokenType.Transition && !isSingleLineMarkup)
+                if (kind == SyntaxKind.Transition && !isSingleLineMarkup)
                 {
                     Context.ErrorSink.OnError(
                         RazorDiagnosticFactory.CreateParsing_AtInCodeMustBeFollowedByColonParenOrIdentifierStart(
-                            new SourceSpan(loc, contentLength: 1 /* @ */)));
+                            new SourceSpan(location, contentLength: 1 /* @ */)));
                 }
 
                 // Markup block
-                Output(SpanKindInternal.Code);
+                builder.Add(OutputTokensAsStatementLiteral());
                 if (Context.DesignTimeMode && CurrentToken != null &&
-                    (CurrentToken.Type == CSharpTokenType.LessThan || CurrentToken.Type == CSharpTokenType.Transition))
+                    (CurrentToken.Kind == SyntaxKind.LessThan || CurrentToken.Kind == SyntaxKind.Transition))
                 {
                     PutCurrentBack();
                 }
-                OtherParserBlock();
+                OtherParserBlock(builder);
             }
             else
             {
                 // What kind of statement is this?
-                HandleStatement(block, type);
+                switch (kind)
+                {
+                    case SyntaxKind.RazorCommentTransition:
+                        AcceptMarkerTokenIfNecessary();
+                        builder.Add(OutputTokensAsStatementLiteral());
+                        var comment = ParseRazorComment();
+                        builder.Add(comment);
+                        ParseStatement(builder, block);
+                        break;
+                    case SyntaxKind.LeftBrace:
+                        // Verbatim Block
+                        AcceptAndMoveNext();
+                        ParseCodeBlock(builder, block);
+                        break;
+                    case SyntaxKind.Keyword:
+                        if (!TryParseKeyword(builder, transition: null))
+                        {
+                            ParseStandardStatement(builder);
+                        }
+                        break;
+                    case SyntaxKind.Transition:
+                        // Embedded Expression block
+                        ParseEmbeddedExpression(builder);
+                        break;
+                    case SyntaxKind.RightBrace:
+                        // Possible end of Code Block, just run the continuation
+                        break;
+                    case SyntaxKind.CSharpComment:
+                        Accept(CurrentToken);
+                        NextToken();
+                        break;
+                    default:
+                        // Other statement
+                        ParseStandardStatement(builder);
+                        break;
+                }
             }
         }
 
-        private void HandleStatement(Block block, CSharpTokenType type)
-        {
-            switch (type)
-            {
-                case CSharpTokenType.RazorCommentTransition:
-                    Output(SpanKindInternal.Code);
-                    RazorComment();
-                    Statement(block);
-                    break;
-                case CSharpTokenType.LeftBrace:
-                    // Verbatim Block
-                    block = block ?? new Block(Resources.BlockName_Code, CurrentStart);
-                    AcceptAndMoveNext();
-                    CodeBlock(block);
-                    break;
-                case CSharpTokenType.Keyword:
-                    // Keyword block
-                    HandleKeyword(false, StandardStatement);
-                    break;
-                case CSharpTokenType.Transition:
-                    // Embedded Expression block
-                    EmbeddedExpression();
-                    break;
-                case CSharpTokenType.RightBrace:
-                    // Possible end of Code Block, just run the continuation
-                    break;
-                case CSharpTokenType.Comment:
-                    AcceptAndMoveNext();
-                    break;
-                default:
-                    // Other statement
-                    StandardStatement();
-                    break;
-            }
-        }
-
-        private void EmbeddedExpression()
+        private void ParseEmbeddedExpression(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
             // First, verify the type of the block
-            Assert(CSharpTokenType.Transition);
+            Assert(SyntaxKind.Transition);
             var transition = CurrentToken;
             NextToken();
 
-            if (At(CSharpTokenType.Transition))
+            if (At(SyntaxKind.Transition))
             {
                 // Escaped "@"
-                Output(SpanKindInternal.Code);
+                builder.Add(OutputTokensAsStatementLiteral());
 
                 // Output "@" as hidden span
                 Accept(transition);
-                Span.ChunkGenerator = SpanChunkGenerator.Null;
-                Output(SpanKindInternal.Code);
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                builder.Add(OutputTokensAsEphemeralLiteral());
 
-                Assert(CSharpTokenType.Transition);
+                Assert(SyntaxKind.Transition);
                 AcceptAndMoveNext();
-                StandardStatement();
+                ParseStandardStatement(builder);
             }
             else
             {
                 // Throw errors as necessary, but continue parsing
-                if (At(CSharpTokenType.LeftBrace))
+                if (At(SyntaxKind.LeftBrace))
                 {
                     Context.ErrorSink.OnError(
                         RazorDiagnosticFactory.CreateParsing_UnexpectedNestedCodeBlock(
@@ -1416,60 +676,82 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 PutBack(transition);
 
                 // Before exiting, add a marker span if necessary
-                AddMarkerTokenIfNecessary();
+                AcceptMarkerTokenIfNecessary();
+                builder.Add(OutputTokensAsStatementLiteral());
 
-                NestedBlock();
+                var nestedBlock = ParseNestedBlock();
+                builder.Add(nestedBlock);
             }
         }
 
-        private void StandardStatement()
+        private RazorSyntaxNode ParseNestedBlock()
+        {
+            var wasNested = IsNested;
+            IsNested = true;
+
+            RazorSyntaxNode nestedBlock;
+            using (PushSpanContextConfig())
+            {
+                nestedBlock = ParseBlock();
+            }
+
+            InitializeContext(SpanContext);
+            IsNested = wasNested;
+            NextToken();
+
+            return nestedBlock;
+        }
+
+        private void ParseStandardStatement(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
             while (!EndOfFile)
             {
                 var bookmark = CurrentStart.AbsoluteIndex;
                 var read = ReadWhile(token =>
-                    token.Type != CSharpTokenType.Semicolon &&
-                    token.Type != CSharpTokenType.RazorCommentTransition &&
-                    token.Type != CSharpTokenType.Transition &&
-                    token.Type != CSharpTokenType.LeftBrace &&
-                    token.Type != CSharpTokenType.LeftParenthesis &&
-                    token.Type != CSharpTokenType.LeftBracket &&
-                    token.Type != CSharpTokenType.RightBrace);
+                    token.Kind != SyntaxKind.Semicolon &&
+                    token.Kind != SyntaxKind.RazorCommentTransition &&
+                    token.Kind != SyntaxKind.Transition &&
+                    token.Kind != SyntaxKind.LeftBrace &&
+                    token.Kind != SyntaxKind.LeftParenthesis &&
+                    token.Kind != SyntaxKind.LeftBracket &&
+                    token.Kind != SyntaxKind.RightBrace);
 
-                if (At(CSharpTokenType.LeftBrace) ||
-                    At(CSharpTokenType.LeftParenthesis) ||
-                    At(CSharpTokenType.LeftBracket))
+                if (At(SyntaxKind.LeftBrace) ||
+                    At(SyntaxKind.LeftParenthesis) ||
+                    At(SyntaxKind.LeftBracket))
                 {
                     Accept(read);
-                    if (Balance(BalancingModes.AllowCommentsAndTemplates | BalancingModes.BacktrackOnFailure))
+                    if (Balance(builder, BalancingModes.AllowCommentsAndTemplates | BalancingModes.BacktrackOnFailure))
                     {
-                        Optional(CSharpTokenType.RightBrace);
+                        TryAccept(SyntaxKind.RightBrace);
                     }
                     else
                     {
                         // Recovery
-                        AcceptUntil(CSharpTokenType.LessThan, CSharpTokenType.RightBrace);
+                        AcceptUntil(SyntaxKind.LessThan, SyntaxKind.RightBrace);
                         return;
                     }
                 }
-                else if (At(CSharpTokenType.Transition) && (NextIs(CSharpTokenType.LessThan, CSharpTokenType.Colon)))
+                else if (At(SyntaxKind.Transition) && (NextIs(SyntaxKind.LessThan, SyntaxKind.Colon)))
                 {
                     Accept(read);
-                    Output(SpanKindInternal.Code);
-                    Template();
+                    builder.Add(OutputTokensAsStatementLiteral());
+                    ParseTemplate(builder);
                 }
-                else if (At(CSharpTokenType.RazorCommentTransition))
+                else if (At(SyntaxKind.RazorCommentTransition))
                 {
                     Accept(read);
-                    RazorComment();
+                    AcceptMarkerTokenIfNecessary();
+                    builder.Add(OutputTokensAsStatementLiteral());
+                    builder.Add(ParseRazorComment());
                 }
-                else if (At(CSharpTokenType.Semicolon))
+                else if (At(SyntaxKind.Semicolon))
                 {
                     Accept(read);
                     AcceptAndMoveNext();
                     return;
                 }
-                else if (At(CSharpTokenType.RightBrace))
+                else if (At(SyntaxKind.RightBrace))
                 {
                     Accept(read);
                     return;
@@ -1478,110 +760,56 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 {
                     Context.Source.Position = bookmark;
                     NextToken();
-                    AcceptUntil(CSharpTokenType.LessThan, CSharpTokenType.LeftBrace, CSharpTokenType.RightBrace);
+                    AcceptUntil(SyntaxKind.LessThan, SyntaxKind.LeftBrace, SyntaxKind.RightBrace);
                     return;
                 }
             }
         }
 
-        private void CodeBlock(Block block)
+        private void ParseTemplate(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
-            CodeBlock(true, block);
-        }
-
-        private void CodeBlock(bool acceptTerminatingBrace, Block block)
-        {
-            EnsureCurrent();
-            while (!EndOfFile && !At(CSharpTokenType.RightBrace))
-            {
-                // Parse a statement, then return here
-                Statement();
-                EnsureCurrent();
-            }
-
-            if (EndOfFile)
+            if (Context.InTemplateContext)
             {
                 Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_ExpectedEndOfBlockBeforeEOF(
-                        new SourceSpan(block.Start, contentLength: 1 /* { OR } */), block.Name, "}", "{"));
+                    RazorDiagnosticFactory.CreateParsing_InlineMarkupBlocksCannotBeNested(
+                        new SourceSpan(CurrentStart, contentLength: 1 /* @ */)));
             }
-            else if (acceptTerminatingBrace)
+            if (SpanContext.ChunkGenerator is ExpressionChunkGenerator)
             {
-                Assert(CSharpTokenType.RightBrace);
-                Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                AcceptAndMoveNext();
-            }
-        }
-
-        private void HandleKeyword(bool topLevel, Action fallback)
-        {
-            Debug.Assert(CurrentToken.Type == CSharpTokenType.Keyword && CurrentToken.Keyword != null);
-            if (_keywordParsers.TryGetValue(CurrentToken.Keyword.Value, out var handler))
-            {
-                handler(topLevel);
+                builder.Add(OutputTokensAsExpressionLiteral());
             }
             else
             {
-                fallback();
+                builder.Add(OutputTokensAsStatementLiteral());
             }
-        }
 
-        private IEnumerable<CSharpToken> SkipToNextImportantToken()
-        {
-            while (!EndOfFile)
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
             {
-                var whitespace = ReadWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
-                if (At(CSharpTokenType.RazorCommentTransition))
-                {
-                    Accept(whitespace);
-                    Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
-                    RazorComment();
-                }
-                else
-                {
-                    return whitespace;
-                }
+                var templateBuilder = pooledResult.Builder;
+                Context.InTemplateContext = true;
+                PutCurrentBack();
+                OtherParserBlock(templateBuilder);
+
+                var template = SyntaxFactory.CSharpTemplateBlock(templateBuilder.ToList());
+                builder.Add(template);
+
+                Context.InTemplateContext = false;
             }
-            return Enumerable.Empty<CSharpToken>();
         }
 
-        // Common code for Parsers, but FxCop REALLY doesn't like it in the base class.. moving it here for now.
-        protected override void OutputSpanBeforeRazorComment()
+        protected bool TryParseDirective(in SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition, string directive)
         {
-            AddMarkerTokenIfNecessary();
-            Output(SpanKindInternal.Code);
-        }
-
-        private void SetUpExpressions()
-        {
-            MapExpressionKeyword(AwaitExpression, CSharpKeyword.Await);
-        }
-
-        private void AwaitExpression(bool topLevel)
-        {
-            // Ensure that we're on the await statement (only runs in debug)
-            Assert(CSharpKeyword.Await);
-
-            // Accept the "await" and move on
-            AcceptAndMoveNext();
-
-            // Accept 1 or more spaces between the await and the following code.
-            AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
-
-            // Top level basically indicates if we're within an expression or statement.
-            // Ex: topLevel true = @await Foo()  |  topLevel false = @{ await Foo(); }
-            // Note that in this case @{ <b>@await Foo()</b> } top level is true for await.
-            // Therefore, if we're top level then we want to act like an implicit expression,
-            // otherwise just act as whatever we're contained in.
-            if (topLevel)
+            if (_directiveParserMap.TryGetValue(directive, out var handler))
             {
-                // Setup the Span to be an async implicit expression (an implicit expresison that allows spaces).
-                // Spaces are allowed because of "@await Foo()".
-                AsyncImplicitExpression();
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                handler(builder, transition);
+                return true;
             }
+
+            return false;
         }
 
-        private void SetupDirectives(IEnumerable<DirectiveDescriptor> directiveDescriptors)
+        private void SetupDirectiveParsers(IEnumerable<DirectiveDescriptor> directiveDescriptors)
         {
             var allDirectives = directiveDescriptors.Concat(DefaultDirectiveDescriptors).ToList();
 
@@ -1589,12 +817,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             {
                 var directiveDescriptor = allDirectives[i];
                 CurrentKeywords.Add(directiveDescriptor.Directive);
-                MapDirectives(() => HandleDirective(directiveDescriptor), directiveDescriptor.Directive);
+                MapDirectives((builder, transition) => ParseExtensibleDirective(builder, transition, directiveDescriptor), directiveDescriptor.Directive);
             }
 
-            MapDirectives(TagHelperPrefixDirective, SyntaxConstants.CSharp.TagHelperPrefixKeyword);
-            MapDirectives(AddTagHelperDirective, SyntaxConstants.CSharp.AddTagHelperKeyword);
-            MapDirectives(RemoveTagHelperDirective, SyntaxConstants.CSharp.RemoveTagHelperKeyword);
+            MapDirectives(ParseTagHelperPrefixDirective, SyntaxConstants.CSharp.TagHelperPrefixKeyword);
+            MapDirectives(ParseAddTagHelperDirective, SyntaxConstants.CSharp.AddTagHelperKeyword);
+            MapDirectives(ParseRemoveTagHelperDirective, SyntaxConstants.CSharp.RemoveTagHelperKeyword);
         }
 
         private void EnsureDirectiveIsAtStartOfLine()
@@ -1620,340 +848,208 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        private void HandleDirective(DirectiveDescriptor descriptor)
+        protected void MapDirectives(Action<SyntaxListBuilder<RazorSyntaxNode>, CSharpTransitionSyntax> handler, params string[] directives)
         {
-            AssertDirective(descriptor.Directive);
-
-            var directiveErrorSink = new ErrorSink();
-            var savedErrorSink = Context.ErrorSink;
-            Context.ErrorSink = directiveErrorSink;
-
-            var directiveChunkGenerator = new DirectiveChunkGenerator(descriptor);
-            try
+            foreach (var directive in directives)
             {
-                EnsureDirectiveIsAtStartOfLine();
-
-                Context.Builder.CurrentBlock.Type = BlockKindInternal.Directive;
-                Context.Builder.CurrentBlock.ChunkGenerator = directiveChunkGenerator;
-
-                AcceptAndMoveNext();
-                Output(SpanKindInternal.MetaCode, AcceptedCharactersInternal.None);
-
-                // Even if an error was logged do not bail out early. If a directive was used incorrectly it doesn't mean it can't be parsed.
-                ValidateDirectiveUsage(descriptor);
-
-                for (var i = 0; i < descriptor.Tokens.Count; i++)
+                _directiveParserMap.Add(directive, (builder, transition) =>
                 {
-                    if (!At(CSharpTokenType.WhiteSpace) &&
-                        !At(CSharpTokenType.NewLine) &&
-                        !EndOfFile)
-                    {
-                        Context.ErrorSink.OnError(
-                            RazorDiagnosticFactory.CreateParsing_DirectiveTokensMustBeSeparatedByWhitespace(
-                                new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive));
-                        return;
-                    }
+                    handler(builder, transition);
+                    Context.SeenDirectives.Add(directive);
+                });
 
-                    var tokenDescriptor = descriptor.Tokens[i];
-                    AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+                Keywords.Add(directive);
 
-                    if (tokenDescriptor.Kind == DirectiveTokenKind.Member ||
-                        tokenDescriptor.Kind == DirectiveTokenKind.Namespace ||
-                        tokenDescriptor.Kind == DirectiveTokenKind.Type)
-                    {
-                        Span.ChunkGenerator = SpanChunkGenerator.Null;
-                        Output(SpanKindInternal.Code, AcceptedCharactersInternal.WhiteSpace);
-
-                        if (EndOfFile || At(CSharpTokenType.NewLine))
-                        {
-                            // Add a marker token to provide CSharp intellisense when we start typing the directive token.
-                            AddMarkerTokenIfNecessary();
-                            Span.ChunkGenerator = new DirectiveTokenChunkGenerator(tokenDescriptor);
-                            Span.EditHandler = new DirectiveTokenEditHandler(Language.TokenizeString);
-                            Output(SpanKindInternal.Code, AcceptedCharactersInternal.NonWhiteSpace);
-                        }
-                    }
-                    else
-                    {
-                        Span.ChunkGenerator = SpanChunkGenerator.Null;
-                        Output(SpanKindInternal.Markup, AcceptedCharactersInternal.WhiteSpace);
-                    }
-
-                    if (tokenDescriptor.Optional && (EndOfFile || At(CSharpTokenType.NewLine)))
-                    {
-                        break;
-                    }
-                    else if (EndOfFile)
-                    {
-                        Context.ErrorSink.OnError(
-                            RazorDiagnosticFactory.CreateParsing_UnexpectedEOFAfterDirective(
-                                new SourceSpan(CurrentStart, contentLength: 1),
-                                descriptor.Directive,
-                                tokenDescriptor.Kind.ToString().ToLowerInvariant()));
-                        return;
-                    }
-
-                    switch (tokenDescriptor.Kind)
-                    {
-                        case DirectiveTokenKind.Type:
-                            if (!NamespaceOrTypeName())
-                            {
-                                Context.ErrorSink.OnError(
-                                    RazorDiagnosticFactory.CreateParsing_DirectiveExpectsTypeName(
-                                        new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive));
-
-                                return;
-                            }
-                            break;
-
-                        case DirectiveTokenKind.Namespace:
-                            if (!QualifiedIdentifier(out var identifierLength))
-                            {
-                                Context.ErrorSink.OnError(
-                                    RazorDiagnosticFactory.CreateParsing_DirectiveExpectsNamespace(
-                                        new SourceSpan(CurrentStart, identifierLength), descriptor.Directive));
-
-                                return;
-                            }
-                            break;
-
-                        case DirectiveTokenKind.Member:
-                            if (At(CSharpTokenType.Identifier))
-                            {
-                                AcceptAndMoveNext();
-                            }
-                            else
-                            {
-                                Context.ErrorSink.OnError(
-                                    RazorDiagnosticFactory.CreateParsing_DirectiveExpectsIdentifier(
-                                        new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive));
-                                return;
-                            }
-                            break;
-
-                        case DirectiveTokenKind.String:
-                            if (At(CSharpTokenType.StringLiteral) && CurrentToken.Errors.Count == 0)
-                            {
-                                AcceptAndMoveNext();
-                            }
-                            else
-                            {
-                                Context.ErrorSink.OnError(
-                                    RazorDiagnosticFactory.CreateParsing_DirectiveExpectsQuotedStringLiteral(
-                                        new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive));
-                                return;
-                            }
-                            break;
-                    }
-
-                    Span.ChunkGenerator = new DirectiveTokenChunkGenerator(tokenDescriptor);
-                    Span.EditHandler = new DirectiveTokenEditHandler(Language.TokenizeString);
-                    Output(SpanKindInternal.Code, AcceptedCharactersInternal.NonWhiteSpace);
+                // These C# keywords are reserved for use in directives. It's an error to use them outside of
+                // a directive. This code removes the error generation if the directive *is* registered.
+                if (string.Equals(directive, "class", StringComparison.OrdinalIgnoreCase))
+                {
+                    _keywordParserMap.Remove(CSharpKeyword.Class);
                 }
-
-                AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
-                Span.ChunkGenerator = SpanChunkGenerator.Null;
-
-                switch (descriptor.Kind)
+                else if (string.Equals(directive, "namespace", StringComparison.OrdinalIgnoreCase))
                 {
-                    case DirectiveKind.SingleLine:
-                        Output(SpanKindInternal.None, AcceptedCharactersInternal.WhiteSpace);
-
-                        Optional(CSharpTokenType.Semicolon);
-                        Span.ChunkGenerator = SpanChunkGenerator.Null;
-                        Output(SpanKindInternal.MetaCode, AcceptedCharactersInternal.WhiteSpace);
-
-                        AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
-
-                        if (At(CSharpTokenType.NewLine))
-                        {
-                            AcceptAndMoveNext();
-                        }
-                        else if (!EndOfFile)
-                        {
-                            Context.ErrorSink.OnError(
-                                RazorDiagnosticFactory.CreateParsing_UnexpectedDirectiveLiteral(
-                                    new SourceSpan(CurrentStart, CurrentToken.Content.Length),
-                                    descriptor.Directive,
-                                    Resources.ErrorComponent_Newline));
-                        }
-
-                        Span.ChunkGenerator = SpanChunkGenerator.Null;
-
-                        // This should contain the optional whitespace after the optional semicolon and the new line.
-                        // Output as Markup as we want intellisense here.
-                        Output(SpanKindInternal.Markup, AcceptedCharactersInternal.WhiteSpace);
-                        break;
-                    case DirectiveKind.RazorBlock:
-                        AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
-                        Output(SpanKindInternal.Markup, AcceptedCharactersInternal.AllWhiteSpace);
-
-                        ParseDirectiveBlock(descriptor, parseChildren: (startingBraceLocation) =>
-                        {
-                            // When transitioning to the HTML parser we no longer want to act as if we're in a nested C# state.
-                            // For instance, if <div>@hello.</div> is in a nested C# block we don't want the trailing '.' to be handled
-                            // as C#; it should be handled as a period because it's wrapped in markup.
-                            var wasNested = IsNested;
-                            IsNested = false;
-
-                            using (PushSpanConfig())
-                            {
-                                HtmlParser.ParseRazorBlock(Tuple.Create("{", "}"), caseSensitive: true);
-                            }
-
-                            Span.Start = CurrentLocation;
-                            Initialize(Span);
-
-                            IsNested = wasNested;
-
-                            NextToken();
-                        });
-                        break;
-                    case DirectiveKind.CodeBlock:
-                        AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
-                        Output(SpanKindInternal.Markup, AcceptedCharactersInternal.AllWhiteSpace);
-
-                        ParseDirectiveBlock(descriptor, parseChildren: (startingBraceLocation) =>
-                        {
-                            NextToken();
-                            Balance(BalancingModes.NoErrorOnFailure, CSharpTokenType.LeftBrace, CSharpTokenType.RightBrace, startingBraceLocation);
-                            Span.ChunkGenerator = new StatementChunkGenerator();
-                            var existingEditHandler = Span.EditHandler;
-                            Span.EditHandler = new CodeBlockEditHandler(Language.TokenizeString);
-
-                            AddMarkerTokenIfNecessary();
-
-                            Output(SpanKindInternal.Code);
-
-                            Span.EditHandler = existingEditHandler;
-                        });
-                        break;
-                }
-            }
-            finally
-            {
-                if (directiveErrorSink.Errors.Count > 0)
-                {
-                    directiveChunkGenerator.Diagnostics.AddRange(directiveErrorSink.Errors);
-                }
-
-                Context.ErrorSink = savedErrorSink;
-            }
-        }
-
-
-        private void ValidateDirectiveUsage(DirectiveDescriptor descriptor)
-        {
-            if (descriptor.Usage == DirectiveUsage.FileScopedSinglyOccurring)
-            {
-                if (Context.SeenDirectives.Contains(descriptor.Directive))
-                {
-                    // There will always be at least 1 child because of the `@` transition.
-                    var directiveStart = Context.Builder.CurrentBlock.Children.First().Start;
-                    var errorLength = /* @ */ 1 + descriptor.Directive.Length;
-                    Context.ErrorSink.OnError(
-                        RazorDiagnosticFactory.CreateParsing_DuplicateDirective(
-                            new SourceSpan(directiveStart, errorLength), descriptor.Directive));
-
-                    return;
+                    _keywordParserMap.Remove(CSharpKeyword.Namespace);
                 }
             }
         }
 
-        private void ParseDirectiveBlock(DirectiveDescriptor descriptor, Action<SourceLocation> parseChildren)
-        {
-            if (EndOfFile)
-            {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_UnexpectedEOFAfterDirective(
-                        new SourceSpan(CurrentStart, contentLength: 1 /* { */), descriptor.Directive, "{"));
-            }
-            else if (!At(CSharpTokenType.LeftBrace))
-            {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_UnexpectedDirectiveLiteral(
-                        new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive, "{"));
-            }
-            else
-            {
-                var editHandler = new AutoCompleteEditHandler(Language.TokenizeString, autoCompleteAtEndOfSpan: true);
-                Span.EditHandler = editHandler;
-                var startingBraceLocation = CurrentStart;
-                Accept(CurrentToken);
-                Span.ChunkGenerator = SpanChunkGenerator.Null;
-                Output(SpanKindInternal.MetaCode, AcceptedCharactersInternal.None);
-
-                parseChildren(startingBraceLocation);
-
-                Span.ChunkGenerator = SpanChunkGenerator.Null;
-                if (!Optional(CSharpTokenType.RightBrace))
-                {
-                    editHandler.AutoCompleteString = "}";
-                    Context.ErrorSink.OnError(
-                        RazorDiagnosticFactory.CreateParsing_ExpectedEndOfBlockBeforeEOF(
-                            new SourceSpan(startingBraceLocation, contentLength: 1 /* } */), descriptor.Directive, "}", "{"));
-                }
-                else
-                {
-                    Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                }
-                CompleteBlock(insertMarkerIfNecessary: false, captureWhitespaceToEndOfLine: true);
-                Span.ChunkGenerator = SpanChunkGenerator.Null;
-                Output(SpanKindInternal.MetaCode, AcceptedCharactersInternal.None);
-            }
-        }
-
-        protected virtual void TagHelperPrefixDirective()
+        private void ParseTagHelperPrefixDirective(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
         {
             RazorDiagnostic duplicateDiagnostic = null;
             if (Context.SeenDirectives.Contains(SyntaxConstants.CSharp.TagHelperPrefixKeyword))
             {
-                // There wil always be at least 1 child because of the `@` transition.
-                var directiveStart = Context.Builder.CurrentBlock.Children.First().Start;
+                var directiveStart = CurrentStart;
+                if (transition != null)
+                {
+                    // Start the error from the Transition '@'.
+                    directiveStart = new SourceLocation(
+                        directiveStart.FilePath,
+                        directiveStart.AbsoluteIndex - 1,
+                        directiveStart.LineIndex,
+                        directiveStart.CharacterIndex - 1);
+                }
                 var errorLength = /* @ */ 1 + SyntaxConstants.CSharp.TagHelperPrefixKeyword.Length;
                 duplicateDiagnostic = RazorDiagnosticFactory.CreateParsing_DuplicateDirective(
                     new SourceSpan(directiveStart, errorLength),
                     SyntaxConstants.CSharp.TagHelperPrefixKeyword);
             }
 
-            TagHelperDirective(
+            var directiveBody = ParseTagHelperDirective(
                 SyntaxConstants.CSharp.TagHelperPrefixKeyword,
-                (prefix, errors) =>
+                (prefix, errors, startLocation) =>
                 {
                     if (duplicateDiagnostic != null)
                     {
                         errors.Add(duplicateDiagnostic);
                     }
 
-                    var parsedDirective = ParseDirective(prefix, Span.Start, TagHelperDirectiveType.TagHelperPrefix, errors);
+                    var parsedDirective = ParseDirective(prefix, startLocation, TagHelperDirectiveType.TagHelperPrefix, errors);
 
                     return new TagHelperPrefixDirectiveChunkGenerator(
                         prefix,
                         parsedDirective.DirectiveText,
                         errors);
                 });
+
+            var directive = SyntaxFactory.RazorDirective(transition, directiveBody);
+            builder.Add(directive);
         }
 
-        // Internal for testing.
-        internal void ValidateTagHelperPrefix(
-            string prefix,
-            SourceLocation directiveLocation,
-            List<RazorDiagnostic> diagnostics)
+        private void ParseAddTagHelperDirective(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
         {
-            foreach (var character in prefix)
-            {
-                // Prefixes are correlated with tag names, tag names cannot have whitespace.
-                if (char.IsWhiteSpace(character) || InvalidNonWhitespaceNameCharacters.Contains(character))
+            var directiveBody = ParseTagHelperDirective(
+                SyntaxConstants.CSharp.AddTagHelperKeyword,
+                (lookupText, errors, startLocation) =>
                 {
-                    diagnostics.Add(
-                        RazorDiagnosticFactory.CreateParsing_InvalidTagHelperPrefixValue(
-                            new SourceSpan(directiveLocation, prefix.Length),
-                            SyntaxConstants.CSharp.TagHelperPrefixKeyword,
-                            character,
-                            prefix));
+                    var parsedDirective = ParseDirective(lookupText, startLocation, TagHelperDirectiveType.AddTagHelper, errors);
 
-                    return;
+                    return new AddTagHelperChunkGenerator(
+                        lookupText,
+                        parsedDirective.DirectiveText,
+                        parsedDirective.TypePattern,
+                        parsedDirective.AssemblyName,
+                        errors);
+                });
+
+            var directive = SyntaxFactory.RazorDirective(transition, directiveBody);
+            builder.Add(directive);
+        }
+
+        private void ParseRemoveTagHelperDirective(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            var directiveBody = ParseTagHelperDirective(
+                SyntaxConstants.CSharp.RemoveTagHelperKeyword,
+                (lookupText, errors, startLocation) =>
+                {
+                    var parsedDirective = ParseDirective(lookupText, startLocation, TagHelperDirectiveType.RemoveTagHelper, errors);
+
+                    return new RemoveTagHelperChunkGenerator(
+                        lookupText,
+                        parsedDirective.DirectiveText,
+                        parsedDirective.TypePattern,
+                        parsedDirective.AssemblyName,
+                        errors);
+                });
+
+            var directive = SyntaxFactory.RazorDirective(transition, directiveBody);
+            builder.Add(directive);
+        }
+
+        [Conditional("DEBUG")]
+        protected void AssertDirective(string directive)
+        {
+            Debug.Assert(CurrentToken.Kind == SyntaxKind.Identifier || CurrentToken.Kind == SyntaxKind.Keyword);
+            Debug.Assert(string.Equals(CurrentToken.Content, directive, StringComparison.Ordinal));
+        }
+
+        private RazorDirectiveBodySyntax ParseTagHelperDirective(
+            string keyword,
+            Func<string, List<RazorDiagnostic>, SourceLocation, ISpanChunkGenerator> chunkGeneratorFactory)
+        {
+            AssertDirective(keyword);
+
+            var savedErrorSink = Context.ErrorSink;
+            var directiveErrorSink = new ErrorSink();
+            RazorMetaCodeSyntax keywordBlock = null;
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            {
+                var directiveBuilder = pooledResult.Builder;
+                Context.ErrorSink = directiveErrorSink;
+
+                string directiveValue = null;
+                SourceLocation? valueStartLocation = null;
+                try
+                {
+                    EnsureDirectiveIsAtStartOfLine();
+
+                    var keywordStartLocation = CurrentStart;
+
+                    // Accept the directive name
+                    var keywordToken = EatCurrentToken();
+                    var keywordLength = keywordToken.FullWidth + 1 /* @ */;
+
+                    var foundWhitespace = At(SyntaxKind.Whitespace);
+
+                    // If we found whitespace then any content placed within the whitespace MAY cause a destructive change
+                    // to the document.  We can't accept it.
+                    var acceptedCharacters = foundWhitespace ? AcceptedCharactersInternal.None : AcceptedCharactersInternal.AnyExceptNewline;
+                    Accept(keywordToken);
+                    keywordBlock = OutputAsMetaCode(Output(), acceptedCharacters);
+
+                    AcceptWhile(SyntaxKind.Whitespace);
+                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                    SpanContext.EditHandler.AcceptedCharacters = acceptedCharacters;
+                    directiveBuilder.Add(OutputAsMarkupLiteral());
+
+                    if (EndOfFile || At(SyntaxKind.NewLine))
+                    {
+                        Context.ErrorSink.OnError(
+                            RazorDiagnosticFactory.CreateParsing_DirectiveMustHaveValue(
+                                new SourceSpan(keywordStartLocation, keywordLength), keyword));
+
+                        directiveValue = string.Empty;
+                    }
+                    else
+                    {
+                        // Need to grab the current location before we accept until the end of the line.
+                        valueStartLocation = CurrentStart;
+
+                        // Parse to the end of the line. Essentially accepts anything until end of line, comments, invalid code
+                        // etc.
+                        AcceptUntil(SyntaxKind.NewLine);
+
+                        // Pull out the value and remove whitespaces and optional quotes
+                        var rawValue = string.Concat(TokenBuilder.ToList().Nodes.Select(s => s.Content)).Trim();
+
+                        var startsWithQuote = rawValue.StartsWith("\"", StringComparison.Ordinal);
+                        var endsWithQuote = rawValue.EndsWith("\"", StringComparison.Ordinal);
+                        if (startsWithQuote != endsWithQuote)
+                        {
+                            Context.ErrorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_IncompleteQuotesAroundDirective(
+                                    new SourceSpan(valueStartLocation.Value, rawValue.Length), keyword));
+                        }
+
+                        directiveValue = rawValue;
+                    }
                 }
+                finally
+                {
+                    SpanContext.ChunkGenerator = chunkGeneratorFactory(
+                        directiveValue,
+                        directiveErrorSink.Errors.ToList(),
+                        valueStartLocation ?? CurrentStart);
+                    Context.ErrorSink = savedErrorSink;
+                }
+
+                // Finish the block and output the tokens
+                CompleteBlock();
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.AnyExceptNewline;
+
+                directiveBuilder.Add(OutputTokensAsStatementLiteral());
+                var directiveCodeBlock = SyntaxFactory.CSharpCodeBlock(directiveBuilder.ToList());
+
+                return SyntaxFactory.RazorDirectiveBody(keywordBlock, directiveCodeBlock);
             }
         }
 
@@ -1982,9 +1078,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             // Ex: @addTagHelper "*, Microsoft.AspNetCore.CoolLibrary"
             //                    ^                                 ^
             //                  Start                              End
-            if (Span.Tokens.Count == 1 && (Span.Tokens[0] as CSharpToken)?.Type == CSharpTokenType.StringLiteral)
+            if (TokenBuilder.Count == 1 &&
+                TokenBuilder[0] is SyntaxToken token &&
+                token.Kind == SyntaxKind.StringLiteral)
             {
-                offset += Span.Tokens[0].Content.IndexOf(directiveText, StringComparison.Ordinal);
+                offset += token.Content.IndexOf(directiveText, StringComparison.Ordinal);
 
                 // This is safe because inside one of these directives all of the text needs to be on the
                 // same line.
@@ -2044,122 +1142,1294 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return directive;
         }
 
-        protected virtual void AddTagHelperDirective()
+        // Internal for testing.
+        internal void ValidateTagHelperPrefix(
+            string prefix,
+            SourceLocation directiveLocation,
+            List<RazorDiagnostic> diagnostics)
         {
-            TagHelperDirective(
-                SyntaxConstants.CSharp.AddTagHelperKeyword,
-                (lookupText, errors) =>
+            foreach (var character in prefix)
+            {
+                // Prefixes are correlated with tag names, tag names cannot have whitespace.
+                if (char.IsWhiteSpace(character) || InvalidNonWhitespaceNameCharacters.Contains(character))
                 {
-                    var parsedDirective = ParseDirective(lookupText, Span.Start, TagHelperDirectiveType.AddTagHelper, errors);
+                    diagnostics.Add(
+                        RazorDiagnosticFactory.CreateParsing_InvalidTagHelperPrefixValue(
+                            new SourceSpan(directiveLocation, prefix.Length),
+                            SyntaxConstants.CSharp.TagHelperPrefixKeyword,
+                            character,
+                            prefix));
 
-                    return new AddTagHelperChunkGenerator(
-                        lookupText,
-                        parsedDirective.DirectiveText,
-                        parsedDirective.TypePattern,
-                        parsedDirective.AssemblyName,
-                        errors);
-                });
+                    return;
+                }
+            }
         }
 
-        protected virtual void RemoveTagHelperDirective()
+        private void ParseExtensibleDirective(in SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition, DirectiveDescriptor descriptor)
         {
-            TagHelperDirective(
-                SyntaxConstants.CSharp.RemoveTagHelperKeyword,
-                (lookupText, errors) =>
-                {
-                    var parsedDirective = ParseDirective(lookupText, Span.Start, TagHelperDirectiveType.RemoveTagHelper, errors);
+            AssertDirective(descriptor.Directive);
 
-                    return new RemoveTagHelperChunkGenerator(
-                        lookupText,
-                        parsedDirective.DirectiveText,
-                        parsedDirective.TypePattern,
-                        parsedDirective.AssemblyName,
-                        errors);
-                });
-        }
-
-        [Conditional("DEBUG")]
-        protected void AssertDirective(string directive)
-        {
-            Debug.Assert(CurrentToken.Type == CSharpTokenType.Identifier || CurrentToken.Type == CSharpTokenType.Keyword);
-            Debug.Assert(string.Equals(CurrentToken.Content, directive, StringComparison.Ordinal));
-        }
-
-        private void TagHelperDirective(string keyword, Func<string, List<RazorDiagnostic>, ISpanChunkGenerator> chunkGeneratorFactory)
-        {
-            AssertDirective(keyword);
-
-            var savedErrorSink = Context.ErrorSink;
             var directiveErrorSink = new ErrorSink();
+            var savedErrorSink = Context.ErrorSink;
             Context.ErrorSink = directiveErrorSink;
 
-            string directiveValue = null;
-            try
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
             {
-                EnsureDirectiveIsAtStartOfLine();
+                var directiveBuilder = pooledResult.Builder;
+                RazorMetaCodeSyntax keywordBlock = null;
 
-                var keywordStartLocation = CurrentStart;
-
-                // Accept the directive name
-                AcceptAndMoveNext();
-
-                // Set the block type
-                Context.Builder.CurrentBlock.Type = BlockKindInternal.Directive;
-
-                var keywordLength = Span.End.AbsoluteIndex - Span.Start.AbsoluteIndex;
-
-                var foundWhitespace = At(CSharpTokenType.WhiteSpace);
-
-                // If we found whitespace then any content placed within the whitespace MAY cause a destructive change
-                // to the document.  We can't accept it.
-                var acceptedCharacters = foundWhitespace ? AcceptedCharactersInternal.None : AcceptedCharactersInternal.AnyExceptNewline;
-                Output(SpanKindInternal.MetaCode, acceptedCharacters);
-
-                AcceptWhile(CSharpTokenType.WhiteSpace);
-                Span.ChunkGenerator = SpanChunkGenerator.Null;
-                Output(SpanKindInternal.Markup, acceptedCharacters);
-
-                if (EndOfFile || At(CSharpTokenType.NewLine))
+                try
                 {
-                    Context.ErrorSink.OnError(
-                        RazorDiagnosticFactory.CreateParsing_DirectiveMustHaveValue(
-                            new SourceSpan(keywordStartLocation, keywordLength), keyword));
+                    EnsureDirectiveIsAtStartOfLine();
+                    var directiveStart = CurrentStart;
+                    if (transition != null)
+                    {
+                        // Start the error from the Transition '@'.
+                        directiveStart = new SourceLocation(
+                            directiveStart.FilePath,
+                            directiveStart.AbsoluteIndex - 1,
+                            directiveStart.LineIndex,
+                            directiveStart.CharacterIndex - 1);
+                    }
 
-                    directiveValue = string.Empty;
+                    AcceptAndMoveNext();
+                    keywordBlock = OutputAsMetaCode(Output());
+
+                    // Even if an error was logged do not bail out early. If a directive was used incorrectly it doesn't mean it can't be parsed.
+                    ValidateDirectiveUsage(descriptor, directiveStart);
+
+                    for (var i = 0; i < descriptor.Tokens.Count; i++)
+                    {
+                        if (!At(SyntaxKind.Whitespace) &&
+                            !At(SyntaxKind.NewLine) &&
+                            !EndOfFile)
+                        {
+                            // This case should never happen in a real scenario. We're just being defensive.
+                            Context.ErrorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_DirectiveTokensMustBeSeparatedByWhitespace(
+                                    new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive));
+
+                            builder.Add(BuildDirective());
+                            return;
+                        }
+
+                        var tokenDescriptor = descriptor.Tokens[i];
+                        AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+
+                        if (tokenDescriptor.Kind == DirectiveTokenKind.Member ||
+                            tokenDescriptor.Kind == DirectiveTokenKind.Namespace ||
+                            tokenDescriptor.Kind == DirectiveTokenKind.Type)
+                        {
+                            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
+                            directiveBuilder.Add(OutputTokensAsStatementLiteral());
+
+                            if (EndOfFile || At(SyntaxKind.NewLine))
+                            {
+                                // Add a marker token to provide CSharp intellisense when we start typing the directive token.
+                                AcceptMarkerTokenIfNecessary();
+                                SpanContext.ChunkGenerator = new DirectiveTokenChunkGenerator(tokenDescriptor);
+                                SpanContext.EditHandler = new DirectiveTokenEditHandler(Language.TokenizeString);
+                                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.NonWhitespace;
+                                directiveBuilder.Add(OutputTokensAsStatementLiteral());
+                            }
+                        }
+                        else
+                        {
+                            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
+                            directiveBuilder.Add(OutputAsMarkupEphemeralLiteral());
+                        }
+
+                        if (tokenDescriptor.Optional && (EndOfFile || At(SyntaxKind.NewLine)))
+                        {
+                            break;
+                        }
+                        else if (EndOfFile)
+                        {
+                            Context.ErrorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_UnexpectedEOFAfterDirective(
+                                    new SourceSpan(CurrentStart, contentLength: 1),
+                                    descriptor.Directive,
+                                    tokenDescriptor.Kind.ToString().ToLowerInvariant()));
+                            builder.Add(BuildDirective());
+                            return;
+                        }
+
+                        switch (tokenDescriptor.Kind)
+                        {
+                            case DirectiveTokenKind.Type:
+                                if (!TryParseNamespaceOrTypeName(directiveBuilder))
+                                {
+                                    Context.ErrorSink.OnError(
+                                        RazorDiagnosticFactory.CreateParsing_DirectiveExpectsTypeName(
+                                            new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive));
+
+                                    builder.Add(BuildDirective());
+                                    return;
+                                }
+                                break;
+
+                            case DirectiveTokenKind.Namespace:
+                                if (!TryParseQualifiedIdentifier(out var identifierLength))
+                                {
+                                    Context.ErrorSink.OnError(
+                                        RazorDiagnosticFactory.CreateParsing_DirectiveExpectsNamespace(
+                                            new SourceSpan(CurrentStart, identifierLength), descriptor.Directive));
+
+                                    builder.Add(BuildDirective());
+                                    return;
+                                }
+                                break;
+
+                            case DirectiveTokenKind.Member:
+                                if (At(SyntaxKind.Identifier))
+                                {
+                                    AcceptAndMoveNext();
+                                }
+                                else
+                                {
+                                    Context.ErrorSink.OnError(
+                                        RazorDiagnosticFactory.CreateParsing_DirectiveExpectsIdentifier(
+                                            new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive));
+                                    builder.Add(BuildDirective());
+                                    return;
+                                }
+                                break;
+
+                            case DirectiveTokenKind.String:
+                                if (At(SyntaxKind.StringLiteral) && !CurrentToken.ContainsDiagnostics)
+                                {
+                                    AcceptAndMoveNext();
+                                }
+                                else
+                                {
+                                    Context.ErrorSink.OnError(
+                                        RazorDiagnosticFactory.CreateParsing_DirectiveExpectsQuotedStringLiteral(
+                                            new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive));
+                                    builder.Add(BuildDirective());
+                                    return;
+                                }
+                                break;
+                        }
+
+                        SpanContext.ChunkGenerator = new DirectiveTokenChunkGenerator(tokenDescriptor);
+                        SpanContext.EditHandler = new DirectiveTokenEditHandler(Language.TokenizeString);
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.NonWhitespace;
+                        directiveBuilder.Add(OutputTokensAsStatementLiteral());
+                    }
+
+                    AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+
+                    switch (descriptor.Kind)
+                    {
+                        case DirectiveKind.SingleLine:
+                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
+                            directiveBuilder.Add(OutputTokensAsUnclassifiedLiteral());
+
+                            TryAccept(SyntaxKind.Semicolon);
+                            directiveBuilder.Add(OutputAsMetaCode(Output(), AcceptedCharactersInternal.Whitespace));
+
+                            AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+
+                            if (At(SyntaxKind.NewLine))
+                            {
+                                AcceptAndMoveNext();
+                            }
+                            else if (!EndOfFile)
+                            {
+                                Context.ErrorSink.OnError(
+                                    RazorDiagnosticFactory.CreateParsing_UnexpectedDirectiveLiteral(
+                                        new SourceSpan(CurrentStart, CurrentToken.Content.Length),
+                                        descriptor.Directive,
+                                        Resources.ErrorComponent_Newline));
+                            }
+
+
+                            // This should contain the optional whitespace after the optional semicolon and the new line.
+                            // Output as Markup as we want intellisense here.
+                            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
+                            directiveBuilder.Add(OutputAsMarkupEphemeralLiteral());
+                            break;
+                        case DirectiveKind.RazorBlock:
+                            AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.AllWhitespace;
+                            directiveBuilder.Add(OutputAsMarkupLiteral());
+
+                            ParseDirectiveBlock(directiveBuilder, descriptor, parseChildren: (childBuilder, startingBraceLocation) =>
+                            {
+                                // When transitioning to the HTML parser we no longer want to act as if we're in a nested C# state.
+                                // For instance, if <div>@hello.</div> is in a nested C# block we don't want the trailing '.' to be handled
+                                // as C#; it should be handled as a period because it's wrapped in markup.
+                                var wasNested = IsNested;
+                                IsNested = false;
+
+                                using (PushSpanContextConfig())
+                                {
+                                    var razorBlock = HtmlParser.ParseRazorBlock(Tuple.Create("{", "}"), caseSensitive: true);
+                                    directiveBuilder.Add(razorBlock);
+                                }
+
+                                InitializeContext(SpanContext);
+                                IsNested = wasNested;
+                                NextToken();
+                            });
+                            break;
+                        case DirectiveKind.CodeBlock:
+                            AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.AllWhitespace;
+                            directiveBuilder.Add(OutputAsMarkupLiteral());
+
+                            ParseDirectiveBlock(directiveBuilder, descriptor, parseChildren: (childBuilder, startingBraceLocation) =>
+                            {
+                                NextToken();
+                                Balance(childBuilder, BalancingModes.NoErrorOnFailure, SyntaxKind.LeftBrace, SyntaxKind.RightBrace, startingBraceLocation);
+                                SpanContext.ChunkGenerator = new StatementChunkGenerator();
+                                var existingEditHandler = SpanContext.EditHandler;
+                                SpanContext.EditHandler = new CodeBlockEditHandler(Language.TokenizeString);
+
+                                AcceptMarkerTokenIfNecessary();
+
+                                childBuilder.Add(OutputTokensAsStatementLiteral());
+
+                                SpanContext.EditHandler = existingEditHandler;
+                            });
+                            break;
+                    }
+                }
+                finally
+                {
+                    Context.ErrorSink = savedErrorSink;
+                }
+
+                builder.Add(BuildDirective());
+
+                RazorDirectiveSyntax BuildDirective()
+                {
+                    directiveBuilder.Add(OutputTokensAsStatementLiteral());
+                    var directiveCodeBlock = SyntaxFactory.CSharpCodeBlock(directiveBuilder.ToList());
+
+                    var directiveBody = SyntaxFactory.RazorDirectiveBody(keywordBlock, directiveCodeBlock);
+                    var directive = SyntaxFactory.RazorDirective(transition, directiveBody);
+                    directive = (RazorDirectiveSyntax)directive.SetDiagnostics(directiveErrorSink.Errors.ToArray());
+                    directive = directive.WithDirectiveDescriptor(descriptor);
+                    return directive;
+                }
+            }
+        }
+
+        private void ValidateDirectiveUsage(DirectiveDescriptor descriptor, SourceLocation directiveStart)
+        {
+            if (descriptor.Usage == DirectiveUsage.FileScopedSinglyOccurring)
+            {
+                if (Context.SeenDirectives.Contains(descriptor.Directive))
+                {
+                    // There will always be at least 1 child because of the `@` transition.
+                    var errorLength = /* @ */ 1 + descriptor.Directive.Length;
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_DuplicateDirective(
+                            new SourceSpan(directiveStart, errorLength), descriptor.Directive));
+
+                    return;
+                }
+            }
+        }
+
+        // Used for parsing a qualified name like that which follows the `namespace` keyword.
+        //
+        // qualified-identifier:
+        //      identifier
+        //      qualified-identifier . identifier
+        protected bool TryParseQualifiedIdentifier(out int identifierLength)
+        {
+            var currentIdentifierLength = 0;
+            var expectingDot = false;
+            var tokens = ReadWhile(token =>
+            {
+                var type = token.Kind;
+                if ((expectingDot && type == SyntaxKind.Dot) ||
+                    (!expectingDot && type == SyntaxKind.Identifier))
+                {
+                    expectingDot = !expectingDot;
+                    return true;
+                }
+
+                if (type != SyntaxKind.Whitespace &&
+                    type != SyntaxKind.NewLine)
+                {
+                    expectingDot = false;
+                    currentIdentifierLength += token.Content.Length;
+                }
+
+                return false;
+            });
+
+            identifierLength = currentIdentifierLength;
+            var validQualifiedIdentifier = expectingDot;
+            if (validQualifiedIdentifier)
+            {
+                foreach (var token in tokens)
+                {
+                    identifierLength += token.Content.Length;
+                    Accept(token);
+                }
+
+                return true;
+            }
+            else
+            {
+                PutCurrentBack();
+
+                foreach (var token in tokens)
+                {
+                    identifierLength += token.Content.Length;
+                    PutBack(token);
+                }
+
+                EnsureCurrent();
+                return false;
+            }
+        }
+
+        private void ParseDirectiveBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, DirectiveDescriptor descriptor, Action<SyntaxListBuilder<RazorSyntaxNode>, SourceLocation> parseChildren)
+        {
+            if (EndOfFile)
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_UnexpectedEOFAfterDirective(
+                        new SourceSpan(CurrentStart, contentLength: 1 /* { */), descriptor.Directive, "{"));
+            }
+            else if (!At(SyntaxKind.LeftBrace))
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_UnexpectedDirectiveLiteral(
+                        new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive, "{"));
+            }
+            else
+            {
+                var editHandler = new AutoCompleteEditHandler(Language.TokenizeString, autoCompleteAtEndOfSpan: true);
+                SpanContext.EditHandler = editHandler;
+                var startingBraceLocation = CurrentStart;
+                Accept(CurrentToken);
+                builder.Add(OutputAsMetaCode(Output()));
+
+                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                {
+                    var childBuilder = pooledResult.Builder;
+                    parseChildren(childBuilder, startingBraceLocation);
+                    if (childBuilder.Count > 0)
+                    {
+                        builder.Add(SyntaxFactory.CSharpCodeBlock(childBuilder.ToList()));
+                    }
+                }
+
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                if (!TryAccept(SyntaxKind.RightBrace))
+                {
+                    editHandler.AutoCompleteString = "}";
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_ExpectedEndOfBlockBeforeEOF(
+                            new SourceSpan(startingBraceLocation, contentLength: 1 /* } */), descriptor.Directive, "}", "{"));
+
+                    Accept(SyntaxFactory.MissingToken(SyntaxKind.RightBrace));
                 }
                 else
                 {
-                    // Need to grab the current location before we accept until the end of the line.
-                    var startLocation = CurrentStart;
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                }
+                CompleteBlock(insertMarkerIfNecessary: false, captureWhitespaceToEndOfLine: true);
+                builder.Add(OutputAsMetaCode(Output(), SpanContext.EditHandler.AcceptedCharacters));
+            }
+        }
 
-                    // Parse to the end of the line. Essentially accepts anything until end of line, comments, invalid code
-                    // etc.
-                    AcceptUntil(CSharpTokenType.NewLine);
+        private bool TryParseKeyword(in SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            var result = CSharpTokenizer.GetTokenKeyword(CurrentToken);
+            Debug.Assert(CurrentToken.Kind == SyntaxKind.Keyword && result.HasValue);
+            if (_keywordParserMap.TryGetValue(result.Value, out var handler))
+            {
+                handler(builder, transition);
+                return true;
+            }
 
-                    // Pull out the value and remove whitespaces and optional quotes
-                    var rawValue = string.Concat(Span.Tokens.Select(s => s.Content)).Trim();
+            return false;
+        }
 
-                    var startsWithQuote = rawValue.StartsWith("\"", StringComparison.Ordinal);
-                    var endsWithQuote = rawValue.EndsWith("\"", StringComparison.Ordinal);
-                    if (startsWithQuote != endsWithQuote)
-                    {
-                        Context.ErrorSink.OnError(
-                            RazorDiagnosticFactory.CreateParsing_IncompleteQuotesAroundDirective(
-                                new SourceSpan(startLocation, rawValue.Length), keyword));
-                    }
+        private void SetupExpressionParsers()
+        {
+            MapExpressionKeyword(ParseAwaitExpression, CSharpKeyword.Await);
+        }
 
-                    directiveValue = rawValue;
+        private void SetupKeywordParsers()
+        {
+            MapKeywords(
+                ParseConditionalBlock,
+                CSharpKeyword.For,
+                CSharpKeyword.Foreach,
+                CSharpKeyword.While,
+                CSharpKeyword.Switch,
+                CSharpKeyword.Lock);
+            MapKeywords(ParseCaseStatement, false, CSharpKeyword.Case, CSharpKeyword.Default);
+            MapKeywords(ParseIfStatement, CSharpKeyword.If);
+            MapKeywords(ParseTryStatement, CSharpKeyword.Try);
+            MapKeywords(ParseDoStatement, CSharpKeyword.Do);
+            MapKeywords(ParseUsingKeyword, CSharpKeyword.Using);
+            MapKeywords(ParseReservedDirective, CSharpKeyword.Class, CSharpKeyword.Namespace);
+        }
+
+        private void MapExpressionKeyword(Action<SyntaxListBuilder<RazorSyntaxNode>, CSharpTransitionSyntax> handler, CSharpKeyword keyword)
+        {
+            _keywordParserMap.Add(keyword, handler);
+
+            // Expression keywords don't belong in the regular keyword list
+        }
+
+        private void MapKeywords(Action<SyntaxListBuilder<RazorSyntaxNode>, CSharpTransitionSyntax> handler, params CSharpKeyword[] keywords)
+        {
+            MapKeywords(handler, topLevel: true, keywords: keywords);
+        }
+
+        private void MapKeywords(Action<SyntaxListBuilder<RazorSyntaxNode>, CSharpTransitionSyntax> handler, bool topLevel, params CSharpKeyword[] keywords)
+        {
+            foreach (var keyword in keywords)
+            {
+                _keywordParserMap.Add(keyword, handler);
+                if (topLevel)
+                {
+                    Keywords.Add(CSharpLanguageCharacteristics.GetKeyword(keyword));
                 }
             }
-            finally
+        }
+
+        private void ParseAwaitExpression(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            // Ensure that we're on the await statement (only runs in debug)
+            Assert(CSharpKeyword.Await);
+
+            // Accept the "await" and move on
+            AcceptAndMoveNext();
+
+            // Accept 1 or more spaces between the await and the following code.
+            AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+
+            // Top level basically indicates if we're within an expression or statement.
+            // Ex: topLevel true = @await Foo()  |  topLevel false = @{ await Foo(); }
+            // Note that in this case @{ <b>@await Foo()</b> } top level is true for await.
+            // Therefore, if we're top level then we want to act like an implicit expression,
+            // otherwise just act as whatever we're contained in.
+            var topLevel = transition != null;
+            if (topLevel)
             {
-                Span.ChunkGenerator = chunkGeneratorFactory(directiveValue, directiveErrorSink.Errors.ToList());
-                Context.ErrorSink = savedErrorSink;
+                // Setup the Span to be an async implicit expression (an implicit expresison that allows spaces).
+                // Spaces are allowed because of "@await Foo()".
+                var implicitExpressionBody = ParseImplicitExpressionBody(async: true);
+                builder.Add(SyntaxFactory.CSharpImplicitExpression(transition, implicitExpressionBody));
+            }
+        }
+
+        private void ParseConditionalBlock(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            var topLevel = transition != null;
+            ParseConditionalBlock(builder, transition, topLevel);
+        }
+
+        private void ParseConditionalBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition, bool topLevel)
+        {
+            Assert(SyntaxKind.Keyword);
+            if (transition != null)
+            {
+                builder.Add(transition);
             }
 
-            // Output the span and finish the block
+            var block = new Block(CurrentToken, CurrentStart);
+            ParseConditionalBlock(builder, block);
+            if (topLevel)
+            {
+                CompleteBlock();
+            }
+        }
+
+        private void ParseConditionalBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Block block)
+        {
+            AcceptAndMoveNext();
+            AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+
+            // Parse the condition, if present (if not present, we'll let the C# compiler complain)
+            if (TryParseCondition(builder))
+            {
+                AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+
+                ParseExpectedCodeBlock(builder, block);
+            }
+        }
+
+        private bool TryParseCondition(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            if (At(SyntaxKind.LeftParenthesis))
+            {
+                var complete = Balance(builder, BalancingModes.BacktrackOnFailure | BalancingModes.AllowCommentsAndTemplates);
+                if (!complete)
+                {
+                    AcceptUntil(SyntaxKind.NewLine);
+                }
+                else
+                {
+                    TryAccept(SyntaxKind.RightParenthesis);
+                }
+                return complete;
+            }
+            return true;
+        }
+
+        private void ParseExpectedCodeBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Block block)
+        {
+            if (!EndOfFile)
+            {
+                // Check for "{" to make sure we're at a block
+                if (!At(SyntaxKind.LeftBrace))
+                {
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_SingleLineControlFlowStatementsNotAllowed(
+                            new SourceSpan(CurrentStart, CurrentToken.Content.Length),
+                            Language.GetSample(SyntaxKind.LeftBrace),
+                            CurrentToken.Content));
+                }
+
+                // Parse the statement and then we're done
+                ParseStatement(builder, block);
+            }
+        }
+
+        private void ParseUnconditionalBlock(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            Assert(SyntaxKind.Keyword);
+            var block = new Block(CurrentToken, CurrentStart);
+            AcceptAndMoveNext();
+            AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+            ParseExpectedCodeBlock(builder, block);
+        }
+
+        private void ParseCaseStatement(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            Assert(SyntaxKind.Keyword);
+            if (transition != null)
+            {
+                // Normally, case statement won't start with a transition in a valid scenario.
+                // If it does, just accept it and let the compiler complain.
+                builder.Add(transition);
+            }
+            var result = CSharpTokenizer.GetTokenKeyword(CurrentToken);
+            Debug.Assert(result.HasValue &&
+                         (result.Value == CSharpKeyword.Case ||
+                          result.Value == CSharpKeyword.Default));
+            AcceptUntil(SyntaxKind.Colon);
+            TryAccept(SyntaxKind.Colon);
+        }
+
+        private void ParseIfStatement(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            Assert(CSharpKeyword.If);
+            ParseConditionalBlock(builder, transition, topLevel: false);
+            ParseAfterIfClause(builder);
+            var topLevel = transition != null;
+            if (topLevel)
+            {
+                CompleteBlock();
+            }
+        }
+
+        private void ParseAfterIfClause(SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // Grab whitespace and razor comments
+            var whitespace = SkipToNextImportantToken(builder);
+
+            // Check for an else part
+            if (At(CSharpKeyword.Else))
+            {
+                Accept(whitespace);
+                Assert(CSharpKeyword.Else);
+                ParseElseClause(builder);
+            }
+            else
+            {
+                // No else, return whitespace
+                PutCurrentBack();
+                PutBack(whitespace);
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+            }
+        }
+
+        private void ParseElseClause(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            if (!At(CSharpKeyword.Else))
+            {
+                return;
+            }
+            var block = new Block(CurrentToken, CurrentStart);
+
+            AcceptAndMoveNext();
+            AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+            if (At(CSharpKeyword.If))
+            {
+                // ElseIf
+                block.Name = SyntaxConstants.CSharp.ElseIfKeyword;
+                ParseConditionalBlock(builder, block);
+                ParseAfterIfClause(builder);
+            }
+            else if (!EndOfFile)
+            {
+                // Else
+                ParseExpectedCodeBlock(builder, block);
+            }
+        }
+
+        private void ParseTryStatement(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            Assert(CSharpKeyword.Try);
+            var topLevel = transition != null;
+            if (topLevel)
+            {
+                builder.Add(transition);
+            }
+
+            ParseUnconditionalBlock(builder);
+            ParseAfterTryClause(builder);
+            if (topLevel)
+            {
+                CompleteBlock();
+            }
+        }
+
+        private void ParseAfterTryClause(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // Grab whitespace
+            var whitespace = SkipToNextImportantToken(builder);
+
+            // Check for a catch or finally part
+            if (At(CSharpKeyword.Catch))
+            {
+                Accept(whitespace);
+                Assert(CSharpKeyword.Catch);
+                ParseFilterableCatchBlock(builder);
+                ParseAfterTryClause(builder);
+            }
+            else if (At(CSharpKeyword.Finally))
+            {
+                Accept(whitespace);
+                Assert(CSharpKeyword.Finally);
+                ParseUnconditionalBlock(builder);
+            }
+            else
+            {
+                // Return whitespace and end the block
+                PutCurrentBack();
+                PutBack(whitespace);
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+            }
+        }
+
+        private void ParseFilterableCatchBlock(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            Assert(CSharpKeyword.Catch);
+
+            var block = new Block(CurrentToken, CurrentStart);
+
+            // Accept "catch"
+            AcceptAndMoveNext();
+            AcceptWhile(IsValidStatementSpacingToken);
+
+            // Parse the catch condition if present. If not present, let the C# compiler complain.
+            if (TryParseCondition(builder))
+            {
+                AcceptWhile(IsValidStatementSpacingToken);
+
+                if (At(CSharpKeyword.When))
+                {
+                    // Accept "when".
+                    AcceptAndMoveNext();
+                    AcceptWhile(IsValidStatementSpacingToken);
+
+                    // Parse the filter condition if present. If not present, let the C# compiler complain.
+                    if (!TryParseCondition(builder))
+                    {
+                        // Incomplete condition.
+                        return;
+                    }
+
+                    AcceptWhile(IsValidStatementSpacingToken);
+                }
+
+                ParseExpectedCodeBlock(builder, block);
+            }
+        }
+
+        private void ParseDoStatement(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            Assert(CSharpKeyword.Do);
+            if (transition != null)
+            {
+                builder.Add(transition);
+            }
+
+            ParseUnconditionalBlock(builder);
+            ParseWhileClause(builder);
+            var topLevel = transition != null;
+            if (topLevel)
+            {
+                CompleteBlock();
+            }
+        }
+
+        private void ParseWhileClause(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+            var whitespace = SkipToNextImportantToken(builder);
+
+            if (At(CSharpKeyword.While))
+            {
+                Accept(whitespace);
+                Assert(CSharpKeyword.While);
+                AcceptAndMoveNext();
+                AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                if (TryParseCondition(builder) && TryAccept(SyntaxKind.Semicolon))
+                {
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                }
+            }
+            else
+            {
+                PutCurrentBack();
+                PutBack(whitespace);
+            }
+        }
+
+        private void ParseUsingKeyword(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            Assert(CSharpKeyword.Using);
+            var topLevel = transition != null;
+            var block = new Block(CurrentToken, CurrentStart);
+            var usingToken = EatCurrentToken();
+            var whitespaceOrComments = ReadWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+            var atLeftParen = At(SyntaxKind.LeftParenthesis);
+            var atIdentifier = At(SyntaxKind.Identifier);
+            var atStatic = At(CSharpKeyword.Static);
+
+            // Put the read tokens back and let them be handled later.
+            PutCurrentBack();
+            PutBack(whitespaceOrComments);
+            PutBack(usingToken);
+            EnsureCurrent();
+
+            if (atLeftParen)
+            {
+                // using ( ==> Using Statement
+                ParseUsingStatement(builder, transition, block);
+            }
+            else if (atIdentifier || atStatic)
+            {
+                // using Identifier ==> Using Declaration
+                if (!topLevel)
+                {
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_NamespaceImportAndTypeAliasCannotExistWithinCodeBlock(
+                            new SourceSpan(block.Start, block.Name.Length)));
+                    if (transition != null)
+                    {
+                        builder.Add(transition);
+                    }
+                    AcceptAndMoveNext();
+                    AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+                    ParseStandardStatement(builder);
+                }
+                else
+                {
+                    ParseUsingDeclaration(builder, transition);
+                    return;
+                }
+            }
+            else
+            {
+                AcceptAndMoveNext();
+                AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+            }
+
+            if (topLevel)
+            {
+                CompleteBlock();
+            }
+        }
+
+        private void ParseUsingStatement(in SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition, Block block)
+        {
+            Assert(CSharpKeyword.Using);
+            AcceptAndMoveNext();
+            AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+
+            Assert(SyntaxKind.LeftParenthesis);
+            if (transition != null)
+            {
+                builder.Add(transition);
+            }
+
+            // Parse condition
+            if (TryParseCondition(builder))
+            {
+                AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+
+                // Parse code block
+                ParseExpectedCodeBlock(builder, block);
+            }
+        }
+
+        private void ParseUsingDeclaration(in SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            // Using declarations should always be top level. The error case is handled in a different code path.
+            Debug.Assert(transition != null);
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            {
+                var directiveBuilder = pooledResult.Builder;
+                Assert(CSharpKeyword.Using);
+                AcceptAndMoveNext();
+                AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+                var start = CurrentStart;
+                if (At(SyntaxKind.Identifier))
+                {
+                    // non-static using
+                    TryParseNamespaceOrTypeName(directiveBuilder);
+                    var whitespace = ReadWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                    if (At(SyntaxKind.Assign))
+                    {
+                        // Alias
+                        Accept(whitespace);
+                        Assert(SyntaxKind.Assign);
+                        AcceptAndMoveNext();
+
+                        AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+
+                        // One more namespace or type name
+                        TryParseNamespaceOrTypeName(directiveBuilder);
+                    }
+                    else
+                    {
+                        PutCurrentBack();
+                        PutBack(whitespace);
+                    }
+                }
+                else if (At(CSharpKeyword.Static))
+                {
+                    // static using
+                    AcceptAndMoveNext();
+                    AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true));
+                    TryParseNamespaceOrTypeName(directiveBuilder);
+                }
+
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.AnyExceptNewline;
+                SpanContext.ChunkGenerator = new AddImportChunkGenerator(new LocationTagged<string>(
+                    string.Concat(TokenBuilder.ToList().Nodes.Skip(1).Select(s => s.Content)),
+                    start));
+
+                // Optional ";"
+                if (EnsureCurrent())
+                {
+                    TryAccept(SyntaxKind.Semicolon);
+                }
+
+                CompleteBlock();
+                Debug.Assert(directiveBuilder.Count == 0, "We should not have built any blocks so far.");
+                var keywordTokens = OutputTokensAsStatementLiteral();
+                var directiveBody = SyntaxFactory.RazorDirectiveBody(keywordTokens, null);
+                builder.Add(SyntaxFactory.RazorDirective(transition, directiveBody));
+            }
+        }
+
+        private bool TryParseNamespaceOrTypeName(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            if (TryAccept(SyntaxKind.LeftParenthesis))
+            {
+                while (!TryAccept(SyntaxKind.RightParenthesis) && !EndOfFile)
+                {
+                    TryAccept(SyntaxKind.Whitespace);
+
+                    if (!TryParseNamespaceOrTypeName(builder))
+                    {
+                        return false;
+                    }
+
+                    TryAccept(SyntaxKind.Whitespace);
+                    TryAccept(SyntaxKind.Identifier);
+                    TryAccept(SyntaxKind.Whitespace);
+                    TryAccept(SyntaxKind.Comma);
+                }
+
+                if (At(SyntaxKind.Whitespace) && NextIs(SyntaxKind.QuestionMark))
+                {
+                    // Only accept the whitespace if we are going to consume the next token.
+                    AcceptAndMoveNext();
+                }
+
+                TryAccept(SyntaxKind.QuestionMark); // Nullable
+
+                return true;
+            }
+            else if (TryAccept(SyntaxKind.Identifier) || TryAccept(SyntaxKind.Keyword))
+            {
+                if (TryAccept(SyntaxKind.DoubleColon))
+                {
+                    if (!TryAccept(SyntaxKind.Identifier))
+                    {
+                        TryAccept(SyntaxKind.Keyword);
+                    }
+                }
+                if (At(SyntaxKind.LessThan))
+                {
+                    ParseTypeArgumentList(builder);
+                }
+                if (TryAccept(SyntaxKind.Dot))
+                {
+                    TryParseNamespaceOrTypeName(builder);
+                }
+
+                if (At(SyntaxKind.Whitespace) && NextIs(SyntaxKind.QuestionMark))
+                {
+                    // Only accept the whitespace if we are going to consume the next token.
+                    AcceptAndMoveNext();
+                }
+
+                TryAccept(SyntaxKind.QuestionMark); // Nullable
+
+                if (At(SyntaxKind.Whitespace) && NextIs(SyntaxKind.LeftBracket))
+                {
+                    // Only accept the whitespace if we are going to consume the next token.
+                    AcceptAndMoveNext();
+                }
+
+                while (At(SyntaxKind.LeftBracket))
+                {
+                    Balance(builder, BalancingModes.None);
+                    if (!TryAccept(SyntaxKind.RightBracket))
+                    {
+                        Accept(SyntaxFactory.MissingToken(SyntaxKind.RightBracket));
+                    }
+                }
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        private void ParseTypeArgumentList(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            Assert(SyntaxKind.LessThan);
+            Balance(builder, BalancingModes.None);
+            if (!TryAccept(SyntaxKind.GreaterThan))
+            {
+                Accept(SyntaxFactory.MissingToken(SyntaxKind.GreaterThan));
+            }
+        }
+
+        private void ParseReservedDirective(SyntaxListBuilder<RazorSyntaxNode> builder, CSharpTransitionSyntax transition)
+        {
+            Context.ErrorSink.OnError(
+                RazorDiagnosticFactory.CreateParsing_ReservedWord(
+                    new SourceSpan(CurrentStart, CurrentToken.Content.Length), CurrentToken.Content));
+
+            AcceptAndMoveNext();
+            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
             CompleteBlock();
-            Output(SpanKindInternal.Code, AcceptedCharactersInternal.AnyExceptNewline);
+            var keyword = OutputAsMetaCode(Output());
+            var directiveBody = SyntaxFactory.RazorDirectiveBody(keyword, cSharpCode: null);
+            var directive = SyntaxFactory.RazorDirective(transition, directiveBody);
+            builder.Add(directive);
+        }
+
+        protected void CompleteBlock()
+        {
+            CompleteBlock(insertMarkerIfNecessary: true);
+        }
+
+        protected void CompleteBlock(bool insertMarkerIfNecessary)
+        {
+            CompleteBlock(insertMarkerIfNecessary, captureWhitespaceToEndOfLine: insertMarkerIfNecessary);
+        }
+
+        protected void CompleteBlock(bool insertMarkerIfNecessary, bool captureWhitespaceToEndOfLine)
+        {
+            if (insertMarkerIfNecessary && Context.LastAcceptedCharacters != AcceptedCharactersInternal.Any)
+            {
+                AcceptMarkerTokenIfNecessary();
+            }
+
+            EnsureCurrent();
+
+            // Read whitespace, but not newlines
+            // If we're not inserting a marker span, we don't need to capture whitespace
+            if (!Context.WhiteSpaceIsSignificantToAncestorBlock &&
+                captureWhitespaceToEndOfLine &&
+                !Context.DesignTimeMode &&
+                !IsNested)
+            {
+                var whitespace = ReadWhile(token => token.Kind == SyntaxKind.Whitespace);
+                if (At(SyntaxKind.NewLine))
+                {
+                    Accept(whitespace);
+                    AcceptAndMoveNext();
+                    PutCurrentBack();
+                }
+                else
+                {
+                    PutCurrentBack();
+                    PutBack(whitespace);
+                }
+            }
+            else
+            {
+                PutCurrentBack();
+            }
+        }
+
+        private IEnumerable<SyntaxToken> SkipToNextImportantToken(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            while (!EndOfFile)
+            {
+                var whitespace = ReadWhile(IsSpacingToken(includeNewLines: true, includeComments: true));
+                if (At(SyntaxKind.RazorCommentTransition))
+                {
+                    Accept(whitespace);
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+                    AcceptMarkerTokenIfNecessary();
+                    builder.Add(OutputTokensAsStatementLiteral());
+                    var comment = ParseRazorComment();
+                    builder.Add(comment);
+                }
+                else
+                {
+                    return whitespace;
+                }
+            }
+            return Enumerable.Empty<SyntaxToken>();
+        }
+
+        private void DefaultSpanContextConfig(SpanContextBuilder spanContext)
+        {
+            spanContext.EditHandler = SpanEditHandler.CreateDefault(Language.TokenizeString);
+            spanContext.ChunkGenerator = new StatementChunkGenerator();
+        }
+
+        private void ExplicitExpressionSpanContextConfig(SpanContextBuilder spanContext)
+        {
+            spanContext.EditHandler = SpanEditHandler.CreateDefault(Language.TokenizeString);
+            spanContext.ChunkGenerator = new ExpressionChunkGenerator();
+        }
+
+        private CSharpStatementLiteralSyntax OutputTokensAsStatementLiteral()
+        {
+            var tokens = Output();
+            if (tokens.Count == 0)
+            {
+                return null;
+            }
+
+            return GetNodeWithSpanContext(SyntaxFactory.CSharpStatementLiteral(tokens));
+        }
+
+        private CSharpExpressionLiteralSyntax OutputTokensAsExpressionLiteral()
+        {
+            var tokens = Output();
+            if (tokens.Count == 0)
+            {
+                return null;
+            }
+
+            return GetNodeWithSpanContext(SyntaxFactory.CSharpExpressionLiteral(tokens));
+        }
+
+        private CSharpEphemeralTextLiteralSyntax OutputTokensAsEphemeralLiteral()
+        {
+            var tokens = Output();
+            if (tokens.Count == 0)
+            {
+                return null;
+            }
+
+            return GetNodeWithSpanContext(SyntaxFactory.CSharpEphemeralTextLiteral(tokens));
+        }
+
+        private UnclassifiedTextLiteralSyntax OutputTokensAsUnclassifiedLiteral()
+        {
+            var tokens = Output();
+            if (tokens.Count == 0)
+            {
+                return null;
+            }
+
+
+            return GetNodeWithSpanContext(SyntaxFactory.UnclassifiedTextLiteral(tokens));
+        }
+
+        private void OtherParserBlock(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // When transitioning to the HTML parser we no longer want to act as if we're in a nested C# state.
+            // For instance, if <div>@hello.</div> is in a nested C# block we don't want the trailing '.' to be handled
+            // as C#; it should be handled as a period because it's wrapped in markup.
+            var wasNested = IsNested;
+            IsNested = false;
+
+            RazorSyntaxNode htmlBlock = null;
+            using (PushSpanContextConfig())
+            {
+                htmlBlock = HtmlParser.ParseBlock();
+            }
+
+            builder.Add(htmlBlock);
+            InitializeContext(SpanContext);
+
+            IsNested = wasNested;
+            NextToken();
+        }
+
+        private bool Balance(SyntaxListBuilder<RazorSyntaxNode> builder, BalancingModes mode)
+        {
+            var left = CurrentToken.Kind;
+            var right = Language.FlipBracket(left);
+            var start = CurrentStart;
+            AcceptAndMoveNext();
+            if (EndOfFile && ((mode & BalancingModes.NoErrorOnFailure) != BalancingModes.NoErrorOnFailure))
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_ExpectedCloseBracketBeforeEOF(
+                        new SourceSpan(start, contentLength: 1 /* { OR } */),
+                        Language.GetSample(left),
+                        Language.GetSample(right)));
+            }
+
+            return Balance(builder, mode, left, right, start);
+        }
+
+        private bool Balance(SyntaxListBuilder<RazorSyntaxNode> builder, BalancingModes mode, SyntaxKind left, SyntaxKind right, SourceLocation start)
+        {
+            var startPosition = CurrentStart.AbsoluteIndex;
+            var nesting = 1;
+            if (!EndOfFile)
+            {
+                var tokens = new List<SyntaxToken>();
+                do
+                {
+                    if (IsAtEmbeddedTransition(
+                        (mode & BalancingModes.AllowCommentsAndTemplates) == BalancingModes.AllowCommentsAndTemplates,
+                        (mode & BalancingModes.AllowEmbeddedTransitions) == BalancingModes.AllowEmbeddedTransitions))
+                    {
+                        Accept(tokens);
+                        tokens.Clear();
+                        ParseEmbeddedTransition(builder);
+
+                        // Reset backtracking since we've already outputted some spans.
+                        startPosition = CurrentStart.AbsoluteIndex;
+                    }
+                    if (At(left))
+                    {
+                        nesting++;
+                    }
+                    else if (At(right))
+                    {
+                        nesting--;
+                    }
+                    if (nesting > 0)
+                    {
+                        tokens.Add(CurrentToken);
+                    }
+                }
+                while (nesting > 0 && NextToken());
+
+                if (nesting > 0)
+                {
+                    if ((mode & BalancingModes.NoErrorOnFailure) != BalancingModes.NoErrorOnFailure)
+                    {
+                        Context.ErrorSink.OnError(
+                            RazorDiagnosticFactory.CreateParsing_ExpectedCloseBracketBeforeEOF(
+                                new SourceSpan(start, contentLength: 1 /* { OR } */),
+                                Language.GetSample(left),
+                                Language.GetSample(right)));
+                    }
+                    if ((mode & BalancingModes.BacktrackOnFailure) == BalancingModes.BacktrackOnFailure)
+                    {
+                        Context.Source.Position = startPosition;
+                        NextToken();
+                    }
+                    else
+                    {
+                        Accept(tokens);
+                    }
+                }
+                else
+                {
+                    // Accept all the tokens we saw
+                    Accept(tokens);
+                }
+            }
+            return nesting == 0;
+        }
+
+        private bool IsAtEmbeddedTransition(bool allowTemplatesAndComments, bool allowTransitions)
+        {
+            // No embedded transitions in C#, so ignore that param
+            return allowTemplatesAndComments
+                   && ((Language.IsTransition(CurrentToken)
+                        && NextIs(SyntaxKind.LessThan, SyntaxKind.Colon, SyntaxKind.DoubleColon))
+                       || Language.IsCommentStart(CurrentToken));
+        }
+
+        private void ParseEmbeddedTransition(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            if (Language.IsTransition(CurrentToken))
+            {
+                PutCurrentBack();
+                ParseTemplate(builder);
+            }
+            else if (Language.IsCommentStart(CurrentToken))
+            {
+                // Output tokens before parsing the comment.
+                AcceptMarkerTokenIfNecessary();
+                if (SpanContext.ChunkGenerator is ExpressionChunkGenerator)
+                {
+                    builder.Add(OutputTokensAsExpressionLiteral());
+                }
+                else
+                {
+                    builder.Add(OutputTokensAsStatementLiteral());
+                }
+
+                var comment = ParseRazorComment();
+                builder.Add(comment);
+            }
+        }
+
+        [Conditional("DEBUG")]
+        internal void Assert(CSharpKeyword expectedKeyword)
+        {
+            var result = CSharpTokenizer.GetTokenKeyword(CurrentToken);
+            Debug.Assert(CurrentToken.Kind == SyntaxKind.Keyword &&
+                result.HasValue &&
+                result.Value == expectedKeyword);
+        }
+
+        protected internal bool At(CSharpKeyword keyword)
+        {
+            var result = CSharpTokenizer.GetTokenKeyword(CurrentToken);
+            return At(SyntaxKind.Keyword) &&
+                result.HasValue &&
+                result.Value == keyword;
+        }
+
+        protected static Func<SyntaxToken, bool> IsSpacingToken(bool includeNewLines, bool includeComments)
+        {
+            return token => token.Kind == SyntaxKind.Whitespace ||
+                          (includeNewLines && token.Kind == SyntaxKind.NewLine) ||
+                          (includeComments && token.Kind == SyntaxKind.CSharpComment);
         }
 
         protected class Block
@@ -2170,7 +2440,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 Start = start;
             }
 
-            public Block(CSharpToken token, SourceLocation start)
+            public Block(SyntaxToken token, SourceLocation start)
                 : this(GetName(token), start)
             {
             }
@@ -2178,11 +2448,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             public string Name { get; set; }
             public SourceLocation Start { get; set; }
 
-            private static string GetName(CSharpToken token)
+            private static string GetName(SyntaxToken token)
             {
-                if (token.Type == CSharpTokenType.Keyword)
+                var result = CSharpTokenizer.GetTokenKeyword(token);
+                if (result.HasValue && token.Kind == SyntaxKind.Keyword)
                 {
-                    return CSharpLanguageCharacteristics.GetKeyword(token.Keyword.Value);
+                    return CSharpLanguageCharacteristics.GetKeyword(result.Value);
                 }
                 return token.Content;
             }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpLanguageCharacteristics.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpLanguageCharacteristics.cs
index 70d4bfeda1..3a017b54de 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpLanguageCharacteristics.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpLanguageCharacteristics.cs
@@ -3,64 +3,65 @@
 
 using System.Collections.Generic;
 using System.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
-    internal class CSharpLanguageCharacteristics : LanguageCharacteristics<CSharpTokenizer, CSharpToken, CSharpTokenType>
+    internal class CSharpLanguageCharacteristics : LanguageCharacteristics<CSharpTokenizer>
     {
         private static readonly CSharpLanguageCharacteristics _instance = new CSharpLanguageCharacteristics();
 
-        private static Dictionary<CSharpTokenType, string> _tokenSamples = new Dictionary<CSharpTokenType, string>()
+        private static Dictionary<SyntaxKind, string> _tokenSamples = new Dictionary<SyntaxKind, string>()
         {
-            { CSharpTokenType.Arrow, "->" },
-            { CSharpTokenType.Minus, "-" },
-            { CSharpTokenType.Decrement, "--" },
-            { CSharpTokenType.MinusAssign, "-=" },
-            { CSharpTokenType.NotEqual, "!=" },
-            { CSharpTokenType.Not, "!" },
-            { CSharpTokenType.Modulo, "%" },
-            { CSharpTokenType.ModuloAssign, "%=" },
-            { CSharpTokenType.AndAssign, "&=" },
-            { CSharpTokenType.And, "&" },
-            { CSharpTokenType.DoubleAnd, "&&" },
-            { CSharpTokenType.LeftParenthesis, "(" },
-            { CSharpTokenType.RightParenthesis, ")" },
-            { CSharpTokenType.Star, "*" },
-            { CSharpTokenType.MultiplyAssign, "*=" },
-            { CSharpTokenType.Comma, "," },
-            { CSharpTokenType.Dot, "." },
-            { CSharpTokenType.Slash, "/" },
-            { CSharpTokenType.DivideAssign, "/=" },
-            { CSharpTokenType.DoubleColon, "::" },
-            { CSharpTokenType.Colon, ":" },
-            { CSharpTokenType.Semicolon, ";" },
-            { CSharpTokenType.QuestionMark, "?" },
-            { CSharpTokenType.NullCoalesce, "??" },
-            { CSharpTokenType.RightBracket, "]" },
-            { CSharpTokenType.LeftBracket, "[" },
-            { CSharpTokenType.XorAssign, "^=" },
-            { CSharpTokenType.Xor, "^" },
-            { CSharpTokenType.LeftBrace, "{" },
-            { CSharpTokenType.OrAssign, "|=" },
-            { CSharpTokenType.DoubleOr, "||" },
-            { CSharpTokenType.Or, "|" },
-            { CSharpTokenType.RightBrace, "}" },
-            { CSharpTokenType.Tilde, "~" },
-            { CSharpTokenType.Plus, "+" },
-            { CSharpTokenType.PlusAssign, "+=" },
-            { CSharpTokenType.Increment, "++" },
-            { CSharpTokenType.LessThan, "<" },
-            { CSharpTokenType.LessThanEqual, "<=" },
-            { CSharpTokenType.LeftShift, "<<" },
-            { CSharpTokenType.LeftShiftAssign, "<<=" },
-            { CSharpTokenType.Assign, "=" },
-            { CSharpTokenType.Equals, "==" },
-            { CSharpTokenType.GreaterThan, ">" },
-            { CSharpTokenType.GreaterThanEqual, ">=" },
-            { CSharpTokenType.RightShift, ">>" },
-            { CSharpTokenType.RightShiftAssign, ">>=" },
-            { CSharpTokenType.Hash, "#" },
-            { CSharpTokenType.Transition, "@" },
+            { SyntaxKind.Arrow, "->" },
+            { SyntaxKind.Minus, "-" },
+            { SyntaxKind.Decrement, "--" },
+            { SyntaxKind.MinusAssign, "-=" },
+            { SyntaxKind.NotEqual, "!=" },
+            { SyntaxKind.Not, "!" },
+            { SyntaxKind.Modulo, "%" },
+            { SyntaxKind.ModuloAssign, "%=" },
+            { SyntaxKind.AndAssign, "&=" },
+            { SyntaxKind.And, "&" },
+            { SyntaxKind.DoubleAnd, "&&" },
+            { SyntaxKind.LeftParenthesis, "(" },
+            { SyntaxKind.RightParenthesis, ")" },
+            { SyntaxKind.Star, "*" },
+            { SyntaxKind.MultiplyAssign, "*=" },
+            { SyntaxKind.Comma, "," },
+            { SyntaxKind.Dot, "." },
+            { SyntaxKind.Slash, "/" },
+            { SyntaxKind.DivideAssign, "/=" },
+            { SyntaxKind.DoubleColon, "::" },
+            { SyntaxKind.Colon, ":" },
+            { SyntaxKind.Semicolon, ";" },
+            { SyntaxKind.QuestionMark, "?" },
+            { SyntaxKind.NullCoalesce, "??" },
+            { SyntaxKind.RightBracket, "]" },
+            { SyntaxKind.LeftBracket, "[" },
+            { SyntaxKind.XorAssign, "^=" },
+            { SyntaxKind.Xor, "^" },
+            { SyntaxKind.LeftBrace, "{" },
+            { SyntaxKind.OrAssign, "|=" },
+            { SyntaxKind.DoubleOr, "||" },
+            { SyntaxKind.Or, "|" },
+            { SyntaxKind.RightBrace, "}" },
+            { SyntaxKind.Tilde, "~" },
+            { SyntaxKind.Plus, "+" },
+            { SyntaxKind.PlusAssign, "+=" },
+            { SyntaxKind.Increment, "++" },
+            { SyntaxKind.LessThan, "<" },
+            { SyntaxKind.LessThanEqual, "<=" },
+            { SyntaxKind.LeftShift, "<<" },
+            { SyntaxKind.LeftShiftAssign, "<<=" },
+            { SyntaxKind.Assign, "=" },
+            { SyntaxKind.Equals, "==" },
+            { SyntaxKind.GreaterThan, ">" },
+            { SyntaxKind.GreaterThanEqual, ">=" },
+            { SyntaxKind.RightShift, ">>" },
+            { SyntaxKind.RightShiftAssign, ">>=" },
+            { SyntaxKind.Hash, "#" },
+            { SyntaxKind.Transition, "@" },
         };
 
         protected CSharpLanguageCharacteristics()
@@ -74,35 +75,35 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return new CSharpTokenizer(source);
         }
 
-        protected override CSharpToken CreateToken(string content, CSharpTokenType type, IReadOnlyList<RazorDiagnostic> errors)
+        protected override SyntaxToken CreateToken(string content, SyntaxKind kind, IReadOnlyList<RazorDiagnostic> errors)
         {
-            return new CSharpToken(content, type, errors);
+            return SyntaxFactory.Token(kind, content, errors);
         }
 
-        public override string GetSample(CSharpTokenType type)
+        public override string GetSample(SyntaxKind kind)
         {
             string sample;
-            if (!_tokenSamples.TryGetValue(type, out sample))
+            if (!_tokenSamples.TryGetValue(kind, out sample))
             {
-                switch (type)
+                switch (kind)
                 {
-                    case CSharpTokenType.Identifier:
+                    case SyntaxKind.Identifier:
                         return Resources.CSharpToken_Identifier;
-                    case CSharpTokenType.Keyword:
+                    case SyntaxKind.Keyword:
                         return Resources.CSharpToken_Keyword;
-                    case CSharpTokenType.IntegerLiteral:
+                    case SyntaxKind.IntegerLiteral:
                         return Resources.CSharpToken_IntegerLiteral;
-                    case CSharpTokenType.NewLine:
+                    case SyntaxKind.NewLine:
                         return Resources.CSharpToken_Newline;
-                    case CSharpTokenType.WhiteSpace:
+                    case SyntaxKind.Whitespace:
                         return Resources.CSharpToken_Whitespace;
-                    case CSharpTokenType.Comment:
+                    case SyntaxKind.CSharpComment:
                         return Resources.CSharpToken_Comment;
-                    case CSharpTokenType.RealLiteral:
+                    case SyntaxKind.RealLiteral:
                         return Resources.CSharpToken_RealLiteral;
-                    case CSharpTokenType.CharacterLiteral:
+                    case SyntaxKind.CharacterLiteral:
                         return Resources.CSharpToken_CharacterLiteral;
-                    case CSharpTokenType.StringLiteral:
+                    case SyntaxKind.StringLiteral:
                         return Resources.CSharpToken_StringLiteral;
                     default:
                         return Resources.Token_Unknown;
@@ -111,59 +112,59 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return sample;
         }
 
-        public override CSharpToken CreateMarkerToken()
+        public override SyntaxToken CreateMarkerToken()
         {
-            return new CSharpToken(string.Empty, CSharpTokenType.Unknown);
+            return SyntaxFactory.Token(SyntaxKind.Marker, string.Empty);
         }
 
-        public override CSharpTokenType GetKnownTokenType(KnownTokenType type)
+        public override SyntaxKind GetKnownTokenType(KnownTokenType type)
         {
             switch (type)
             {
                 case KnownTokenType.Identifier:
-                    return CSharpTokenType.Identifier;
+                    return SyntaxKind.Identifier;
                 case KnownTokenType.Keyword:
-                    return CSharpTokenType.Keyword;
+                    return SyntaxKind.Keyword;
                 case KnownTokenType.NewLine:
-                    return CSharpTokenType.NewLine;
-                case KnownTokenType.WhiteSpace:
-                    return CSharpTokenType.WhiteSpace;
+                    return SyntaxKind.NewLine;
+                case KnownTokenType.Whitespace:
+                    return SyntaxKind.Whitespace;
                 case KnownTokenType.Transition:
-                    return CSharpTokenType.Transition;
+                    return SyntaxKind.Transition;
                 case KnownTokenType.CommentStart:
-                    return CSharpTokenType.RazorCommentTransition;
+                    return SyntaxKind.RazorCommentTransition;
                 case KnownTokenType.CommentStar:
-                    return CSharpTokenType.RazorCommentStar;
+                    return SyntaxKind.RazorCommentStar;
                 case KnownTokenType.CommentBody:
-                    return CSharpTokenType.RazorComment;
+                    return SyntaxKind.RazorCommentLiteral;
                 default:
-                    return CSharpTokenType.Unknown;
+                    return SyntaxKind.Marker;
             }
         }
 
-        public override CSharpTokenType FlipBracket(CSharpTokenType bracket)
+        public override SyntaxKind FlipBracket(SyntaxKind bracket)
         {
             switch (bracket)
             {
-                case CSharpTokenType.LeftBrace:
-                    return CSharpTokenType.RightBrace;
-                case CSharpTokenType.LeftBracket:
-                    return CSharpTokenType.RightBracket;
-                case CSharpTokenType.LeftParenthesis:
-                    return CSharpTokenType.RightParenthesis;
-                case CSharpTokenType.LessThan:
-                    return CSharpTokenType.GreaterThan;
-                case CSharpTokenType.RightBrace:
-                    return CSharpTokenType.LeftBrace;
-                case CSharpTokenType.RightBracket:
-                    return CSharpTokenType.LeftBracket;
-                case CSharpTokenType.RightParenthesis:
-                    return CSharpTokenType.LeftParenthesis;
-                case CSharpTokenType.GreaterThan:
-                    return CSharpTokenType.LessThan;
+                case SyntaxKind.LeftBrace:
+                    return SyntaxKind.RightBrace;
+                case SyntaxKind.LeftBracket:
+                    return SyntaxKind.RightBracket;
+                case SyntaxKind.LeftParenthesis:
+                    return SyntaxKind.RightParenthesis;
+                case SyntaxKind.LessThan:
+                    return SyntaxKind.GreaterThan;
+                case SyntaxKind.RightBrace:
+                    return SyntaxKind.LeftBrace;
+                case SyntaxKind.RightBracket:
+                    return SyntaxKind.LeftBracket;
+                case SyntaxKind.RightParenthesis:
+                    return SyntaxKind.LeftParenthesis;
+                case SyntaxKind.GreaterThan:
+                    return SyntaxKind.LessThan;
                 default:
                     Debug.Fail("FlipBracket must be called with a bracket character");
-                    return CSharpTokenType.Unknown;
+                    return SyntaxKind.Marker;
             }
         }
 
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpToken.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpToken.cs
deleted file mode 100644
index c928f0880e..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpToken.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// 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;
-using System.Collections.Generic;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class CSharpToken : TokenBase<CSharpTokenType>
-    {
-        public CSharpToken(
-            string content,
-            CSharpTokenType type)
-            : base(content, type, RazorDiagnostic.EmptyArray)
-        {
-            if (content == null)
-            {
-                throw new ArgumentNullException(nameof(content));
-            }
-        }
-
-        public CSharpToken(
-            string content,
-            CSharpTokenType type,
-            IReadOnlyList<RazorDiagnostic> errors)
-            : base(content, type, errors)
-        {
-            if (content == null)
-            {
-                throw new ArgumentNullException(nameof(content));
-            }
-        }
-
-        public CSharpKeyword? Keyword { get; set; }
-
-        public override bool Equals(object obj)
-        {
-            var other = obj as CSharpToken;
-            return base.Equals(other) &&
-                other.Keyword == Keyword;
-        }
-
-        public override int GetHashCode()
-        {
-            // Hash code should include only immutable properties.
-            return base.GetHashCode();
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpTokenType.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpTokenType.cs
deleted file mode 100644
index 10f3478d6d..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpTokenType.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal enum CSharpTokenType
-    {
-        Unknown,
-        Identifier,
-        Keyword,
-        IntegerLiteral,
-        NewLine,
-        WhiteSpace,
-        Comment,
-        RealLiteral,
-        CharacterLiteral,
-        StringLiteral,
-
-        // Operators
-        Arrow,
-        Minus,
-        Decrement,
-        MinusAssign,
-        NotEqual,
-        Not,
-        Modulo,
-        ModuloAssign,
-        AndAssign,
-        And,
-        DoubleAnd,
-        LeftParenthesis,
-        RightParenthesis,
-        Star,
-        MultiplyAssign,
-        Comma,
-        Dot,
-        Slash,
-        DivideAssign,
-        DoubleColon,
-        Colon,
-        Semicolon,
-        QuestionMark,
-        NullCoalesce,
-        RightBracket,
-        LeftBracket,
-        XorAssign,
-        Xor,
-        LeftBrace,
-        OrAssign,
-        DoubleOr,
-        Or,
-        RightBrace,
-        Tilde,
-        Plus,
-        PlusAssign,
-        Increment,
-        LessThan,
-        LessThanEqual,
-        LeftShift,
-        LeftShiftAssign,
-        Assign,
-        Equals,
-        GreaterThan,
-        GreaterThanEqual,
-        RightShift,
-        RightShiftAssign,
-        Hash,
-        Transition,
-
-        // Razor specific
-        RazorCommentTransition,
-        RazorCommentStar,
-        RazorComment
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpTokenizer.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpTokenizer.cs
index f819e98a3a..21cd0dc00b 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpTokenizer.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpTokenizer.cs
@@ -5,12 +5,13 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
-    internal class CSharpTokenizer : Tokenizer<CSharpToken, CSharpTokenType>
+    internal class CSharpTokenizer : Tokenizer
     {
-        private Dictionary<char, Func<CSharpTokenType>> _operatorHandlers;
+        private Dictionary<char, Func<SyntaxKind>> _operatorHandlers;
 
         private static readonly Dictionary<string, CSharpKeyword> _keywords = new Dictionary<string, CSharpKeyword>(StringComparer.Ordinal)
         {
@@ -100,31 +101,31 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             base.CurrentState = StartState;
 
-            _operatorHandlers = new Dictionary<char, Func<CSharpTokenType>>()
+            _operatorHandlers = new Dictionary<char, Func<SyntaxKind>>()
             {
                 { '-', MinusOperator },
                 { '<', LessThanOperator },
                 { '>', GreaterThanOperator },
-                { '&', CreateTwoCharOperatorHandler(CSharpTokenType.And, '=', CSharpTokenType.AndAssign, '&', CSharpTokenType.DoubleAnd) },
-                { '|', CreateTwoCharOperatorHandler(CSharpTokenType.Or, '=', CSharpTokenType.OrAssign, '|', CSharpTokenType.DoubleOr) },
-                { '+', CreateTwoCharOperatorHandler(CSharpTokenType.Plus, '=', CSharpTokenType.PlusAssign, '+', CSharpTokenType.Increment) },
-                { '=', CreateTwoCharOperatorHandler(CSharpTokenType.Assign, '=', CSharpTokenType.Equals, '>', CSharpTokenType.GreaterThanEqual) },
-                { '!', CreateTwoCharOperatorHandler(CSharpTokenType.Not, '=', CSharpTokenType.NotEqual) },
-                { '%', CreateTwoCharOperatorHandler(CSharpTokenType.Modulo, '=', CSharpTokenType.ModuloAssign) },
-                { '*', CreateTwoCharOperatorHandler(CSharpTokenType.Star, '=', CSharpTokenType.MultiplyAssign) },
-                { ':', CreateTwoCharOperatorHandler(CSharpTokenType.Colon, ':', CSharpTokenType.DoubleColon) },
-                { '?', CreateTwoCharOperatorHandler(CSharpTokenType.QuestionMark, '?', CSharpTokenType.NullCoalesce) },
-                { '^', CreateTwoCharOperatorHandler(CSharpTokenType.Xor, '=', CSharpTokenType.XorAssign) },
-                { '(', () => CSharpTokenType.LeftParenthesis },
-                { ')', () => CSharpTokenType.RightParenthesis },
-                { '{', () => CSharpTokenType.LeftBrace },
-                { '}', () => CSharpTokenType.RightBrace },
-                { '[', () => CSharpTokenType.LeftBracket },
-                { ']', () => CSharpTokenType.RightBracket },
-                { ',', () => CSharpTokenType.Comma },
-                { ';', () => CSharpTokenType.Semicolon },
-                { '~', () => CSharpTokenType.Tilde },
-                { '#', () => CSharpTokenType.Hash }
+                { '&', CreateTwoCharOperatorHandler(SyntaxKind.And, '=', SyntaxKind.AndAssign, '&', SyntaxKind.DoubleAnd) },
+                { '|', CreateTwoCharOperatorHandler(SyntaxKind.Or, '=', SyntaxKind.OrAssign, '|', SyntaxKind.DoubleOr) },
+                { '+', CreateTwoCharOperatorHandler(SyntaxKind.Plus, '=', SyntaxKind.PlusAssign, '+', SyntaxKind.Increment) },
+                { '=', CreateTwoCharOperatorHandler(SyntaxKind.Assign, '=', SyntaxKind.Equals, '>', SyntaxKind.GreaterThanEqual) },
+                { '!', CreateTwoCharOperatorHandler(SyntaxKind.Not, '=', SyntaxKind.NotEqual) },
+                { '%', CreateTwoCharOperatorHandler(SyntaxKind.Modulo, '=', SyntaxKind.ModuloAssign) },
+                { '*', CreateTwoCharOperatorHandler(SyntaxKind.Star, '=', SyntaxKind.MultiplyAssign) },
+                { ':', CreateTwoCharOperatorHandler(SyntaxKind.Colon, ':', SyntaxKind.DoubleColon) },
+                { '?', CreateTwoCharOperatorHandler(SyntaxKind.QuestionMark, '?', SyntaxKind.NullCoalesce) },
+                { '^', CreateTwoCharOperatorHandler(SyntaxKind.Xor, '=', SyntaxKind.XorAssign) },
+                { '(', () => SyntaxKind.LeftParenthesis },
+                { ')', () => SyntaxKind.RightParenthesis },
+                { '{', () => SyntaxKind.LeftBrace },
+                { '}', () => SyntaxKind.RightBrace },
+                { '[', () => SyntaxKind.LeftBracket },
+                { ']', () => SyntaxKind.RightBracket },
+                { ',', () => SyntaxKind.Comma },
+                { ';', () => SyntaxKind.Semicolon },
+                { '~', () => SyntaxKind.Tilde },
+                { '#', () => SyntaxKind.Hash }
             };
         }
 
@@ -132,11 +133,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         private new CSharpTokenizerState? CurrentState => (CSharpTokenizerState?)base.CurrentState;
 
-        public override CSharpTokenType RazorCommentType => CSharpTokenType.RazorComment;
+        public override SyntaxKind RazorCommentKind => SyntaxKind.RazorCommentLiteral;
 
-        public override CSharpTokenType RazorCommentTransitionType => CSharpTokenType.RazorCommentTransition;
+        public override SyntaxKind RazorCommentTransitionKind => SyntaxKind.RazorCommentTransition;
 
-        public override CSharpTokenType RazorCommentStarType => CSharpTokenType.RazorCommentStar;
+        public override SyntaxKind RazorCommentStarKind => SyntaxKind.RazorCommentStar;
 
         protected override StateResult Dispatch()
         {
@@ -169,7 +170,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         // Optimize memory allocation by returning constants for the most frequent cases
-        protected override string GetTokenContent(CSharpTokenType type)
+        protected override string GetTokenContent(SyntaxKind type)
         {
             var tokenLength = Buffer.Length;
 
@@ -177,7 +178,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             {
                 switch (type)
                 {
-                    case CSharpTokenType.IntegerLiteral:
+                    case SyntaxKind.IntegerLiteral:
                         switch (Buffer[0])
                         {
                             case '0':
@@ -202,13 +203,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                                 return "9";
                         }
                         break;
-                    case CSharpTokenType.NewLine:
+                    case SyntaxKind.NewLine:
                         if (Buffer[0] == '\n')
                         {
                             return "\n";
                         }
                         break;
-                    case CSharpTokenType.WhiteSpace:
+                    case SyntaxKind.Whitespace:
                         if (Buffer[0] == ' ')
                         {
                             return " ";
@@ -218,57 +219,57 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                             return "\t";
                         }
                         break;
-                    case CSharpTokenType.Minus:
+                    case SyntaxKind.Minus:
                         return "-";
-                    case CSharpTokenType.Not:
+                    case SyntaxKind.Not:
                         return "!";
-                    case CSharpTokenType.Modulo:
+                    case SyntaxKind.Modulo:
                         return "%";
-                    case CSharpTokenType.And:
+                    case SyntaxKind.And:
                         return "&";
-                    case CSharpTokenType.LeftParenthesis:
+                    case SyntaxKind.LeftParenthesis:
                         return "(";
-                    case CSharpTokenType.RightParenthesis:
+                    case SyntaxKind.RightParenthesis:
                         return ")";
-                    case CSharpTokenType.Star:
+                    case SyntaxKind.Star:
                         return "*";
-                    case CSharpTokenType.Comma:
+                    case SyntaxKind.Comma:
                         return ",";
-                    case CSharpTokenType.Dot:
+                    case SyntaxKind.Dot:
                         return ".";
-                    case CSharpTokenType.Slash:
+                    case SyntaxKind.Slash:
                         return "/";
-                    case CSharpTokenType.Colon:
+                    case SyntaxKind.Colon:
                         return ":";
-                    case CSharpTokenType.Semicolon:
+                    case SyntaxKind.Semicolon:
                         return ";";
-                    case CSharpTokenType.QuestionMark:
+                    case SyntaxKind.QuestionMark:
                         return "?";
-                    case CSharpTokenType.RightBracket:
+                    case SyntaxKind.RightBracket:
                         return "]";
-                    case CSharpTokenType.LeftBracket:
+                    case SyntaxKind.LeftBracket:
                         return "[";
-                    case CSharpTokenType.Xor:
+                    case SyntaxKind.Xor:
                         return "^";
-                    case CSharpTokenType.LeftBrace:
+                    case SyntaxKind.LeftBrace:
                         return "{";
-                    case CSharpTokenType.Or:
+                    case SyntaxKind.Or:
                         return "|";
-                    case CSharpTokenType.RightBrace:
+                    case SyntaxKind.RightBrace:
                         return "}";
-                    case CSharpTokenType.Tilde:
+                    case SyntaxKind.Tilde:
                         return "~";
-                    case CSharpTokenType.Plus:
+                    case SyntaxKind.Plus:
                         return "+";
-                    case CSharpTokenType.LessThan:
+                    case SyntaxKind.LessThan:
                         return "<";
-                    case CSharpTokenType.Assign:
+                    case SyntaxKind.Assign:
                         return "=";
-                    case CSharpTokenType.GreaterThan:
+                    case SyntaxKind.GreaterThan:
                         return ">";
-                    case CSharpTokenType.Hash:
+                    case SyntaxKind.Hash:
                         return "#";
-                    case CSharpTokenType.Transition:
+                    case SyntaxKind.Transition:
                         return "@";
 
                 }
@@ -277,53 +278,53 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             {
                 switch (type)
                 {
-                    case CSharpTokenType.NewLine:
+                    case SyntaxKind.NewLine:
                         return "\r\n";
-                    case CSharpTokenType.Arrow:
+                    case SyntaxKind.Arrow:
                         return "->";
-                    case CSharpTokenType.Decrement:
+                    case SyntaxKind.Decrement:
                         return "--";
-                    case CSharpTokenType.MinusAssign:
+                    case SyntaxKind.MinusAssign:
                         return "-=";
-                    case CSharpTokenType.NotEqual:
+                    case SyntaxKind.NotEqual:
                         return "!=";
-                    case CSharpTokenType.ModuloAssign:
+                    case SyntaxKind.ModuloAssign:
                         return "%=";
-                    case CSharpTokenType.AndAssign:
+                    case SyntaxKind.AndAssign:
                         return "&=";
-                    case CSharpTokenType.DoubleAnd:
+                    case SyntaxKind.DoubleAnd:
                         return "&&";
-                    case CSharpTokenType.MultiplyAssign:
+                    case SyntaxKind.MultiplyAssign:
                         return "*=";
-                    case CSharpTokenType.DivideAssign:
+                    case SyntaxKind.DivideAssign:
                         return "/=";
-                    case CSharpTokenType.DoubleColon:
+                    case SyntaxKind.DoubleColon:
                         return "::";
-                    case CSharpTokenType.NullCoalesce:
+                    case SyntaxKind.NullCoalesce:
                         return "??";
-                    case CSharpTokenType.XorAssign:
+                    case SyntaxKind.XorAssign:
                         return "^=";
-                    case CSharpTokenType.OrAssign:
+                    case SyntaxKind.OrAssign:
                         return "|=";
-                    case CSharpTokenType.DoubleOr:
+                    case SyntaxKind.DoubleOr:
                         return "||";
-                    case CSharpTokenType.PlusAssign:
+                    case SyntaxKind.PlusAssign:
                         return "+=";
-                    case CSharpTokenType.Increment:
+                    case SyntaxKind.Increment:
                         return "++";
-                    case CSharpTokenType.LessThanEqual:
+                    case SyntaxKind.LessThanEqual:
                         return "<=";
-                    case CSharpTokenType.LeftShift:
+                    case SyntaxKind.LeftShift:
                         return "<<";
-                    case CSharpTokenType.Equals:
+                    case SyntaxKind.Equals:
                         return "==";
-                    case CSharpTokenType.GreaterThanEqual:
+                    case SyntaxKind.GreaterThanEqual:
                         if (Buffer[0] == '=')
                         {
                             return "=>";
                         }
                         return ">=";
-                    case CSharpTokenType.RightShift:
+                    case SyntaxKind.RightShift:
                         return ">>";
 
 
@@ -333,9 +334,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             {
                 switch (type)
                 {
-                    case CSharpTokenType.LeftShiftAssign:
+                    case SyntaxKind.LeftShiftAssign:
                         return "<<=";
-                    case CSharpTokenType.RightShiftAssign:
+                    case SyntaxKind.RightShiftAssign:
                         return ">>=";
                 }
             }
@@ -343,9 +344,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return base.GetTokenContent(type);
         }
 
-        protected override CSharpToken CreateToken(string content, CSharpTokenType type, IReadOnlyList<RazorDiagnostic> errors)
+        protected override SyntaxToken CreateToken(string content, SyntaxKind kind, IReadOnlyList<RazorDiagnostic> errors)
         {
-            return new CSharpToken(content, type, errors);
+            return SyntaxFactory.Token(kind, content, errors);
         }
 
         private StateResult Data()
@@ -359,13 +360,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 {
                     TakeCurrent();
                 }
-                return Stay(EndToken(CSharpTokenType.NewLine));
+                return Stay(EndToken(SyntaxKind.NewLine));
             }
             else if (ParserHelpers.IsWhitespace(CurrentCharacter))
             {
                 // CSharp Spec §2.3.3
                 TakeUntil(c => !ParserHelpers.IsWhitespace(c));
-                return Stay(EndToken(CSharpTokenType.WhiteSpace));
+                return Stay(EndToken(SyntaxKind.Whitespace));
             }
             else if (IsIdentifierStart(CurrentCharacter))
             {
@@ -390,7 +391,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     {
                         return RealLiteral();
                     }
-                    return Stay(Single(CSharpTokenType.Dot));
+                    return Stay(Single(SyntaxKind.Dot));
                 case '/':
                     TakeCurrent();
                     if (CurrentCharacter == '/')
@@ -406,11 +407,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     else if (CurrentCharacter == '=')
                     {
                         TakeCurrent();
-                        return Stay(EndToken(CSharpTokenType.DivideAssign));
+                        return Stay(EndToken(SyntaxKind.DivideAssign));
                     }
                     else
                     {
-                        return Stay(EndToken(CSharpTokenType.Slash));
+                        return Stay(EndToken(SyntaxKind.Slash));
                     }
                 default:
                     return Stay(EndToken(Operator()));
@@ -429,78 +430,78 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             {
                 return Transition(
                     CSharpTokenizerState.AfterRazorCommentTransition,
-                    EndToken(CSharpTokenType.RazorCommentTransition));
+                    EndToken(SyntaxKind.RazorCommentTransition));
             }
             else if (CurrentCharacter == '@')
             {
                 // Could be escaped comment transition
                 return Transition(
                     CSharpTokenizerState.EscapedRazorCommentTransition,
-                    EndToken(CSharpTokenType.Transition));
+                    EndToken(SyntaxKind.Transition));
             }
 
-            return Stay(EndToken(CSharpTokenType.Transition));
+            return Stay(EndToken(SyntaxKind.Transition));
         }
 
         private StateResult EscapedRazorCommentTransition()
         {
             TakeCurrent();
-            return Transition(CSharpTokenizerState.Data, EndToken(CSharpTokenType.Transition));
+            return Transition(CSharpTokenizerState.Data, EndToken(SyntaxKind.Transition));
         }
 
-        private CSharpTokenType Operator()
+        private SyntaxKind Operator()
         {
             var first = CurrentCharacter;
             TakeCurrent();
-            Func<CSharpTokenType> handler;
+            Func<SyntaxKind> handler;
             if (_operatorHandlers.TryGetValue(first, out handler))
             {
                 return handler();
             }
-            return CSharpTokenType.Unknown;
+            return SyntaxKind.Marker;
         }
 
-        private CSharpTokenType LessThanOperator()
+        private SyntaxKind LessThanOperator()
         {
             if (CurrentCharacter == '=')
             {
                 TakeCurrent();
-                return CSharpTokenType.LessThanEqual;
+                return SyntaxKind.LessThanEqual;
             }
-            return CSharpTokenType.LessThan;
+            return SyntaxKind.LessThan;
         }
 
-        private CSharpTokenType GreaterThanOperator()
+        private SyntaxKind GreaterThanOperator()
         {
             if (CurrentCharacter == '=')
             {
                 TakeCurrent();
-                return CSharpTokenType.GreaterThanEqual;
+                return SyntaxKind.GreaterThanEqual;
             }
-            return CSharpTokenType.GreaterThan;
+            return SyntaxKind.GreaterThan;
         }
 
-        private CSharpTokenType MinusOperator()
+        private SyntaxKind MinusOperator()
         {
             if (CurrentCharacter == '>')
             {
                 TakeCurrent();
-                return CSharpTokenType.Arrow;
+                return SyntaxKind.Arrow;
             }
             else if (CurrentCharacter == '-')
             {
                 TakeCurrent();
-                return CSharpTokenType.Decrement;
+                return SyntaxKind.Decrement;
             }
             else if (CurrentCharacter == '=')
             {
                 TakeCurrent();
-                return CSharpTokenType.MinusAssign;
+                return SyntaxKind.MinusAssign;
             }
-            return CSharpTokenType.Minus;
+            return SyntaxKind.Minus;
         }
 
-        private Func<CSharpTokenType> CreateTwoCharOperatorHandler(CSharpTokenType typeIfOnlyFirst, char second, CSharpTokenType typeIfBoth)
+        private Func<SyntaxKind> CreateTwoCharOperatorHandler(SyntaxKind typeIfOnlyFirst, char second, SyntaxKind typeIfBoth)
         {
             return () =>
             {
@@ -513,7 +514,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             };
         }
 
-        private Func<CSharpTokenType> CreateTwoCharOperatorHandler(CSharpTokenType typeIfOnlyFirst, char option1, CSharpTokenType typeIfOption1, char option2, CSharpTokenType typeIfOption2)
+        private Func<SyntaxKind> CreateTwoCharOperatorHandler(SyntaxKind typeIfOnlyFirst, char option1, SyntaxKind typeIfOption1, char option2, SyntaxKind typeIfOption2)
         {
             return () =>
             {
@@ -550,14 +551,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     RazorDiagnosticFactory.CreateParsing_UnterminatedStringLiteral(
                         new SourceSpan(CurrentStart, contentLength: 1 /* end of file */)));
             }
-            return Transition(CSharpTokenizerState.Data, EndToken(CSharpTokenType.StringLiteral));
+            return Transition(CSharpTokenizerState.Data, EndToken(SyntaxKind.StringLiteral));
         }
 
-        private StateResult QuotedCharacterLiteral() => QuotedLiteral('\'', CSharpTokenType.CharacterLiteral);
+        private StateResult QuotedCharacterLiteral() => QuotedLiteral('\'', SyntaxKind.CharacterLiteral);
 
-        private StateResult QuotedStringLiteral() => QuotedLiteral('\"', CSharpTokenType.StringLiteral);
+        private StateResult QuotedStringLiteral() => QuotedLiteral('\"', SyntaxKind.StringLiteral);
 
-        private StateResult QuotedLiteral(char quote, CSharpTokenType literalType)
+        private StateResult QuotedLiteral(char quote, SyntaxKind literalType)
         {
             TakeUntil(c => c == '\\' || c == quote || ParserHelpers.IsNewLine(c));
             if (CurrentCharacter == '\\')
@@ -594,7 +595,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     RazorDiagnosticFactory.CreateParsing_BlockCommentNotTerminated(
                         new SourceSpan(CurrentStart, contentLength: 1 /* end of file */)));
                     
-                return Transition(CSharpTokenizerState.Data, EndToken(CSharpTokenType.Comment));
+                return Transition(CSharpTokenizerState.Data, EndToken(SyntaxKind.CSharpComment));
             }
             if (CurrentCharacter == '*')
             {
@@ -602,7 +603,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 if (CurrentCharacter == '/')
                 {
                     TakeCurrent();
-                    return Transition(CSharpTokenizerState.Data, EndToken(CSharpTokenType.Comment));
+                    return Transition(CSharpTokenizerState.Data, EndToken(SyntaxKind.CSharpComment));
                 }
             }
             return Stay();
@@ -612,7 +613,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         private StateResult SingleLineComment()
         {
             TakeUntil(c => ParserHelpers.IsNewLine(c));
-            return Stay(EndToken(CSharpTokenType.Comment));
+            return Stay(EndToken(SyntaxKind.CSharpComment));
         }
 
         // CSharp Spec §2.4.4
@@ -632,7 +633,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             TakeUntil(c => !IsHexDigit(c));
             TakeIntegerSuffix();
-            return Stay(EndToken(CSharpTokenType.IntegerLiteral));
+            return Stay(EndToken(SyntaxKind.IntegerLiteral));
         }
 
         private StateResult DecimalLiteral()
@@ -650,7 +651,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             else
             {
                 TakeIntegerSuffix();
-                return Stay(EndToken(CSharpTokenType.IntegerLiteral));
+                return Stay(EndToken(SyntaxKind.IntegerLiteral));
             }
         }
 
@@ -669,7 +670,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             {
                 TakeCurrent();
             }
-            return Stay(EndToken(CSharpTokenType.RealLiteral));
+            return Stay(EndToken(SyntaxKind.RealLiteral));
         }
 
         // CSharp Spec §2.4.4.3
@@ -708,21 +709,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             Debug.Assert(IsIdentifierStart(CurrentCharacter));
             TakeCurrent();
             TakeUntil(c => !IsIdentifierPart(c));
-            CSharpToken token = null;
+            SyntaxToken token = null;
             if (HaveContent)
             {
                 CSharpKeyword keyword;
-                var type = CSharpTokenType.Identifier;
+                var type = SyntaxKind.Identifier;
                 var tokenContent = Buffer.ToString();
                 if (_keywords.TryGetValue(tokenContent, out keyword))
                 {
-                    type = CSharpTokenType.Keyword;
+                    type = SyntaxKind.Keyword;
                 }
-                
-                token = new CSharpToken(tokenContent, type)
-                {
-                    Keyword = type == CSharpTokenType.Keyword ? (CSharpKeyword?)keyword : null,
-                };
+
+                token = SyntaxFactory.Token(type, tokenContent);
                 
                 Buffer.Clear();
                 CurrentErrors.Clear();
@@ -736,7 +734,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return Transition((int)state, result: null);
         }
 
-        private StateResult Transition(CSharpTokenizerState state, CSharpToken result)
+        private StateResult Transition(CSharpTokenizerState state, SyntaxToken result)
         {
             return Transition((int)state, result);
         }
@@ -780,6 +778,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return (value >= '0' && value <= '9') || (value >= 'A' && value <= 'F') || (value >= 'a' && value <= 'f');
         }
 
+        internal static CSharpKeyword? GetTokenKeyword(SyntaxToken token)
+        {
+            if (token != null && _keywords.TryGetValue(token.Content, out var keyword))
+            {
+                return keyword;
+            }
+
+            return null;
+        }
+
         private enum CSharpTokenizerState
         {
             Data,
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ChunkGeneratorContext.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ChunkGeneratorContext.cs
deleted file mode 100644
index b4a4a4782e..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ChunkGeneratorContext.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class ChunkGeneratorContext
-    {
-        public ChunkGeneratorContext(
-            string className,
-            string rootNamespace,
-            string sourceFile,
-            bool shouldGenerateLinePragmas)
-        {
-            SourceFile = shouldGenerateLinePragmas ? sourceFile : null;
-            RootNamespace = rootNamespace;
-            ClassName = className;
-        }
-
-        public string SourceFile { get; internal set; }
-
-        public string RootNamespace { get; }
-
-        public string ClassName { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CodeBlockEditHandler.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CodeBlockEditHandler.cs
index d5ce71c43e..8ecbd85906 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CodeBlockEditHandler.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/CodeBlockEditHandler.cs
@@ -4,16 +4,17 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal class CodeBlockEditHandler : SpanEditHandler
     {
-        public CodeBlockEditHandler(Func<string, IEnumerable<IToken>> tokenizer) : base(tokenizer)
+        public CodeBlockEditHandler(Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> tokenizer) : base(tokenizer)
         {
         }
 
-        protected override PartialParseResultInternal CanAcceptChange(Span target, SourceChange change)
+        protected override PartialParseResultInternal CanAcceptChange(SyntaxNode target, SourceChange change)
         {
             if (IsAcceptableDeletion(target, change))
             {
@@ -34,7 +35,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         // Internal for testing
-        internal static bool IsAcceptableReplacement(Span target, SourceChange change)
+        internal static bool IsAcceptableReplacement(SyntaxNode target, SourceChange change)
         {
             if (!change.IsReplace)
             {
@@ -55,7 +56,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         // Internal for testing
-        internal static bool IsAcceptableDeletion(Span target, SourceChange change)
+        internal static bool IsAcceptableDeletion(SyntaxNode target, SourceChange change)
         {
             if (!change.IsDelete)
             {
@@ -71,11 +72,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         // Internal for testing
-        internal static bool ModifiesInvalidContent(Span target, SourceChange change)
+        internal static bool ModifiesInvalidContent(SyntaxNode target, SourceChange change)
         {
-            var relativePosition = change.Span.AbsoluteIndex - target.Start.AbsoluteIndex;
+            var relativePosition = change.Span.AbsoluteIndex - target.Position;
 
-            if (target.Content.IndexOfAny(new[] { '{', '}' }, relativePosition, change.Span.Length) >= 0)
+            if (target.GetContent().IndexOfAny(new[] { '{', '}' }, relativePosition, change.Span.Length) >= 0)
             {
                 return true;
             }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ConditionalAttributeCollapser.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ConditionalAttributeCollapser.cs
deleted file mode 100644
index 4fa89603dc..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ConditionalAttributeCollapser.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// 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.Diagnostics;
-using System.Text;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class ConditionalAttributeCollapser : MarkupRewriter
-    {
-        protected override bool CanRewrite(Block block)
-        {
-            var generator = block.ChunkGenerator as AttributeBlockChunkGenerator;
-            if (generator != null && block.Children.Count > 0)
-            {
-                // Perf: Avoid allocating an enumerator.
-                for (var i = 0; i < block.Children.Count; i++)
-                {
-                    if (!IsLiteralAttributeValue(block.Children[i]))
-                    {
-                        return false;
-                    }
-                }
-
-                return true;
-            }
-
-            return false;
-        }
-
-        protected override SyntaxTreeNode RewriteBlock(BlockBuilder parent, Block block)
-        {
-            // Collect the content of this node
-            var builder = new StringBuilder();
-            for (var i = 0; i < block.Children.Count; i++)
-            {
-                var childSpan = (Span)block.Children[i];
-                builder.Append(childSpan.Content);
-            }
-
-            // Create a new span containing this content
-            var span = new SpanBuilder(block.Children[0].Start);
-
-            span.EditHandler = SpanEditHandler.CreateDefault(HtmlLanguageCharacteristics.Instance.TokenizeString);
-            Debug.Assert(block.Children.Count > 0);
-            var start = ((Span)block.Children[0]).Start;
-            FillSpan(span, start, builder.ToString());
-            return span.Build();
-        }
-
-        private bool IsLiteralAttributeValue(SyntaxTreeNode node)
-        {
-            if (node.IsBlock)
-            {
-                return false;
-            }
-
-            var span = node as Span;
-            Debug.Assert(span != null);
-
-            return span != null &&
-                (span.ChunkGenerator is LiteralAttributeChunkGenerator ||
-                span.ChunkGenerator is MarkupChunkGenerator ||
-                span.ChunkGenerator == SpanChunkGenerator.Null);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveCSharpTokenizer.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveCSharpTokenizer.cs
index a9befaa302..59224e709f 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveCSharpTokenizer.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveCSharpTokenizer.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
@@ -17,11 +18,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         protected override StateResult Dispatch()
         {
             var result = base.Dispatch();
-            if (result.Result != null && !_visitedFirstTokenStart && IsValidTokenType(result.Result.Type))
+            if (result.Result != null && !_visitedFirstTokenStart && IsValidTokenType(result.Result.Kind))
             {
                 _visitedFirstTokenStart = true;
             }
-            else if (result.Result != null && _visitedFirstTokenStart && result.Result.Type == CSharpTokenType.NewLine)
+            else if (result.Result != null && _visitedFirstTokenStart && result.Result.Kind == SyntaxKind.NewLine)
             {
                 _visitedFirstTokenLineEnd = true;
             }
@@ -29,7 +30,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return result;
         }
 
-        public override CSharpToken NextToken()
+        public override SyntaxToken NextToken()
         {
             // Post-Condition: Buffer should be empty at the start of Next()
             Debug.Assert(Buffer.Length == 0);
@@ -48,15 +49,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return token;
         }
 
-        private bool IsValidTokenType(CSharpTokenType type)
+        private bool IsValidTokenType(SyntaxKind kind)
         {
-            return type != CSharpTokenType.WhiteSpace &&
-                type != CSharpTokenType.NewLine &&
-                type != CSharpTokenType.Comment &&
-                type != CSharpTokenType.RazorComment &&
-                type != CSharpTokenType.RazorCommentStar &&
-                type != CSharpTokenType.RazorCommentTransition &&
-                type != CSharpTokenType.Transition;
+            return kind != SyntaxKind.Whitespace &&
+                kind != SyntaxKind.NewLine &&
+                kind != SyntaxKind.CSharpComment &&
+                kind != SyntaxKind.RazorCommentLiteral &&
+                kind != SyntaxKind.RazorCommentStar &&
+                kind != SyntaxKind.RazorCommentTransition &&
+                kind != SyntaxKind.Transition;
         }
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveChunkGenerator.cs
deleted file mode 100644
index 19a6bad463..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveChunkGenerator.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-// 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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.Extensions.Internal;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class DirectiveChunkGenerator : ParentChunkGenerator
-    {
-        private static readonly Type Type = typeof(DirectiveChunkGenerator);
-        private List<RazorDiagnostic> _diagnostics;
-
-        public DirectiveChunkGenerator(DirectiveDescriptor descriptor)
-        {
-            Descriptor = descriptor;
-        }
-
-        public DirectiveDescriptor Descriptor { get; }
-
-        public List<RazorDiagnostic> Diagnostics
-        {
-            get
-            {
-                if (_diagnostics == null)
-                {
-                    _diagnostics = new List<RazorDiagnostic>();
-                }
-
-                return _diagnostics;
-            }
-        }
-
-        public override void Accept(ParserVisitor visitor, Block block)
-        {
-            visitor.VisitDirectiveBlock(this, block);
-        }
-
-        public override bool Equals(object obj)
-        {
-            var other = obj as DirectiveChunkGenerator;
-            return base.Equals(other) &&
-                Enumerable.SequenceEqual(Diagnostics, other.Diagnostics) &&
-                DirectiveDescriptorComparer.Default.Equals(Descriptor, other.Descriptor);
-        }
-
-        public override int GetHashCode()
-        {
-            var combiner = HashCodeCombiner.Start();
-            combiner.Add(base.GetHashCode());
-            combiner.Add(Type);
-
-            return combiner.CombinedHash;
-        }
-
-        public override string ToString()
-        {
-            // This is used primarily at test time to show an identifiable representation of the chunk generator.
-
-            var builder = new StringBuilder("Directive:{");
-            builder.Append(Descriptor.Directive);
-            builder.Append(";");
-            builder.Append(Descriptor.Kind);
-            builder.Append(";");
-            builder.Append(Descriptor.Usage);
-            builder.Append("}");
-
-            if (Diagnostics.Count > 0)
-            {
-                builder.Append(" [");
-                var ids = string.Join(", ", Diagnostics.Select(diagnostic => $"{diagnostic.Id}{diagnostic.Span}"));
-                builder.Append(ids);
-                builder.Append("]");
-            }
-
-            return builder.ToString();
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveHtmlTokenizer.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveHtmlTokenizer.cs
index 034977c758..4921c8aa1e 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveHtmlTokenizer.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveHtmlTokenizer.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
@@ -16,7 +17,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         protected override StateResult Dispatch()
         {
             var result = base.Dispatch();
-            if (result.Result != null && IsValidTokenType(result.Result.Type))
+            if (result.Result != null && IsValidTokenType(result.Result.Kind))
             {
                 _visitedFirstTokenStart = true;
             }
@@ -24,7 +25,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return result;
         }
 
-        public override HtmlToken NextToken()
+        public override SyntaxToken NextToken()
         {
             // Post-Condition: Buffer should be empty at the start of Next()
             Debug.Assert(Buffer.Length == 0);
@@ -43,14 +44,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return token;
         }
 
-        private bool IsValidTokenType(HtmlTokenType type)
+        private bool IsValidTokenType(SyntaxKind kind)
         {
-            return type != HtmlTokenType.WhiteSpace &&
-                type != HtmlTokenType.NewLine &&
-                type != HtmlTokenType.RazorComment &&
-                type != HtmlTokenType.RazorCommentStar &&
-                type != HtmlTokenType.RazorCommentTransition &&
-                type != HtmlTokenType.Transition;
+            return kind != SyntaxKind.Whitespace &&
+                kind != SyntaxKind.NewLine &&
+                kind != SyntaxKind.RazorCommentLiteral &&
+                kind != SyntaxKind.RazorCommentStar &&
+                kind != SyntaxKind.RazorCommentTransition &&
+                kind != SyntaxKind.Transition;
         }
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveTokenChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveTokenChunkGenerator.cs
index 69327ba6e2..ea1095bd5b 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveTokenChunkGenerator.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveTokenChunkGenerator.cs
@@ -18,11 +18,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public DirectiveTokenDescriptor Descriptor { get; }
 
-        public override void Accept(ParserVisitor visitor, Span span)
-        {
-            visitor.VisitDirectiveToken(this, span);
-        }
-
         public override bool Equals(object obj)
         {
             var other = obj as DirectiveTokenChunkGenerator;
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DynamicAttributeBlockChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DynamicAttributeBlockChunkGenerator.cs
deleted file mode 100644
index 5b8c31efae..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/DynamicAttributeBlockChunkGenerator.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// 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;
-using System.Globalization;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class DynamicAttributeBlockChunkGenerator : ParentChunkGenerator
-    {
-        public DynamicAttributeBlockChunkGenerator(LocationTagged<string> prefix, int offset, int line, int col)
-            : this(prefix, new SourceLocation(offset, line, col))
-        {
-        }
-
-        public DynamicAttributeBlockChunkGenerator(LocationTagged<string> prefix, SourceLocation valueStart)
-        {
-            Prefix = prefix;
-            ValueStart = valueStart;
-        }
-
-        public LocationTagged<string> Prefix { get; }
-
-        public SourceLocation ValueStart { get; }
-
-        public override void Accept(ParserVisitor visitor, Block block)
-        {
-            visitor.VisitDynamicAttributeBlock(this, block);
-        }
-
-        public override void GenerateStartParentChunk(Block target, ChunkGeneratorContext context)
-        {
-            //var chunk = context.ChunkTreeBuilder.StartParentChunk<DynamicCodeAttributeChunk>(target);
-            //chunk.Start = ValueStart;
-            //chunk.Prefix = Prefix;
-        }
-
-        public override void GenerateEndParentChunk(Block target, ChunkGeneratorContext context)
-        {
-            //context.ChunkTreeBuilder.EndParentChunk();
-        }
-
-        public override string ToString()
-        {
-            return string.Format(CultureInfo.CurrentCulture, "DynAttr:{0:F}", Prefix);
-        }
-
-        public override bool Equals(object obj)
-        {
-            var other = obj as DynamicAttributeBlockChunkGenerator;
-            return other != null &&
-                Equals(other.Prefix, Prefix);
-        }
-
-        public override int GetHashCode()
-        {
-            return Prefix == null ? 0 : Prefix.GetHashCode();
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/EditResult.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/EditResult.cs
index 6aff8dea24..13dfb20a71 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/EditResult.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/EditResult.cs
@@ -1,17 +1,19 @@
 // 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 Microsoft.AspNetCore.Razor.Language.Syntax;
+
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal class EditResult
     {
-        public EditResult(PartialParseResultInternal result, SpanBuilder editedSpan)
+        public EditResult(PartialParseResultInternal result, SyntaxNode editedNode)
         {
             Result = result;
-            EditedSpan = editedSpan;
+            EditedNode = editedNode;
         }
 
         public PartialParseResultInternal Result { get; set; }
-        public SpanBuilder EditedSpan { get; set; }
+        public SyntaxNode EditedNode { get; set; }
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ExpressionChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ExpressionChunkGenerator.cs
index fd2ef3ab91..24eb488c1e 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ExpressionChunkGenerator.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ExpressionChunkGenerator.cs
@@ -5,35 +5,10 @@ using System;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
-    internal class ExpressionChunkGenerator : ISpanChunkGenerator, IParentChunkGenerator
+    internal class ExpressionChunkGenerator : ISpanChunkGenerator
     {
         private static readonly int TypeHashCode = typeof(ExpressionChunkGenerator).GetHashCode();
 
-        public void GenerateStartParentChunk(Block target, ChunkGeneratorContext context)
-        {
-            //context.ChunkTreeBuilder.StartParentChunk<ExpressionBlockChunk>(target);
-        }
-
-        public void GenerateChunk(Span target, ChunkGeneratorContext context)
-        {
-            //context.ChunkTreeBuilder.AddExpressionChunk(target.Content, target);
-        }
-
-        public void GenerateEndParentChunk(Block target, ChunkGeneratorContext context)
-        {
-            //context.ChunkTreeBuilder.EndParentChunk();
-        }
-
-        public void Accept(ParserVisitor visitor, Span span)
-        {
-            visitor.VisitExpressionSpan(this, span);
-        }
-
-        public void Accept(ParserVisitor visitor, Block block)
-        {
-            visitor.VisitExpressionBlock(this, block);
-        }
-
         public override string ToString()
         {
             return "Expr";
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlLanguageCharacteristics.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlLanguageCharacteristics.cs
index 096ae84dc0..5efd2b80a5 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlLanguageCharacteristics.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlLanguageCharacteristics.cs
@@ -3,10 +3,11 @@
 
 using System.Collections.Generic;
 using System.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
-    internal class HtmlLanguageCharacteristics : LanguageCharacteristics<HtmlTokenizer, HtmlToken, HtmlTokenType>
+    internal class HtmlLanguageCharacteristics : LanguageCharacteristics<HtmlTokenizer>
     {
         private static readonly HtmlLanguageCharacteristics _instance = new HtmlLanguageCharacteristics();
 
@@ -19,47 +20,47 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             get { return _instance; }
         }
 
-        public override string GetSample(HtmlTokenType type)
+        public override string GetSample(SyntaxKind type)
         {
             switch (type)
             {
-                case HtmlTokenType.Text:
+                case SyntaxKind.Text:
                     return Resources.HtmlToken_Text;
-                case HtmlTokenType.WhiteSpace:
+                case SyntaxKind.Whitespace:
                     return Resources.HtmlToken_WhiteSpace;
-                case HtmlTokenType.NewLine:
+                case SyntaxKind.NewLine:
                     return Resources.HtmlToken_NewLine;
-                case HtmlTokenType.OpenAngle:
+                case SyntaxKind.OpenAngle:
                     return "<";
-                case HtmlTokenType.Bang:
+                case SyntaxKind.Bang:
                     return "!";
-                case HtmlTokenType.ForwardSlash:
+                case SyntaxKind.ForwardSlash:
                     return "/";
-                case HtmlTokenType.QuestionMark:
+                case SyntaxKind.QuestionMark:
                     return "?";
-                case HtmlTokenType.DoubleHyphen:
+                case SyntaxKind.DoubleHyphen:
                     return "--";
-                case HtmlTokenType.LeftBracket:
+                case SyntaxKind.LeftBracket:
                     return "[";
-                case HtmlTokenType.CloseAngle:
+                case SyntaxKind.CloseAngle:
                     return ">";
-                case HtmlTokenType.RightBracket:
+                case SyntaxKind.RightBracket:
                     return "]";
-                case HtmlTokenType.Equals:
+                case SyntaxKind.Equals:
                     return "=";
-                case HtmlTokenType.DoubleQuote:
+                case SyntaxKind.DoubleQuote:
                     return "\"";
-                case HtmlTokenType.SingleQuote:
+                case SyntaxKind.SingleQuote:
                     return "'";
-                case HtmlTokenType.Transition:
+                case SyntaxKind.Transition:
                     return "@";
-                case HtmlTokenType.Colon:
+                case SyntaxKind.Colon:
                     return ":";
-                case HtmlTokenType.RazorComment:
+                case SyntaxKind.RazorCommentLiteral:
                     return Resources.HtmlToken_RazorComment;
-                case HtmlTokenType.RazorCommentStar:
+                case SyntaxKind.RazorCommentStar:
                     return "*";
-                case HtmlTokenType.RazorCommentTransition:
+                case SyntaxKind.RazorCommentTransition:
                     return "@";
                 default:
                     return Resources.Token_Unknown;
@@ -71,57 +72,57 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return new HtmlTokenizer(source);
         }
 
-        public override HtmlTokenType FlipBracket(HtmlTokenType bracket)
+        public override SyntaxKind FlipBracket(SyntaxKind bracket)
         {
             switch (bracket)
             {
-                case HtmlTokenType.LeftBracket:
-                    return HtmlTokenType.RightBracket;
-                case HtmlTokenType.OpenAngle:
-                    return HtmlTokenType.CloseAngle;
-                case HtmlTokenType.RightBracket:
-                    return HtmlTokenType.LeftBracket;
-                case HtmlTokenType.CloseAngle:
-                    return HtmlTokenType.OpenAngle;
+                case SyntaxKind.LeftBracket:
+                    return SyntaxKind.RightBracket;
+                case SyntaxKind.OpenAngle:
+                    return SyntaxKind.CloseAngle;
+                case SyntaxKind.RightBracket:
+                    return SyntaxKind.LeftBracket;
+                case SyntaxKind.CloseAngle:
+                    return SyntaxKind.OpenAngle;
                 default:
                     Debug.Fail("FlipBracket must be called with a bracket character");
-                    return HtmlTokenType.Unknown;
+                    return SyntaxKind.Marker;
             }
         }
 
-        public override HtmlToken CreateMarkerToken()
+        public override SyntaxToken CreateMarkerToken()
         {
-            return new HtmlToken(string.Empty, HtmlTokenType.Unknown);
+            return SyntaxFactory.Token(SyntaxKind.Marker, string.Empty);
         }
 
-        public override HtmlTokenType GetKnownTokenType(KnownTokenType type)
+        public override SyntaxKind GetKnownTokenType(KnownTokenType type)
         {
             switch (type)
             {
                 case KnownTokenType.CommentStart:
-                    return HtmlTokenType.RazorCommentTransition;
+                    return SyntaxKind.RazorCommentTransition;
                 case KnownTokenType.CommentStar:
-                    return HtmlTokenType.RazorCommentStar;
+                    return SyntaxKind.RazorCommentStar;
                 case KnownTokenType.CommentBody:
-                    return HtmlTokenType.RazorComment;
+                    return SyntaxKind.RazorCommentLiteral;
                 case KnownTokenType.Identifier:
-                    return HtmlTokenType.Text;
+                    return SyntaxKind.Text;
                 case KnownTokenType.Keyword:
-                    return HtmlTokenType.Text;
+                    return SyntaxKind.Text;
                 case KnownTokenType.NewLine:
-                    return HtmlTokenType.NewLine;
+                    return SyntaxKind.NewLine;
                 case KnownTokenType.Transition:
-                    return HtmlTokenType.Transition;
-                case KnownTokenType.WhiteSpace:
-                    return HtmlTokenType.WhiteSpace;
+                    return SyntaxKind.Transition;
+                case KnownTokenType.Whitespace:
+                    return SyntaxKind.Whitespace;
                 default:
-                    return HtmlTokenType.Unknown;
+                    return SyntaxKind.Marker;
             }
         }
 
-        protected override HtmlToken CreateToken(string content, HtmlTokenType type, IReadOnlyList<RazorDiagnostic> errors)
+        protected override SyntaxToken CreateToken(string content, SyntaxKind kind, IReadOnlyList<RazorDiagnostic> errors)
         {
-            return new HtmlToken(content, type, errors);
+            return SyntaxFactory.Token(kind, content, errors);
         }
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs
index 2408c552dd..f06c8db1bc 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs
@@ -5,22 +5,27 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
-    internal class HtmlMarkupParser : TokenizerBackedParser<HtmlTokenizer, HtmlToken, HtmlTokenType>
+    internal class HtmlMarkupParser : TokenizerBackedParser<HtmlTokenizer>
     {
         private const string ScriptTagName = "script";
 
-        private static readonly HtmlToken[] nonAllowedHtmlCommentEnding = new[] { HtmlToken.Hyphen, new HtmlToken("!", HtmlTokenType.Bang), new HtmlToken("<", HtmlTokenType.OpenAngle) };
-        private static readonly HtmlToken[] singleHyphenArray = new[] { HtmlToken.Hyphen };
+        private static readonly SyntaxToken[] nonAllowedHtmlCommentEnding = new[]
+        {
+            SyntaxFactory.Token(SyntaxKind.Text, "-"),
+            SyntaxFactory.Token(SyntaxKind.Bang, "!"),
+            SyntaxFactory.Token(SyntaxKind.OpenAngle, "<"),
+        };
 
         private static readonly char[] ValidAfterTypeAttributeNameCharacters = { ' ', '\t', '\r', '\n', '\f', '=' };
         private SourceLocation _lastTagStart = SourceLocation.Zero;
-        private HtmlToken _bufferedOpenAngle;
+        private SyntaxToken _bufferedOpenAngle;
 
         //From http://dev.w3.org/html5/spec/Overview.html#elements-0
-        private ISet<string> _voidElements = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        private readonly ISet<string> _voidElements = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
         {
             "area",
             "base",
@@ -45,7 +50,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
         }
 
-        public ParserBase CodeParser { get; set; }
+        public CSharpCodeParser CodeParser { get; set; }
 
         public ISet<string> VoidElements
         {
@@ -59,44 +64,75 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             get { return CaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase; }
         }
 
-        protected override bool TokenTypeEquals(HtmlTokenType x, HtmlTokenType y) => x == y;
-
-        public override void BuildSpan(SpanBuilder span, SourceLocation start, string content)
+        // Special tags include <!--, <!DOCTYPE, <![CDATA and <? tags
+        private bool AtSpecialTag
         {
-            span.Kind = SpanKindInternal.Markup;
-            span.ChunkGenerator = new MarkupChunkGenerator();
-            base.BuildSpan(span, start, content);
+            get
+            {
+                if (At(SyntaxKind.OpenAngle))
+                {
+                    if (NextIs(SyntaxKind.Bang))
+                    {
+                        return !IsBangEscape(lookahead: 1);
+                    }
+
+                    return NextIs(SyntaxKind.QuestionMark);
+                }
+
+                return false;
+            }
         }
 
-        protected override void OutputSpanBeforeRazorComment()
+        public RazorDocumentSyntax ParseDocument()
         {
-            Output(SpanKindInternal.Markup);
+            if (Context == null)
+            {
+                throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
+            }
+
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            using (PushSpanContextConfig(DefaultMarkupSpanContext))
+            {
+                var builder = pooledResult.Builder;
+                NextToken();
+                while (!EndOfFile)
+                {
+                    SkipToAndParseCode(builder, SyntaxKind.OpenAngle);
+                    ParseTagInDocumentContext(builder);
+                }
+                AcceptMarkerTokenIfNecessary();
+                builder.Add(OutputAsMarkupLiteral());
+
+                var markup = SyntaxFactory.MarkupBlock(builder.ToList());
+
+                return SyntaxFactory.RazorDocument(markup);
+            }
         }
 
-        protected void SkipToAndParseCode(HtmlTokenType type)
+        private void SkipToAndParseCode(in SyntaxListBuilder<RazorSyntaxNode> builder, SyntaxKind type)
         {
-            SkipToAndParseCode(token => token.Type == type);
+            SkipToAndParseCode(builder, token => token.Kind == type);
         }
 
-        protected void SkipToAndParseCode(Func<HtmlToken, bool> condition)
+        private void SkipToAndParseCode(in SyntaxListBuilder<RazorSyntaxNode> builder, Func<SyntaxToken, bool> condition)
         {
-            HtmlToken last = null;
+            SyntaxToken last = null;
             var startOfLine = false;
             while (!EndOfFile && !condition(CurrentToken))
             {
                 if (Context.NullGenerateWhitespaceAndNewLine)
                 {
                     Context.NullGenerateWhitespaceAndNewLine = false;
-                    Span.ChunkGenerator = SpanChunkGenerator.Null;
-                    AcceptWhile(token => token.Type == HtmlTokenType.WhiteSpace);
-                    if (At(HtmlTokenType.NewLine))
+                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                    AcceptWhile(token => token.Kind == SyntaxKind.Whitespace);
+                    if (At(SyntaxKind.NewLine))
                     {
                         AcceptAndMoveNext();
                     }
 
-                    Output(SpanKindInternal.Markup);
+                    builder.Add(OutputAsMarkupEphemeralLiteral());
                 }
-                else if (At(HtmlTokenType.NewLine))
+                else if (At(SyntaxKind.NewLine))
                 {
                     if (last != null)
                     {
@@ -108,21 +144,21 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     last = null;
                     AcceptAndMoveNext();
                 }
-                else if (At(HtmlTokenType.Transition))
+                else if (At(SyntaxKind.Transition))
                 {
                     var transition = CurrentToken;
                     NextToken();
-                    if (At(HtmlTokenType.Transition))
+                    if (At(SyntaxKind.Transition))
                     {
                         if (last != null)
                         {
                             Accept(last);
                             last = null;
                         }
-                        Output(SpanKindInternal.Markup);
+                        builder.Add(OutputAsMarkupLiteral());
                         Accept(transition);
-                        Span.ChunkGenerator = SpanChunkGenerator.Null;
-                        Output(SpanKindInternal.Markup);
+                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                        builder.Add(OutputAsMarkupEphemeralLiteral());
                         AcceptAndMoveNext();
                         continue; // while
                     }
@@ -138,7 +174,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     // Handle whitespace rewriting
                     if (last != null)
                     {
-                        if (!Context.DesignTimeMode && last.Type == HtmlTokenType.WhiteSpace && startOfLine)
+                        if (!Context.DesignTimeMode && last.Kind == SyntaxKind.Whitespace && startOfLine)
                         {
                             // Put the whitespace back too
                             startOfLine = false;
@@ -153,46 +189,56 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         }
                     }
 
-                    OtherParserBlock();
+                    OtherParserBlock(builder);
                 }
-                else if (At(HtmlTokenType.RazorCommentTransition))
+                else if (At(SyntaxKind.RazorCommentTransition))
                 {
+                    var shouldRenderWhitespace = true;
                     if (last != null)
                     {
                         // Don't render the whitespace between the start of the line and the razor comment.
-                        if (startOfLine && last.Type == HtmlTokenType.WhiteSpace)
+                        if (startOfLine && last.Kind == SyntaxKind.Whitespace)
                         {
-                            AddMarkerTokenIfNecessary();
+                            AcceptMarkerTokenIfNecessary();
                             // Output the tokens that may have been accepted prior to the whitespace.
-                            Output(SpanKindInternal.Markup);
+                            builder.Add(OutputAsMarkupLiteral());
 
-                            Span.ChunkGenerator = SpanChunkGenerator.Null;
+                            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                            shouldRenderWhitespace = false;
                         }
 
                         Accept(last);
                         last = null;
                     }
 
-                    AddMarkerTokenIfNecessary();
-                    Output(SpanKindInternal.Markup);
+                    AcceptMarkerTokenIfNecessary();
+                    if (shouldRenderWhitespace)
+                    {
+                        builder.Add(OutputAsMarkupLiteral());
+                    }
+                    else
+                    {
+                        builder.Add(OutputAsMarkupEphemeralLiteral());
+                    }
 
-                    RazorComment();
+                    var comment = ParseRazorComment();
+                    builder.Add(comment);
 
                     // Handle the whitespace and newline at the end of a razor comment.
                     if (startOfLine &&
-                        (At(HtmlTokenType.NewLine) ||
-                        (At(HtmlTokenType.WhiteSpace) && NextIs(HtmlTokenType.NewLine))))
+                        (At(SyntaxKind.NewLine) ||
+                        (At(SyntaxKind.Whitespace) && NextIs(SyntaxKind.NewLine))))
                     {
                         AcceptWhile(IsSpacingToken(includeNewLines: false));
                         AcceptAndMoveNext();
-                        Span.ChunkGenerator = SpanChunkGenerator.Null;
-                        Output(SpanKindInternal.Markup);
+                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                        builder.Add(OutputAsMarkupEphemeralLiteral());
                     }
                 }
                 else
                 {
                     // As long as we see whitespace, we're still at the "start" of the line
-                    startOfLine &= At(HtmlTokenType.WhiteSpace);
+                    startOfLine &= At(SyntaxKind.Whitespace);
 
                     // If there's a last token, accept it
                     if (last != null)
@@ -213,311 +259,497 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        protected static Func<HtmlToken, bool> IsSpacingToken(bool includeNewLines)
+        /// <summary>
+        /// Reads the content of a tag (if present) in the MarkupDocument (or MarkupSection) context,
+        /// where we don't care about maintaining a stack of tags.
+        /// </summary>
+        private void ParseTagInDocumentContext(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
-            return token => token.Type == HtmlTokenType.WhiteSpace || (includeNewLines && token.Type == HtmlTokenType.NewLine);
-        }
-
-        private void OtherParserBlock()
-        {
-            AddMarkerTokenIfNecessary();
-            Output(SpanKindInternal.Markup);
-
-            using (PushSpanConfig())
+            if (At(SyntaxKind.OpenAngle))
             {
-                CodeParser.ParseBlock();
-            }
-
-            Span.Start = CurrentLocation;
-            Initialize(Span);
-            NextToken();
-        }
-
-        private bool IsBangEscape(int lookahead)
-        {
-            var potentialBang = Lookahead(lookahead);
-
-            if (potentialBang != null &&
-                potentialBang.Type == HtmlTokenType.Bang)
-            {
-                var afterBang = Lookahead(lookahead + 1);
-
-                return afterBang != null &&
-                    afterBang.Type == HtmlTokenType.Text &&
-                    !string.Equals(afterBang.Content, "DOCTYPE", StringComparison.OrdinalIgnoreCase);
-            }
-
-            return false;
-        }
-
-        private void OptionalBangEscape()
-        {
-            if (IsBangEscape(lookahead: 0))
-            {
-                Output(SpanKindInternal.Markup);
-
-                // Accept the parser escape character '!'.
-                Assert(HtmlTokenType.Bang);
-                AcceptAndMoveNext();
-
-                // Setup the metacode span that we will be outputing.
-                Span.ChunkGenerator = SpanChunkGenerator.Null;
-                Output(SpanKindInternal.MetaCode, AcceptedCharactersInternal.None);
-            }
-        }
-
-        public override void ParseBlock()
-        {
-            if (Context == null)
-            {
-                throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
-            }
-
-            using (PushSpanConfig(DefaultMarkupSpan))
-            {
-                using (Context.Builder.StartBlock(BlockKindInternal.Markup))
+                if (NextIs(SyntaxKind.Bang))
                 {
-                    Span.Start = CurrentLocation;
-
-                    if (!NextToken())
+                    // Checking to see if we meet the conditions of a special '!' tag: <!DOCTYPE, <![CDATA[, <!--.
+                    if (!IsBangEscape(lookahead: 1))
                     {
+                        if (Lookahead(2)?.Kind == SyntaxKind.DoubleHyphen)
+                        {
+                            builder.Add(OutputAsMarkupLiteral());
+                        }
+
+                        AcceptAndMoveNext(); // Accept '<'
+                        ParseBangTag(builder);
+
                         return;
                     }
 
-                    AcceptWhile(IsSpacingToken(includeNewLines: true));
+                    // We should behave like a normal tag that has a parser escape, fall through to the normal
+                    // tag logic.
+                }
+                else if (NextIs(SyntaxKind.QuestionMark))
+                {
+                    AcceptAndMoveNext(); // Accept '<'
+                    TryParseXmlPI(builder);
+                    return;
+                }
 
-                    if (CurrentToken.Type == HtmlTokenType.OpenAngle)
-                    {
-                        // "<" => Implicit Tag Block
-                        TagBlock(new Stack<Tuple<HtmlToken, SourceLocation>>());
-                    }
-                    else if (CurrentToken.Type == HtmlTokenType.Transition)
-                    {
-                        // "@" => Explicit Tag/Single Line Block OR Template
-                        Output(SpanKindInternal.Markup);
+                builder.Add(OutputAsMarkupLiteral());
 
-                        // Definitely have a transition span
-                        Assert(HtmlTokenType.Transition);
-                        AcceptAndMoveNext();
-                        Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                        Span.ChunkGenerator = SpanChunkGenerator.Null;
-                        Output(SpanKindInternal.Transition);
-                        if (At(HtmlTokenType.Transition))
+                // Start tag block
+                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                {
+                    var tagBuilder = pooledResult.Builder;
+                    AcceptAndMoveNext(); // Accept '<'
+
+                    if (!At(SyntaxKind.ForwardSlash))
+                    {
+                        ParseOptionalBangEscape(tagBuilder);
+
+                        // Parsing a start tag
+                        var scriptTag = At(SyntaxKind.Text) &&
+                                        string.Equals(CurrentToken.Content, "script", StringComparison.OrdinalIgnoreCase);
+                        TryAccept(SyntaxKind.Text);
+                        ParseTagContent(tagBuilder); // Parse the tag, don't care about the content
+                        TryAccept(SyntaxKind.ForwardSlash);
+                        TryAccept(SyntaxKind.CloseAngle);
+
+                        // If the script tag expects javascript content then we should do minimal parsing until we reach
+                        // the end script tag. Don't want to incorrectly parse a "var tag = '<input />';" as an HTML tag.
+                        if (scriptTag && !CurrentScriptTagExpectsHtml(tagBuilder))
                         {
-                            Span.ChunkGenerator = SpanChunkGenerator.Null;
-                            AcceptAndMoveNext();
-                            Output(SpanKindInternal.MetaCode);
+                            tagBuilder.Add(OutputAsMarkupLiteral());
+                            var block = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
+                            builder.Add(block);
+
+                            SkipToEndScriptAndParseCode(builder);
+                            return;
                         }
-                        AfterTransition();
                     }
                     else
                     {
-                        Context.ErrorSink.OnError(
-                            RazorDiagnosticFactory.CreateParsing_MarkupBlockMustStartWithTag(
-                                new SourceSpan(CurrentStart, CurrentToken.Content.Length)));
+                        // Parsing an end tag
+                        // This section can accept things like: '</p  >' or '</p>' etc.
+                        TryAccept(SyntaxKind.ForwardSlash);
+
+                        // Whitespace here is invalid (according to the spec)
+                        ParseOptionalBangEscape(tagBuilder);
+                        TryAccept(SyntaxKind.Text);
+                        TryAccept(SyntaxKind.Whitespace);
+                        TryAccept(SyntaxKind.CloseAngle);
                     }
-                    Output(SpanKindInternal.Markup);
+
+                    tagBuilder.Add(OutputAsMarkupLiteral());
+
+                    // End tag block
+                    var tagBlock = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
+                    builder.Add(tagBlock);
                 }
             }
         }
 
-        private void DefaultMarkupSpan(SpanBuilder span)
+        private void ParseTagContent(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
-            span.ChunkGenerator = new MarkupChunkGenerator();
-            span.EditHandler = new SpanEditHandler(Language.TokenizeString, AcceptedCharactersInternal.Any);
-        }
-
-        private void AfterTransition()
-        {
-            // "@:" => Explicit Single Line Block
-            if (CurrentToken.Type == HtmlTokenType.Text && CurrentToken.Content.Length > 0 && CurrentToken.Content[0] == ':')
+            if (!At(SyntaxKind.Whitespace) && !At(SyntaxKind.NewLine))
             {
-                // Split the token
-                Tuple<HtmlToken, HtmlToken> split = Language.SplitToken(CurrentToken, 1, HtmlTokenType.Colon);
-
-                // The first part (left) is added to this span and we return a MetaCode span
-                Accept(split.Item1);
-                Span.ChunkGenerator = SpanChunkGenerator.Null;
-                Output(SpanKindInternal.MetaCode);
-                if (split.Item2 != null)
+                // We should be right after the tag name, so if there's no whitespace or new line, something is wrong
+                RecoverToEndOfTag(builder);
+            }
+            else
+            {
+                // We are here ($): <tag$ foo="bar" biz="~/Baz" />
+                while (!EndOfFile && !IsEndOfTag())
                 {
-                    Accept(split.Item2);
+                    BeforeAttribute(builder);
                 }
-                NextToken();
-                SingleLineMarkup();
-            }
-            else if (CurrentToken.Type == HtmlTokenType.OpenAngle)
-            {
-                TagBlock(new Stack<Tuple<HtmlToken, SourceLocation>>());
             }
         }
 
-        private void SingleLineMarkup()
+        private bool IsEndOfTag()
         {
-            // Parse until a newline, it's that simple!
-            // First, signal to code parser that whitespace is significant to us.
-            var old = Context.WhiteSpaceIsSignificantToAncestorBlock;
-            Context.WhiteSpaceIsSignificantToAncestorBlock = true;
-            Span.EditHandler = new SpanEditHandler(Language.TokenizeString);
-            SkipToAndParseCode(HtmlTokenType.NewLine);
-            if (!EndOfFile && CurrentToken.Type == HtmlTokenType.NewLine)
+            if (At(SyntaxKind.ForwardSlash))
             {
+                if (NextIs(SyntaxKind.CloseAngle))
+                {
+                    return true;
+                }
+                else
+                {
+                    AcceptAndMoveNext();
+                }
+            }
+            return At(SyntaxKind.CloseAngle) || At(SyntaxKind.OpenAngle);
+        }
+
+        private void BeforeAttribute(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // http://dev.w3.org/html5/spec/tokenization.html#before-attribute-name-state
+            // Capture whitespace
+            var whitespace = ReadWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
+
+            if (At(SyntaxKind.Transition) || At(SyntaxKind.RazorCommentTransition))
+            {
+                // Transition outside of attribute value => Switch to recovery mode
+                Accept(whitespace);
+                RecoverToEndOfTag(builder);
+                return;
+            }
+
+            // http://dev.w3.org/html5/spec/tokenization.html#attribute-name-state
+            // Read the 'name' (i.e. read until the '=' or whitespace/newline)
+            var nameTokens = Enumerable.Empty<SyntaxToken>();
+            var whitespaceAfterAttributeName = Enumerable.Empty<SyntaxToken>();
+            if (IsValidAttributeNameToken(CurrentToken))
+            {
+                nameTokens = ReadWhile(token =>
+                                 token.Kind != SyntaxKind.Whitespace &&
+                                 token.Kind != SyntaxKind.NewLine &&
+                                 token.Kind != SyntaxKind.Equals &&
+                                 token.Kind != SyntaxKind.CloseAngle &&
+                                 token.Kind != SyntaxKind.OpenAngle &&
+                                 (token.Kind != SyntaxKind.ForwardSlash || !NextIs(SyntaxKind.CloseAngle)));
+
+                // capture whitespace after attribute name (if any)
+                whitespaceAfterAttributeName = ReadWhile(
+                    token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
+            }
+            else
+            {
+                // Unexpected character in tag, enter recovery
+                Accept(whitespace);
+                RecoverToEndOfTag(builder);
+                return;
+            }
+
+            if (!At(SyntaxKind.Equals))
+            {
+                // Minimized attribute
+
+                // We are at the prefix of the next attribute or the end of tag. Put it back so it is parsed later.
+                PutCurrentBack();
+                PutBack(whitespaceAfterAttributeName);
+
+                // Output anything prior to the attribute, in most cases this will be the tag name:
+                // |<input| checked />. If in-between other attributes this will noop or output malformed attribute
+                // content (if the previous attribute was malformed).
+                builder.Add(OutputAsMarkupLiteral());
+
+                Accept(whitespace);
+                var namePrefix = OutputAsMarkupLiteral();
+                Accept(nameTokens);
+                var name = OutputAsMarkupLiteral();
+
+                var minimizedAttributeBlock = SyntaxFactory.MarkupMinimizedAttributeBlock(namePrefix, name);
+                builder.Add(minimizedAttributeBlock);
+
+                return;
+            }
+
+            // Not a minimized attribute, parse as if it were well-formed (if attribute turns out to be malformed we
+            // will go into recovery).
+            builder.Add(OutputAsMarkupLiteral());
+
+            var attributeBlock = ParseAttributePrefix(whitespace, nameTokens, whitespaceAfterAttributeName);
+
+            builder.Add(attributeBlock);
+        }
+
+        private MarkupAttributeBlockSyntax ParseAttributePrefix(
+            IEnumerable<SyntaxToken> whitespace,
+            IEnumerable<SyntaxToken> nameTokens,
+            IEnumerable<SyntaxToken> whitespaceAfterAttributeName)
+        {
+            // First, determine if this is a 'data-' attribute (since those can't use conditional attributes)
+            var nameContent = string.Concat(nameTokens.Select(s => s.Content));
+            var attributeCanBeConditional =
+                Context.FeatureFlags.EXPERIMENTAL_AllowConditionalDataDashAttributes ||
+                !nameContent.StartsWith("data-", StringComparison.OrdinalIgnoreCase);
+
+            // Accept the whitespace and name
+            Accept(whitespace);
+            var namePrefix = OutputAsMarkupLiteral();
+            Accept(nameTokens);
+            var name = OutputAsMarkupLiteral();
+
+            // Since this is not a minimized attribute, the whitespace after attribute name belongs to this attribute.
+            Accept(whitespaceAfterAttributeName);
+            var nameSuffix = OutputAsMarkupLiteral();
+            Assert(SyntaxKind.Equals); // We should be at "="
+            var equalsToken = EatCurrentToken();
+
+            var whitespaceAfterEquals = ReadWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
+            var quote = SyntaxKind.Marker;
+            if (At(SyntaxKind.SingleQuote) || At(SyntaxKind.DoubleQuote))
+            {
+                // Found a quote, the whitespace belongs to this attribute.
+                Accept(whitespaceAfterEquals);
+                quote = CurrentToken.Kind;
                 AcceptAndMoveNext();
-                Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
             }
-            PutCurrentBack();
-            Context.WhiteSpaceIsSignificantToAncestorBlock = old;
-            Output(SpanKindInternal.Markup);
-        }
-
-        private void TagBlock(Stack<Tuple<HtmlToken, SourceLocation>> tags)
-        {
-            // Skip Whitespace and Text
-            var complete = false;
-            do
+            else if (whitespaceAfterEquals.Any())
             {
-                SkipToAndParseCode(HtmlTokenType.OpenAngle);
+                // No quotes found after the whitespace. Put it back so that it can be parsed later.
+                PutCurrentBack();
+                PutBack(whitespaceAfterEquals);
+            }
 
-                // Output everything prior to the OpenAngle into a markup span
-                Output(SpanKindInternal.Markup);
+            MarkupTextLiteralSyntax valuePrefix = null;
+            RazorBlockSyntax attributeValue = null;
+            MarkupTextLiteralSyntax valueSuffix = null;
 
-                // Do not want to start a new tag block if we're at the end of the file.
-                IDisposable tagBlockWrapper = null;
-                try
+            if (attributeCanBeConditional)
+            {
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null; // The block chunk generator will render the prefix
+
+                // We now have the value prefix which is usually whitespace and/or a quote
+                valuePrefix = OutputAsMarkupLiteral();
+
+                // Read the attribute value only if the value is quoted
+                // or if there is no whitespace between '=' and the unquoted value.
+                if (quote != SyntaxKind.Marker || !whitespaceAfterEquals.Any())
                 {
-                    var atSpecialTag = AtSpecialTag;
-
-                    if (!EndOfFile && !atSpecialTag)
+                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
                     {
-                        // Start a Block tag.  This is used to wrap things like <p> or <a class="btn"> etc.
-                        tagBlockWrapper = Context.Builder.StartBlock(BlockKindInternal.Tag);
-                    }
-
-                    if (EndOfFile)
-                    {
-                        EndTagBlock(tags, complete: true);
-                    }
-                    else
-                    {
-                        _bufferedOpenAngle = null;
-                        _lastTagStart = CurrentStart;
-                        Assert(HtmlTokenType.OpenAngle);
-                        _bufferedOpenAngle = CurrentToken;
-                        var tagStart = CurrentStart;
-                        if (!NextToken())
+                        var attributeValueBuilder = pooledResult.Builder;
+                        // Read the attribute value.
+                        while (!EndOfFile && !IsEndOfAttributeValue(quote, CurrentToken))
                         {
-                            Accept(_bufferedOpenAngle);
-                            EndTagBlock(tags, complete: false);
+                            ParseAttributeValue(attributeValueBuilder, quote);
                         }
-                        else
+
+                        if (attributeValueBuilder.Count > 0)
                         {
-                            complete = AfterTagStart(tagStart, tags, atSpecialTag, tagBlockWrapper);
+                            attributeValue = SyntaxFactory.GenericBlock(attributeValueBuilder.ToList());
                         }
                     }
-
-                    if (complete)
-                    {
-                        // Completed tags have no accepted characters inside of blocks.
-                        Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                    }
-
-                    // Output the contents of the tag into its own markup span.
-                    Output(SpanKindInternal.Markup);
                 }
-                finally
+
+                // Capture the suffix
+                if (quote != SyntaxKind.Marker && At(quote))
                 {
-                    // Will be null if we were at end of file or special tag when initially created.
-                    if (tagBlockWrapper != null)
+                    AcceptAndMoveNext();
+                    // Again, block chunk generator will render the suffix
+                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                    valueSuffix = OutputAsMarkupLiteral();
+                }
+            }
+            else if (quote != SyntaxKind.Marker || !whitespaceAfterEquals.Any())
+            {
+                valuePrefix = OutputAsMarkupLiteral();
+
+                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                {
+                    var attributeValueBuilder = pooledResult.Builder;
+                    // Not a "conditional" attribute, so just read the value
+                    SkipToAndParseCode(attributeValueBuilder, token => IsEndOfAttributeValue(quote, token));
+
+                    // Output already accepted tokens if any as markup literal
+                    var literalValue = OutputAsMarkupLiteral();
+                    attributeValueBuilder.Add(literalValue);
+
+                    // Capture the attribute value (will include everything in-between the attribute's quotes).
+                    attributeValue = SyntaxFactory.GenericBlock(attributeValueBuilder.ToList());
+                }
+
+                if (quote != SyntaxKind.Marker)
+                {
+                    TryAccept(quote);
+                    valueSuffix = OutputAsMarkupLiteral();
+                }
+            }
+            else
+            {
+                // There is no quote and there is whitespace after equals. There is no attribute value.
+            }
+
+            return SyntaxFactory.MarkupAttributeBlock(namePrefix, name, nameSuffix, equalsToken, valuePrefix, attributeValue, valueSuffix);
+        }
+
+        private void ParseAttributeValue(in SyntaxListBuilder<RazorSyntaxNode> builder, SyntaxKind quote)
+        {
+            var prefixStart = CurrentStart;
+            var prefixTokens = ReadWhile(token => token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.NewLine);
+
+            if (At(SyntaxKind.Transition))
+            {
+                if (NextIs(SyntaxKind.Transition))
+                {
+                    // Wrapping this in a block so that the ConditionalAttributeCollapser doesn't rewrite it.
+                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
                     {
-                        // End tag block
-                        tagBlockWrapper.Dispose();
+                        var markupBuilder = pooledResult.Builder;
+                        Accept(prefixTokens);
+
+                        // Render a single "@" in place of "@@".
+                        SpanContext.ChunkGenerator = new LiteralAttributeChunkGenerator(
+                            new LocationTagged<string>(string.Concat(prefixTokens.Select(s => s.Content)), prefixStart),
+                            new LocationTagged<string>(CurrentToken.Content, CurrentStart));
+                        AcceptAndMoveNext();
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                        markupBuilder.Add(OutputAsMarkupLiteral());
+
+                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                        AcceptAndMoveNext();
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                        markupBuilder.Add(OutputAsMarkupEphemeralLiteral());
+
+                        var markupBlock = SyntaxFactory.MarkupBlock(markupBuilder.ToList());
+                        builder.Add(markupBlock);
+                    }
+                }
+                else
+                {
+                    Accept(prefixTokens);
+                    var valueStart = CurrentStart;
+                    PutCurrentBack();
+
+                    var prefix = OutputAsMarkupLiteral();
+
+                    // Dynamic value, start a new block and set the chunk generator
+                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                    {
+                        var dynamicAttributeValueBuilder = pooledResult.Builder;
+
+                        OtherParserBlock(dynamicAttributeValueBuilder);
+                        var value = SyntaxFactory.MarkupDynamicAttributeValue(prefix, SyntaxFactory.GenericBlock(dynamicAttributeValueBuilder.ToList()));
+                        builder.Add(value);
                     }
                 }
             }
-            while (tags.Count > 0);
+            else
+            {
+                Accept(prefixTokens);
+                var prefix = OutputAsMarkupLiteral();
 
-            EndTagBlock(tags, complete);
+                // Literal value
+                // 'quote' should be "Unknown" if not quoted and tokens coming from the tokenizer should never have
+                // "Unknown" type.
+                var valueTokens = ReadWhile(token =>
+                    // These three conditions find separators which break the attribute value into portions
+                    token.Kind != SyntaxKind.Whitespace &&
+                    token.Kind != SyntaxKind.NewLine &&
+                    token.Kind != SyntaxKind.Transition &&
+                    // This condition checks for the end of the attribute value (it repeats some of the checks above
+                    // but for now that's ok)
+                    !IsEndOfAttributeValue(quote, token));
+                Accept(valueTokens);
+                var value = OutputAsMarkupLiteral();
+
+                var literalAttributeValue = SyntaxFactory.MarkupLiteralAttributeValue(prefix, value);
+                builder.Add(literalAttributeValue);
+            }
         }
 
-        private bool AfterTagStart(SourceLocation tagStart,
-                                   Stack<Tuple<HtmlToken, SourceLocation>> tags,
-                                   bool atSpecialTag,
-                                   IDisposable tagBlockWrapper)
+        private void RecoverToEndOfTag(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
+            // Accept until ">", "/" or "<", but parse code
+            while (!EndOfFile)
+            {
+                SkipToAndParseCode(builder, IsTagRecoveryStopPoint);
+                if (!EndOfFile)
+                {
+                    EnsureCurrent();
+                    switch (CurrentToken.Kind)
+                    {
+                        case SyntaxKind.SingleQuote:
+                        case SyntaxKind.DoubleQuote:
+                            ParseQuoted(builder);
+                            break;
+                        case SyntaxKind.OpenAngle:
+                        // Another "<" means this tag is invalid.
+                        case SyntaxKind.ForwardSlash:
+                        // Empty tag
+                        case SyntaxKind.CloseAngle:
+                            // End of tag
+                            return;
+                        default:
+                            AcceptAndMoveNext();
+                            break;
+                    }
+                }
+            }
+        }
+
+        private bool IsTagRecoveryStopPoint(SyntaxToken token)
+        {
+            return token.Kind == SyntaxKind.CloseAngle ||
+                   token.Kind == SyntaxKind.ForwardSlash ||
+                   token.Kind == SyntaxKind.OpenAngle ||
+                   token.Kind == SyntaxKind.SingleQuote ||
+                   token.Kind == SyntaxKind.DoubleQuote;
+        }
+
+        private bool IsEndOfAttributeValue(SyntaxKind quote, SyntaxToken token)
+        {
+            return EndOfFile || token == null ||
+                   (quote != SyntaxKind.Marker
+                        ? token.Kind == quote // If quoted, just wait for the quote
+                        : IsUnquotedEndOfAttributeValue(token));
+        }
+
+        private bool IsUnquotedEndOfAttributeValue(SyntaxToken token)
+        {
+            // If unquoted, we have a larger set of terminating characters:
+            // http://dev.w3.org/html5/spec/tokenization.html#attribute-value-unquoted-state
+            // Also we need to detect "/" and ">"
+            return token.Kind == SyntaxKind.DoubleQuote ||
+                   token.Kind == SyntaxKind.SingleQuote ||
+                   token.Kind == SyntaxKind.OpenAngle ||
+                   token.Kind == SyntaxKind.Equals ||
+                   (token.Kind == SyntaxKind.ForwardSlash && NextIs(SyntaxKind.CloseAngle)) ||
+                   token.Kind == SyntaxKind.CloseAngle ||
+                   token.Kind == SyntaxKind.Whitespace ||
+                   token.Kind == SyntaxKind.NewLine;
+        }
+
+        private void ParseQuoted(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            var type = CurrentToken.Kind;
+            AcceptAndMoveNext();
+            SkipToAndParseCode(builder, type);
             if (!EndOfFile)
             {
-                switch (CurrentToken.Type)
-                {
-                    case HtmlTokenType.ForwardSlash:
-                        // End Tag
-                        return EndTag(tagStart, tags, tagBlockWrapper);
-                    case HtmlTokenType.Bang:
-                        // Comment, CDATA, DOCTYPE, or a parser-escaped HTML tag.
-                        if (atSpecialTag)
-                        {
-                            Accept(_bufferedOpenAngle);
-                            return BangTag();
-                        }
-                        else
-                        {
-                            goto default;
-                        }
-                    case HtmlTokenType.QuestionMark:
-                        // XML PI
-                        Accept(_bufferedOpenAngle);
-                        return XmlPI();
-                    default:
-                        // Start Tag
-                        return StartTag(tags, tagBlockWrapper);
-                }
+                Assert(type);
+                AcceptAndMoveNext();
             }
-            if (tags.Count == 0)
-            {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_OuterTagMissingName(
-                        new SourceSpan(CurrentStart, contentLength: 1 /* end of file */)));
-            }
-            return false;
         }
 
-        private bool XmlPI()
-        {
-            // Accept "?"
-            Assert(HtmlTokenType.QuestionMark);
-            AcceptAndMoveNext();
-            return AcceptUntilAll(HtmlTokenType.QuestionMark, HtmlTokenType.CloseAngle);
-        }
-
-        private bool BangTag()
+        private bool ParseBangTag(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
             // Accept "!"
-            Assert(HtmlTokenType.Bang);
+            Assert(SyntaxKind.Bang);
 
             if (AcceptAndMoveNext())
             {
                 if (IsHtmlCommentAhead())
                 {
-                    using (Context.Builder.StartBlock(BlockKindInternal.HtmlComment))
+                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
                     {
+                        var htmlCommentBuilder = pooledResult.Builder;
+
                         // Accept the double-hyphen token at the beginning of the comment block.
                         AcceptAndMoveNext();
-                        Output(SpanKindInternal.Markup, AcceptedCharactersInternal.None);
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                        htmlCommentBuilder.Add(OutputAsMarkupLiteral());
 
-                        Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.WhiteSpace;
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
                         while (!EndOfFile)
                         {
-                            SkipToAndParseCode(HtmlTokenType.DoubleHyphen);
+                            SkipToAndParseCode(htmlCommentBuilder, SyntaxKind.DoubleHyphen);
                             var lastDoubleHyphen = AcceptAllButLastDoubleHyphens();
 
-                            if (At(HtmlTokenType.CloseAngle))
+                            if (At(SyntaxKind.CloseAngle))
                             {
                                 // Output the content in the comment block as a separate markup
-                                Output(SpanKindInternal.Markup, AcceptedCharactersInternal.WhiteSpace);
+                                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
+                                htmlCommentBuilder.Add(OutputAsMarkupLiteral());
 
                                 // This is the end of a comment block
                                 Accept(lastDoubleHyphen);
                                 AcceptAndMoveNext();
-                                Output(SpanKindInternal.Markup, AcceptedCharactersInternal.None);
+                                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                                htmlCommentBuilder.Add(OutputAsMarkupLiteral());
+                                var commentBlock = SyntaxFactory.MarkupCommentBlock(htmlCommentBuilder.ToList());
+                                builder.Add(commentBlock);
                                 return true;
                             }
                             else if (lastDoubleHyphen != null)
@@ -527,63 +759,32 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         }
                     }
                 }
-                else if (CurrentToken.Type == HtmlTokenType.LeftBracket)
+                else if (CurrentToken.Kind == SyntaxKind.LeftBracket)
                 {
                     if (AcceptAndMoveNext())
                     {
-                        return CData();
+                        return TryParseCData(builder);
                     }
                 }
                 else
                 {
                     AcceptAndMoveNext();
-                    return AcceptUntilAll(HtmlTokenType.CloseAngle);
+                    return AcceptTokenUntilAll(builder, SyntaxKind.CloseAngle);
                 }
             }
 
             return false;
         }
 
-        protected HtmlToken AcceptAllButLastDoubleHyphens()
+        internal static bool IsHyphen(SyntaxToken token)
         {
-            var lastDoubleHyphen = CurrentToken;
-            AcceptWhile(s =>
-            {
-                if (NextIs(HtmlTokenType.DoubleHyphen))
-                {
-                    lastDoubleHyphen = s;
-                    return true;
-                }
-
-                return false;
-            });
-
-            NextToken();
-
-            if (At(HtmlTokenType.Text) && IsHyphen(CurrentToken))
-            {
-                // Doing this here to maintain the order of tokens
-                if (!NextIs(HtmlTokenType.CloseAngle))
-                {
-                    Accept(lastDoubleHyphen);
-                    lastDoubleHyphen = null;
-                }
-
-                AcceptAndMoveNext();
-            }
-
-            return lastDoubleHyphen;
-        }
-
-        internal static bool IsHyphen(HtmlToken token)
-        {
-            return token.Equals(HtmlToken.Hyphen);
+            return token.Kind == SyntaxKind.Text && token.Content == "-";
         }
 
         protected bool IsHtmlCommentAhead()
         {
             // From HTML5 Specification, available at http://www.w3.org/TR/html52/syntax.html#comments
-            
+
             // Comments must have the following format:
             // 1. The string "<!--"
             // 2. Optionally, text, with the additional restriction that the text
@@ -595,13 +796,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             //      2.3 nor end with the string "<!-".
             // 3. The string "-->"
 
-            if (CurrentToken.Type != HtmlTokenType.DoubleHyphen)
+            if (CurrentToken.Kind != SyntaxKind.DoubleHyphen)
             {
                 return false;
             }
 
             // Check condition 2.1
-            if (NextIs(HtmlTokenType.CloseAngle) || NextIs(next => IsHyphen(next) && NextIs(HtmlTokenType.CloseAngle)))
+            if (NextIs(SyntaxKind.CloseAngle) || NextIs(next => IsHyphen(next) && NextIs(SyntaxKind.CloseAngle)))
             {
                 return false;
             }
@@ -610,15 +811,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             var isValidComment = false;
             LookaheadUntil((token, prevTokens) =>
             {
-                if (token.Type == HtmlTokenType.DoubleHyphen)
+                if (token.Kind == SyntaxKind.DoubleHyphen)
                 {
-                    if (NextIs(HtmlTokenType.CloseAngle))
+                    if (NextIs(SyntaxKind.CloseAngle))
                     {
                         // Check condition 2.3: We're at the end of a comment. Check to make sure the text ending is allowed.
                         isValidComment = !IsCommentContentEndingInvalid(prevTokens);
                         return true;
                     }
-                    else if (NextIs(ns => IsHyphen(ns) && NextIs(HtmlTokenType.CloseAngle)))
+                    else if (NextIs(ns => IsHyphen(ns) && NextIs(SyntaxKind.CloseAngle)))
                     {
                         // Check condition 2.3: we're at the end of a comment, which has an extra dash.
                         // Need to treat the dash as part of the content and check the ending.
@@ -627,17 +828,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         isValidComment = true;
                         return true;
                     }
-                    else if (NextIs(ns => ns.Type == HtmlTokenType.Bang && NextIs(HtmlTokenType.CloseAngle)))
+                    else if (NextIs(ns => ns.Kind == SyntaxKind.Bang && NextIs(SyntaxKind.CloseAngle)))
                     {
                         // This is condition 2.2.3
                         isValidComment = false;
                         return true;
                     }
                 }
-                else if (token.Type == HtmlTokenType.OpenAngle)
+                else if (token.Kind == SyntaxKind.OpenAngle)
                 {
                     // Checking condition 2.2.1
-                    if (NextIs(ns => ns.Type == HtmlTokenType.Bang && NextIs(HtmlTokenType.DoubleHyphen)))
+                    if (NextIs(ns => ns.Kind == SyntaxKind.Bang && NextIs(SyntaxKind.DoubleHyphen)))
                     {
                         isValidComment = false;
                         return true;
@@ -653,13 +854,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         /// <summary>
         /// Verifies, that the sequence doesn't end with the "&lt;!-" HtmlTokens. Note, the first token is an opening bracket token
         /// </summary>
-        internal static bool IsCommentContentEndingInvalid(IEnumerable<HtmlToken> sequence)
+        internal static bool IsCommentContentEndingInvalid(IEnumerable<SyntaxToken> sequence)
         {
             var reversedSequence = sequence.Reverse();
             var index = 0;
             foreach (var item in reversedSequence)
             {
-                if (!item.Equals(nonAllowedHtmlCommentEnding[index++]))
+                if (!item.IsEquivalentTo(nonAllowedHtmlCommentEnding[index++]))
                 {
                     return false;
                 }
@@ -673,15 +874,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return false;
         }
 
-        private bool CData()
+        private bool TryParseCData(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
-            if (CurrentToken.Type == HtmlTokenType.Text && string.Equals(CurrentToken.Content, "cdata", StringComparison.OrdinalIgnoreCase))
+            if (CurrentToken.Kind == SyntaxKind.Text && string.Equals(CurrentToken.Content, "cdata", StringComparison.OrdinalIgnoreCase))
             {
                 if (AcceptAndMoveNext())
                 {
-                    if (CurrentToken.Type == HtmlTokenType.LeftBracket)
+                    if (CurrentToken.Kind == SyntaxKind.LeftBracket)
                     {
-                        return AcceptUntilAll(HtmlTokenType.RightBracket, HtmlTokenType.RightBracket, HtmlTokenType.CloseAngle);
+                        return AcceptTokenUntilAll(builder, SyntaxKind.RightBracket, SyntaxKind.RightBracket, SyntaxKind.CloseAngle);
                     }
                 }
             }
@@ -689,701 +890,65 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return false;
         }
 
-        private bool EndTag(SourceLocation tagStart,
-                            Stack<Tuple<HtmlToken, SourceLocation>> tags,
-                            IDisposable tagBlockWrapper)
+        private bool TryParseXmlPI(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
-            // Accept "/" and move next
-            Assert(HtmlTokenType.ForwardSlash);
-            var forwardSlash = CurrentToken;
-            if (!NextToken())
-            {
-                Accept(_bufferedOpenAngle);
-                Accept(forwardSlash);
-                return false;
-            }
-            else
-            {
-                var tagName = string.Empty;
-                HtmlToken bangToken = null;
-
-                if (At(HtmlTokenType.Bang))
-                {
-                    bangToken = CurrentToken;
-
-                    var nextToken = Lookahead(count: 1);
-
-                    if (nextToken != null && nextToken.Type == HtmlTokenType.Text)
-                    {
-                        tagName = "!" + nextToken.Content;
-                    }
-                }
-                else if (At(HtmlTokenType.Text))
-                {
-                    tagName = CurrentToken.Content;
-                }
-
-                var matched = RemoveTag(tags, tagName, tagStart);
-
-                if (tags.Count == 0 &&
-                    // Note tagName may contain a '!' escape character. This ensures </!text> doesn't match here.
-                    // </!text> tags are treated like any other escaped HTML end tag.
-                    string.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase) &&
-                    matched)
-                {
-                    return EndTextTag(forwardSlash, tagBlockWrapper);
-                }
-                Accept(_bufferedOpenAngle);
-                Accept(forwardSlash);
-
-                OptionalBangEscape();
-
-                AcceptUntil(HtmlTokenType.CloseAngle);
-
-                // Accept the ">"
-                return Optional(HtmlTokenType.CloseAngle);
-            }
-        }
-
-        private void RecoverTextTag()
-        {
-            // We don't want to skip-to and parse because there shouldn't be anything in the body of text tags.
-            AcceptUntil(HtmlTokenType.CloseAngle, HtmlTokenType.NewLine);
-
-            // Include the close angle in the text tag block if it's there, otherwise just move on
-            Optional(HtmlTokenType.CloseAngle);
-        }
-
-        private bool EndTextTag(HtmlToken solidus, IDisposable tagBlockWrapper)
-        {
-            Accept(_bufferedOpenAngle);
-            Accept(solidus);
-
-            var textLocation = CurrentStart;
-            Assert(HtmlTokenType.Text);
+            // Accept "?"
+            Assert(SyntaxKind.QuestionMark);
             AcceptAndMoveNext();
-
-            var seenCloseAngle = Optional(HtmlTokenType.CloseAngle);
-
-            if (!seenCloseAngle)
-            {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
-                        new SourceSpan(textLocation, contentLength: 4 /* text */)));
-
-                Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
-                RecoverTextTag();
-            }
-            else
-            {
-                Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-            }
-
-            Span.ChunkGenerator = SpanChunkGenerator.Null;
-
-            CompleteTagBlockWithSpan(tagBlockWrapper, Span.EditHandler.AcceptedCharacters, SpanKindInternal.Transition);
-
-            return seenCloseAngle;
+            return AcceptTokenUntilAll(builder, SyntaxKind.QuestionMark, SyntaxKind.CloseAngle);
         }
 
-        // Special tags include <!--, <!DOCTYPE, <![CDATA and <? tags
-        private bool AtSpecialTag
+        private void ParseOptionalBangEscape(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
-            get
+            if (IsBangEscape(lookahead: 0))
             {
-                if (At(HtmlTokenType.OpenAngle))
-                {
-                    if (NextIs(HtmlTokenType.Bang))
-                    {
-                        return !IsBangEscape(lookahead: 1);
-                    }
-
-                    return NextIs(HtmlTokenType.QuestionMark);
-                }
-
-                return false;
-            }
-        }
-
-        private bool IsTagRecoveryStopPoint(HtmlToken token)
-        {
-            return token.Type == HtmlTokenType.CloseAngle ||
-                   token.Type == HtmlTokenType.ForwardSlash ||
-                   token.Type == HtmlTokenType.OpenAngle ||
-                   token.Type == HtmlTokenType.SingleQuote ||
-                   token.Type == HtmlTokenType.DoubleQuote;
-        }
-
-        private void TagContent()
-        {
-            if (!At(HtmlTokenType.WhiteSpace) && !At(HtmlTokenType.NewLine))
-            {
-                // We should be right after the tag name, so if there's no whitespace or new line, something is wrong
-                RecoverToEndOfTag();
-            }
-            else
-            {
-                // We are here ($): <tag$ foo="bar" biz="~/Baz" />
-                while (!EndOfFile && !IsEndOfTag())
-                {
-                    BeforeAttribute();
-                }
-            }
-        }
-
-        private bool IsEndOfTag()
-        {
-            if (At(HtmlTokenType.ForwardSlash))
-            {
-                if (NextIs(HtmlTokenType.CloseAngle))
-                {
-                    return true;
-                }
-                else
-                {
-                    AcceptAndMoveNext();
-                }
-            }
-            return At(HtmlTokenType.CloseAngle) || At(HtmlTokenType.OpenAngle);
-        }
-
-        private void BeforeAttribute()
-        {
-            // http://dev.w3.org/html5/spec/tokenization.html#before-attribute-name-state
-            // Capture whitespace
-            var whitespace = ReadWhile(token => token.Type == HtmlTokenType.WhiteSpace || token.Type == HtmlTokenType.NewLine);
-
-            if (At(HtmlTokenType.Transition))
-            {
-                // Transition outside of attribute value => Switch to recovery mode
-                Accept(whitespace);
-                RecoverToEndOfTag();
-                return;
-            }
-
-            // http://dev.w3.org/html5/spec/tokenization.html#attribute-name-state
-            // Read the 'name' (i.e. read until the '=' or whitespace/newline)
-            var name = Enumerable.Empty<HtmlToken>();
-            var whitespaceAfterAttributeName = Enumerable.Empty<HtmlToken>();
-            if (IsValidAttributeNameToken(CurrentToken))
-            {
-                name = ReadWhile(token =>
-                                 token.Type != HtmlTokenType.WhiteSpace &&
-                                 token.Type != HtmlTokenType.NewLine &&
-                                 token.Type != HtmlTokenType.Equals &&
-                                 token.Type != HtmlTokenType.CloseAngle &&
-                                 token.Type != HtmlTokenType.OpenAngle &&
-                                 (token.Type != HtmlTokenType.ForwardSlash || !NextIs(HtmlTokenType.CloseAngle)));
-
-                // capture whitespace after attribute name (if any)
-                whitespaceAfterAttributeName = ReadWhile(
-                    token => token.Type == HtmlTokenType.WhiteSpace || token.Type == HtmlTokenType.NewLine);
-            }
-            else
-            {
-                // Unexpected character in tag, enter recovery
-                Accept(whitespace);
-                RecoverToEndOfTag();
-                return;
-            }
-
-            if (!At(HtmlTokenType.Equals))
-            {
-                // Minimized attribute
-
-                // We are at the prefix of the next attribute or the end of tag. Put it back so it is parsed later.
-                PutCurrentBack();
-                PutBack(whitespaceAfterAttributeName);
-
-                // Output anything prior to the attribute, in most cases this will be the tag name:
-                // |<input| checked />. If in-between other attributes this will noop or output malformed attribute
-                // content (if the previous attribute was malformed).
-                Output(SpanKindInternal.Markup);
-
-                using (Context.Builder.StartBlock(BlockKindInternal.Markup))
-                {
-                    Accept(whitespace);
-                    Accept(name);
-                    Output(SpanKindInternal.Markup);
-                }
-
-                return;
-            }
-
-            // Not a minimized attribute, parse as if it were well-formed (if attribute turns out to be malformed we
-            // will go into recovery).
-            Output(SpanKindInternal.Markup);
-
-            // Start a new markup block for the attribute
-            using (Context.Builder.StartBlock(BlockKindInternal.Markup))
-            {
-                AttributePrefix(whitespace, name, whitespaceAfterAttributeName);
-            }
-        }
-
-        private void AttributePrefix(
-            IEnumerable<HtmlToken> whitespace,
-            IEnumerable<HtmlToken> nameTokens,
-            IEnumerable<HtmlToken> whitespaceAfterAttributeName)
-        {
-            // First, determine if this is a 'data-' attribute (since those can't use conditional attributes)
-            var name = string.Concat(nameTokens.Select(s => s.Content));
-            var attributeCanBeConditional = 
-                Context.FeatureFlags.EXPERIMENTAL_AllowConditionalDataDashAttributes ||
-                !name.StartsWith("data-", StringComparison.OrdinalIgnoreCase);
-
-            // Accept the whitespace and name
-            Accept(whitespace);
-            Accept(nameTokens);
-
-            // Since this is not a minimized attribute, the whitespace after attribute name belongs to this attribute.
-            Accept(whitespaceAfterAttributeName);
-            Assert(HtmlTokenType.Equals); // We should be at "="
-            AcceptAndMoveNext();
-
-            var whitespaceAfterEquals = ReadWhile(token => token.Type == HtmlTokenType.WhiteSpace || token.Type == HtmlTokenType.NewLine);
-            var quote = HtmlTokenType.Unknown;
-            if (At(HtmlTokenType.SingleQuote) || At(HtmlTokenType.DoubleQuote))
-            {
-                // Found a quote, the whitespace belongs to this attribute.
-                Accept(whitespaceAfterEquals);
-                quote = CurrentToken.Type;
-                AcceptAndMoveNext();
-            }
-            else if (whitespaceAfterEquals.Any())
-            {
-                // No quotes found after the whitespace. Put it back so that it can be parsed later.
-                PutCurrentBack();
-                PutBack(whitespaceAfterEquals);
-            }
-
-            // We now have the prefix: (i.e. '      foo="')
-            var prefix = new LocationTagged<string>(string.Concat(Span.Tokens.Select(s => s.Content)), Span.Start);
-
-            if (attributeCanBeConditional)
-            {
-                Span.ChunkGenerator = SpanChunkGenerator.Null; // The block chunk generator will render the prefix
-                Output(SpanKindInternal.Markup);
-
-                // Read the attribute value only if the value is quoted
-                // or if there is no whitespace between '=' and the unquoted value.
-                if (quote != HtmlTokenType.Unknown || !whitespaceAfterEquals.Any())
-                {
-                    // Read the attribute value.
-                    while (!EndOfFile && !IsEndOfAttributeValue(quote, CurrentToken))
-                    {
-                        AttributeValue(quote);
-                    }
-                }
-
-                // Capture the suffix
-                var suffix = new LocationTagged<string>(string.Empty, CurrentStart);
-                if (quote != HtmlTokenType.Unknown && At(quote))
-                {
-                    suffix = new LocationTagged<string>(CurrentToken.Content, CurrentStart);
-                    AcceptAndMoveNext();
-                }
-
-                if (Span.Tokens.Count > 0)
-                {
-                    // Again, block chunk generator will render the suffix
-                    Span.ChunkGenerator = SpanChunkGenerator.Null;
-                    Output(SpanKindInternal.Markup);
-                }
-
-                // Create the block chunk generator
-                Context.Builder.CurrentBlock.ChunkGenerator = new AttributeBlockChunkGenerator(
-                    name, prefix, suffix);
-            }
-            else
-            {
-                // Output the attribute name, the equals and optional quote. Ex: foo="
-                Output(SpanKindInternal.Markup);
-
-                if (quote == HtmlTokenType.Unknown && whitespaceAfterEquals.Any())
-                {
-                    return;
-                }
-
-                // Not a "conditional" attribute, so just read the value
-                SkipToAndParseCode(token => IsEndOfAttributeValue(quote, token));
-
-                // Output the attribute value (will include everything in-between the attribute's quotes).
-                Output(SpanKindInternal.Markup);
-
-                if (quote != HtmlTokenType.Unknown)
-                {
-                    Optional(quote);
-                }
-                Output(SpanKindInternal.Markup);
-            }
-        }
-
-        private void AttributeValue(HtmlTokenType quote)
-        {
-            var prefixStart = CurrentStart;
-            var prefix = ReadWhile(token => token.Type == HtmlTokenType.WhiteSpace || token.Type == HtmlTokenType.NewLine);
-
-            if (At(HtmlTokenType.Transition))
-            {
-                if (NextIs(HtmlTokenType.Transition))
-                {
-                    // Wrapping this in a block so that the ConditionalAttributeCollapser doesn't rewrite it.
-                    using (Context.Builder.StartBlock(BlockKindInternal.Markup))
-                    {
-                        Accept(prefix);
-
-                        // Render a single "@" in place of "@@".
-                        Span.ChunkGenerator = new LiteralAttributeChunkGenerator(
-                            new LocationTagged<string>(string.Concat(prefix.Select(s => s.Content)), prefixStart),
-                            new LocationTagged<string>(CurrentToken.Content, CurrentStart));
-                        AcceptAndMoveNext();
-                        Output(SpanKindInternal.Markup, AcceptedCharactersInternal.None);
-
-                        Span.ChunkGenerator = SpanChunkGenerator.Null;
-                        AcceptAndMoveNext();
-                        Output(SpanKindInternal.Markup, AcceptedCharactersInternal.None);
-                    }
-                }
-                else
-                {
-                    Accept(prefix);
-                    var valueStart = CurrentStart;
-                    PutCurrentBack();
-
-                    // Output the prefix but as a null-span. DynamicAttributeBlockChunkGenerator will render it
-                    Span.ChunkGenerator = SpanChunkGenerator.Null;
-
-                    // Dynamic value, start a new block and set the chunk generator
-                    using (Context.Builder.StartBlock(BlockKindInternal.Markup))
-                    {
-                        Context.Builder.CurrentBlock.ChunkGenerator =
-                            new DynamicAttributeBlockChunkGenerator(
-                                new LocationTagged<string>(string.Concat(prefix.Select(s => s.Content)), prefixStart),
-                                valueStart);
-
-                        OtherParserBlock();
-                    }
-                }
-            }
-            else
-            {
-                Accept(prefix);
-
-                // Literal value
-                // 'quote' should be "Unknown" if not quoted and tokens coming from the tokenizer should never have
-                // "Unknown" type.
-                var valueStart = CurrentStart;
-                var value = ReadWhile(token =>
-                    // These three conditions find separators which break the attribute value into portions
-                    token.Type != HtmlTokenType.WhiteSpace &&
-                    token.Type != HtmlTokenType.NewLine &&
-                    token.Type != HtmlTokenType.Transition &&
-                    // This condition checks for the end of the attribute value (it repeats some of the checks above
-                    // but for now that's ok)
-                    !IsEndOfAttributeValue(quote, token));
-                Accept(value);
-                Span.ChunkGenerator = new LiteralAttributeChunkGenerator(
-                    new LocationTagged<string>(string.Concat(prefix.Select(s => s.Content)), prefixStart),
-                    new LocationTagged<string>(string.Concat(value.Select(s => s.Content)), valueStart));
-            }
-            Output(SpanKindInternal.Markup);
-        }
-
-        private bool IsEndOfAttributeValue(HtmlTokenType quote, HtmlToken token)
-        {
-            return EndOfFile || token == null ||
-                   (quote != HtmlTokenType.Unknown
-                        ? token.Type == quote // If quoted, just wait for the quote
-                        : IsUnquotedEndOfAttributeValue(token));
-        }
-
-        private bool IsUnquotedEndOfAttributeValue(HtmlToken token)
-        {
-            // If unquoted, we have a larger set of terminating characters:
-            // http://dev.w3.org/html5/spec/tokenization.html#attribute-value-unquoted-state
-            // Also we need to detect "/" and ">"
-            return token.Type == HtmlTokenType.DoubleQuote ||
-                   token.Type == HtmlTokenType.SingleQuote ||
-                   token.Type == HtmlTokenType.OpenAngle ||
-                   token.Type == HtmlTokenType.Equals ||
-                   (token.Type == HtmlTokenType.ForwardSlash && NextIs(HtmlTokenType.CloseAngle)) ||
-                   token.Type == HtmlTokenType.CloseAngle ||
-                   token.Type == HtmlTokenType.WhiteSpace ||
-                   token.Type == HtmlTokenType.NewLine;
-        }
-
-        private void RecoverToEndOfTag()
-        {
-            // Accept until ">", "/" or "<", but parse code
-            while (!EndOfFile)
-            {
-                SkipToAndParseCode(IsTagRecoveryStopPoint);
-                if (!EndOfFile)
-                {
-                    EnsureCurrent();
-                    switch (CurrentToken.Type)
-                    {
-                        case HtmlTokenType.SingleQuote:
-                        case HtmlTokenType.DoubleQuote:
-                            ParseQuoted();
-                            break;
-                        case HtmlTokenType.OpenAngle:
-                        // Another "<" means this tag is invalid.
-                        case HtmlTokenType.ForwardSlash:
-                        // Empty tag
-                        case HtmlTokenType.CloseAngle:
-                            // End of tag
-                            return;
-                        default:
-                            AcceptAndMoveNext();
-                            break;
-                    }
-                }
-            }
-        }
-
-        private void ParseQuoted()
-        {
-            var type = CurrentToken.Type;
-            AcceptAndMoveNext();
-            ParseQuoted(type);
-        }
-
-        private void ParseQuoted(HtmlTokenType type)
-        {
-            SkipToAndParseCode(type);
-            if (!EndOfFile)
-            {
-                Assert(type);
-                AcceptAndMoveNext();
-            }
-        }
-
-        private bool StartTag(Stack<Tuple<HtmlToken, SourceLocation>> tags, IDisposable tagBlockWrapper)
-        {
-            HtmlToken bangToken = null;
-            HtmlToken potentialTagNameToken;
-
-            if (At(HtmlTokenType.Bang))
-            {
-                bangToken = CurrentToken;
-
-                potentialTagNameToken = Lookahead(count: 1);
-            }
-            else
-            {
-                potentialTagNameToken = CurrentToken;
-            }
-
-            HtmlToken tagName;
-
-            if (potentialTagNameToken == null || potentialTagNameToken.Type != HtmlTokenType.Text)
-            {
-                tagName = new HtmlToken(string.Empty, HtmlTokenType.Unknown);
-            }
-            else if (bangToken != null)
-            {
-                tagName = new HtmlToken("!" + potentialTagNameToken.Content, HtmlTokenType.Text);
-            }
-            else
-            {
-                tagName = potentialTagNameToken;
-            }
-
-            Tuple<HtmlToken, SourceLocation> tag = Tuple.Create(tagName, _lastTagStart);
-
-            if (tags.Count == 0 &&
-                // Note tagName may contain a '!' escape character. This ensures <!text> doesn't match here.
-                // <!text> tags are treated like any other escaped HTML start tag.
-                string.Equals(tag.Item1.Content, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase))
-            {
-                Output(SpanKindInternal.Markup);
-                Span.ChunkGenerator = SpanChunkGenerator.Null;
-
-                Accept(_bufferedOpenAngle);
-                var textLocation = CurrentStart;
-                Assert(HtmlTokenType.Text);
+                builder.Add(OutputAsMarkupLiteral());
 
+                // Accept the parser escape character '!'.
+                Assert(SyntaxKind.Bang);
                 AcceptAndMoveNext();
 
-                var bookmark = CurrentStart.AbsoluteIndex;
-                IEnumerable<HtmlToken> tokens = ReadWhile(IsSpacingToken(includeNewLines: true));
-                var empty = At(HtmlTokenType.ForwardSlash);
-                if (empty)
-                {
-                    Accept(tokens);
-                    Assert(HtmlTokenType.ForwardSlash);
-                    AcceptAndMoveNext();
-                    bookmark = CurrentStart.AbsoluteIndex;
-                    tokens = ReadWhile(IsSpacingToken(includeNewLines: true));
-                }
-
-                if (!Optional(HtmlTokenType.CloseAngle))
-                {
-                    Context.Source.Position = bookmark;
-                    NextToken();
-                    Context.ErrorSink.OnError(
-                        RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
-                            new SourceSpan(textLocation, contentLength: 4 /* text */)));
-
-                    RecoverTextTag();
-                }
-                else
-                {
-                    Accept(tokens);
-                    Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                }
-
-                if (!empty)
-                {
-                    tags.Push(tag);
-                }
-
-                CompleteTagBlockWithSpan(tagBlockWrapper, Span.EditHandler.AcceptedCharacters, SpanKindInternal.Transition);
-
-                return true;
+                // Setup the metacode span that we will be outputing.
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                builder.Add(OutputAsMetaCode(Output()));
             }
-
-            Accept(_bufferedOpenAngle);
-            OptionalBangEscape();
-            Optional(HtmlTokenType.Text);
-            return RestOfTag(tag, tags, tagBlockWrapper);
         }
 
-        private bool RestOfTag(Tuple<HtmlToken, SourceLocation> tag,
-                               Stack<Tuple<HtmlToken, SourceLocation>> tags,
-                               IDisposable tagBlockWrapper)
+        private bool IsBangEscape(int lookahead)
         {
-            TagContent();
+            var potentialBang = Lookahead(lookahead);
 
-            // We are now at a possible end of the tag
-            // Found '<', so we just abort this tag.
-            if (At(HtmlTokenType.OpenAngle))
+            if (potentialBang != null &&
+                potentialBang.Kind == SyntaxKind.Bang)
             {
-                return false;
+                var afterBang = Lookahead(lookahead + 1);
+
+                return afterBang != null &&
+                    afterBang.Kind == SyntaxKind.Text &&
+                    !string.Equals(afterBang.Content, "DOCTYPE", StringComparison.OrdinalIgnoreCase);
             }
 
-            var isEmpty = At(HtmlTokenType.ForwardSlash);
-            // Found a solidus, so don't accept it but DON'T push the tag to the stack
-            if (isEmpty)
-            {
-                AcceptAndMoveNext();
-            }
-
-            // Check for the '>' to determine if the tag is finished
-            var seenClose = Optional(HtmlTokenType.CloseAngle);
-            if (!seenClose)
-            {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
-                        new SourceSpan(
-                            SourceLocationTracker.Advance(tag.Item2, "<"),
-                            Math.Max(tag.Item1.Content.Length, 1)),
-                        tag.Item1.Content));
-            }
-            else
-            {
-                if (!isEmpty)
-                {
-                    // Is this a void element?
-                    var tagName = tag.Item1.Content.Trim();
-                    if (VoidElements.Contains(tagName))
-                    {
-                        CompleteTagBlockWithSpan(tagBlockWrapper, AcceptedCharactersInternal.None, SpanKindInternal.Markup);
-
-                        // Technically, void elements like "meta" are not allowed to have end tags. Just in case they do,
-                        // we need to look ahead at the next set of tokens. If we see "<", "/", tag name, accept it and the ">" following it
-                        // Place a bookmark
-                        var bookmark = CurrentStart.AbsoluteIndex;
-
-                        // Skip whitespace
-                        IEnumerable<HtmlToken> whiteSpace = ReadWhile(IsSpacingToken(includeNewLines: true));
-
-                        // Open Angle
-                        if (At(HtmlTokenType.OpenAngle) && NextIs(HtmlTokenType.ForwardSlash))
-                        {
-                            var openAngle = CurrentToken;
-                            NextToken();
-                            Assert(HtmlTokenType.ForwardSlash);
-                            var solidus = CurrentToken;
-                            NextToken();
-                            if (At(HtmlTokenType.Text) && string.Equals(CurrentToken.Content, tagName, StringComparison.OrdinalIgnoreCase))
-                            {
-                                // Accept up to here
-                                Accept(whiteSpace);
-                                Output(SpanKindInternal.Markup); // Output the whitespace
-
-                                using (Context.Builder.StartBlock(BlockKindInternal.Tag))
-                                {
-                                    Accept(openAngle);
-                                    Accept(solidus);
-                                    AcceptAndMoveNext();
-
-                                    // Accept to '>', '<' or EOF
-                                    AcceptUntil(HtmlTokenType.CloseAngle, HtmlTokenType.OpenAngle);
-                                    // Accept the '>' if we saw it. And if we do see it, we're complete
-                                    var complete = Optional(HtmlTokenType.CloseAngle);
-
-                                    if (complete)
-                                    {
-                                        Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                                    }
-
-                                    // Output the closing void element
-                                    Output(SpanKindInternal.Markup);
-
-                                    return complete;
-                                }
-                            }
-                        }
-
-                        // Go back to the bookmark and just finish this tag at the close angle
-                        Context.Source.Position = bookmark;
-                        NextToken();
-                    }
-                    else if (string.Equals(tagName, ScriptTagName, StringComparison.OrdinalIgnoreCase))
-                    {
-                        if (!CurrentScriptTagExpectsHtml())
-                        {
-                            CompleteTagBlockWithSpan(tagBlockWrapper, AcceptedCharactersInternal.None, SpanKindInternal.Markup);
-
-                            SkipToEndScriptAndParseCode(endTagAcceptedCharacters: AcceptedCharactersInternal.None);
-                        }
-                        else
-                        {
-                            // Push the script tag onto the tag stack, it should be treated like all other HTML tags.
-                            tags.Push(tag);
-                        }
-                    }
-                    else
-                    {
-                        // Push the tag on to the stack
-                        tags.Push(tag);
-                    }
-                }
-            }
-            return seenClose;
+            return false;
         }
 
-        private void SkipToEndScriptAndParseCode(AcceptedCharactersInternal endTagAcceptedCharacters = AcceptedCharactersInternal.Any)
+        private void SkipToEndScriptAndParseCode(in SyntaxListBuilder<RazorSyntaxNode> builder, AcceptedCharactersInternal endTagAcceptedCharacters = AcceptedCharactersInternal.Any)
         {
             // Special case for <script>: Skip to end of script tag and parse code
             var seenEndScript = false;
 
             while (!seenEndScript && !EndOfFile)
             {
-                SkipToAndParseCode(HtmlTokenType.OpenAngle);
+                SkipToAndParseCode(builder, SyntaxKind.OpenAngle);
                 var tagStart = CurrentStart;
 
-                if (NextIs(HtmlTokenType.ForwardSlash))
+                if (NextIs(SyntaxKind.ForwardSlash))
                 {
                     var openAngle = CurrentToken;
                     NextToken(); // Skip over '<', current is '/'
                     var solidus = CurrentToken;
                     NextToken(); // Skip over '/', current should be text
 
-                    if (At(HtmlTokenType.Text) &&
+                    if (At(SyntaxKind.Text) &&
                         string.Equals(CurrentToken.Content, ScriptTagName, StringComparison.OrdinalIgnoreCase))
                     {
                         seenEndScript = true;
@@ -1401,23 +966,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
                 if (seenEndScript)
                 {
-                    Output(SpanKindInternal.Markup);
+                    builder.Add(OutputAsMarkupLiteral());
 
-                    using (Context.Builder.StartBlock(BlockKindInternal.Tag))
+                    using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
                     {
-                        Span.EditHandler.AcceptedCharacters = endTagAcceptedCharacters;
+                        var tagBuilder = pooledResult.Builder;
+                        SpanContext.EditHandler.AcceptedCharacters = endTagAcceptedCharacters;
 
                         AcceptAndMoveNext(); // '<'
                         AcceptAndMoveNext(); // '/'
-                        SkipToAndParseCode(HtmlTokenType.CloseAngle);
-                        if (!Optional(HtmlTokenType.CloseAngle))
+                        SkipToAndParseCode(tagBuilder, SyntaxKind.CloseAngle);
+                        if (!TryAccept(SyntaxKind.CloseAngle))
                         {
                             Context.ErrorSink.OnError(
                                 RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
                                     new SourceSpan(SourceLocationTracker.Advance(tagStart, "</"), ScriptTagName.Length),
                                     ScriptTagName));
+                            var closeAngle = SyntaxFactory.MissingToken(SyntaxKind.CloseAngle);
+                            Accept(closeAngle);
                         }
-                        Output(SpanKindInternal.Markup);
+                        tagBuilder.Add(OutputAsMarkupLiteral());
+                        builder.Add(SyntaxFactory.MarkupTagBlock(tagBuilder.ToList()));
                     }
                 }
                 else
@@ -1427,38 +996,659 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        private void CompleteTagBlockWithSpan(IDisposable tagBlockWrapper,
-                                              AcceptedCharactersInternal acceptedCharacters,
-                                              SpanKindInternal spanKind)
+        private bool CurrentScriptTagExpectsHtml(in SyntaxListBuilder<RazorSyntaxNode> builder)
         {
-            Debug.Assert(tagBlockWrapper != null,
-                "Tag block wrapper should not be null when attempting to complete a block");
+            Debug.Assert(!builder.IsNull);
 
-            Span.EditHandler.AcceptedCharacters = acceptedCharacters;
-            // Write out the current span into the block before closing it.
-            Output(spanKind);
-            // Finish the tag block
-            tagBlockWrapper.Dispose();
+            MarkupAttributeBlockSyntax typeAttribute = null;
+            for (var i = 0; i < builder.Count; i++)
+            {
+                var node = builder[i];
+                if (node.IsToken || node.IsTrivia)
+                {
+                    continue;
+                }
+
+                if (node is MarkupAttributeBlockSyntax attributeBlock &&
+                    attributeBlock.Value.Children.Count > 0 &&
+                    IsTypeAttribute(attributeBlock))
+                {
+                    typeAttribute = attributeBlock;
+                    break;
+                }
+            }
+
+            if (typeAttribute != null)
+            {
+                var contentValues = typeAttribute.Value.CreateRed().DescendantNodes().Where(n => n.IsToken).Cast<Syntax.SyntaxToken>();
+
+                var scriptType = string.Concat(contentValues.Select(t => t.Content)).Trim();
+
+                // Does not allow charset parameter (or any other parameters).
+                return string.Equals(scriptType, "text/html", StringComparison.OrdinalIgnoreCase);
+            }
+
+            return false;
         }
 
-        private bool AcceptUntilAll(params HtmlTokenType[] endSequence)
+        private static bool IsTypeAttribute(MarkupAttributeBlockSyntax attributeBlock)
+        {
+            if (attributeBlock.Name.LiteralTokens.Count == 0)
+            {
+                return false;
+            }
+
+            var trimmedStartContent = attributeBlock.Name.ToFullString().TrimStart();
+            if (trimmedStartContent.StartsWith("type", StringComparison.OrdinalIgnoreCase) &&
+                (trimmedStartContent.Length == 4 ||
+                ValidAfterTypeAttributeNameCharacters.Contains(trimmedStartContent[4])))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        protected SyntaxToken AcceptAllButLastDoubleHyphens()
+        {
+            var lastDoubleHyphen = CurrentToken;
+            AcceptWhile(s =>
+            {
+                if (NextIs(SyntaxKind.DoubleHyphen))
+                {
+                    lastDoubleHyphen = s;
+                    return true;
+                }
+
+                return false;
+            });
+
+            NextToken();
+
+            if (At(SyntaxKind.Text) && IsHyphen(CurrentToken))
+            {
+                // Doing this here to maintain the order of tokens
+                if (!NextIs(SyntaxKind.CloseAngle))
+                {
+                    Accept(lastDoubleHyphen);
+                    lastDoubleHyphen = null;
+                }
+
+                AcceptAndMoveNext();
+            }
+
+            return lastDoubleHyphen;
+        }
+
+        private bool AcceptTokenUntilAll(in SyntaxListBuilder<RazorSyntaxNode> builder, params SyntaxKind[] endSequence)
         {
             while (!EndOfFile)
             {
-                SkipToAndParseCode(endSequence[0]);
+                SkipToAndParseCode(builder, endSequence[0]);
                 if (AcceptAll(endSequence))
                 {
                     return true;
                 }
             }
             Debug.Assert(EndOfFile);
-            Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
             return false;
         }
 
-        private bool RemoveTag(Stack<Tuple<HtmlToken, SourceLocation>> tags, string tagName, SourceLocation tagStart)
+        public MarkupBlockSyntax ParseBlock()
         {
-            Tuple<HtmlToken, SourceLocation> currentTag = null;
+            if (Context == null)
+            {
+                throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
+            }
+
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            using (PushSpanContextConfig(DefaultMarkupSpanContext))
+            {
+                var builder = pooledResult.Builder;
+                if (!NextToken())
+                {
+                    return null;
+                }
+
+                AcceptWhile(IsSpacingToken(includeNewLines: true));
+
+                if (CurrentToken.Kind == SyntaxKind.OpenAngle)
+                {
+                    // "<" => Implicit Tag Block
+                    ParseTagBlock(builder, new Stack<Tuple<SyntaxToken, SourceLocation>>());
+                }
+                else if (CurrentToken.Kind == SyntaxKind.Transition)
+                {
+                    // "@" => Explicit Tag/Single Line Block OR Template
+
+                    // Output whitespace
+                    builder.Add(OutputAsMarkupLiteral());
+
+                    // Definitely have a transition span
+                    Assert(SyntaxKind.Transition);
+                    AcceptAndMoveNext();
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                    SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                    var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
+                    builder.Add(transition);
+                    if (At(SyntaxKind.Transition))
+                    {
+                        SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                        AcceptAndMoveNext();
+                        builder.Add(OutputAsMetaCode(Output(), AcceptedCharactersInternal.Any));
+                    }
+                    ParseAfterTransition(builder);
+                }
+                else
+                {
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_MarkupBlockMustStartWithTag(
+                            new SourceSpan(CurrentStart, CurrentToken.Content.Length)));
+                }
+                builder.Add(OutputAsMarkupLiteral());
+
+                var markupBlock = builder.ToList();
+
+                return SyntaxFactory.MarkupBlock(markupBlock);
+            }
+        }
+
+        private void ParseAfterTransition(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // "@:" => Explicit Single Line Block
+            if (CurrentToken.Kind == SyntaxKind.Text && CurrentToken.Content.Length > 0 && CurrentToken.Content[0] == ':')
+            {
+                // Split the token
+                var split = Language.SplitToken(CurrentToken, 1, SyntaxKind.Colon);
+
+                // The first part (left) is added to this span and we return a MetaCode span
+                Accept(split.Item1);
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+                builder.Add(OutputAsMetaCode(Output(), AcceptedCharactersInternal.Any));
+                if (split.Item2 != null)
+                {
+                    Accept(split.Item2);
+                }
+                NextToken();
+                ParseSingleLineMarkup(builder);
+            }
+            else if (CurrentToken.Kind == SyntaxKind.OpenAngle)
+            {
+                ParseTagBlock(builder, new Stack<Tuple<SyntaxToken, SourceLocation>>());
+            }
+        }
+
+        private void ParseSingleLineMarkup(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            // Parse until a newline, it's that simple!
+            // First, signal to code parser that whitespace is significant to us.
+            var old = Context.WhiteSpaceIsSignificantToAncestorBlock;
+            Context.WhiteSpaceIsSignificantToAncestorBlock = true;
+            SpanContext.EditHandler = new SpanEditHandler(Language.TokenizeString);
+            SkipToAndParseCode(builder, SyntaxKind.NewLine);
+            if (!EndOfFile && CurrentToken.Kind == SyntaxKind.NewLine)
+            {
+                AcceptAndMoveNext();
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+            }
+            PutCurrentBack();
+            Context.WhiteSpaceIsSignificantToAncestorBlock = old;
+            builder.Add(OutputAsMarkupLiteral());
+        }
+
+        private void ParseTagBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Stack<Tuple<SyntaxToken, SourceLocation>> tags)
+        {
+            // TODO: This is really ugly and needs to be cleaned up.
+
+            // Skip Whitespace and Text
+            var completeTag = false;
+            var blockAlreadyBuilt = false;
+            do
+            {
+                SkipToAndParseCode(builder, SyntaxKind.OpenAngle);
+
+                // Output everything prior to the OpenAngle into a markup span
+                builder.Add(OutputAsMarkupLiteral());
+
+                var tagBuilder = builder;
+                IDisposable tagBuilderDisposable = null;
+                try
+                {
+                    if (EndOfFile)
+                    {
+                        // Do not want to start a new tag block if we're at the end of the file.
+                        EndTagBlock(builder, tags, complete: true);
+                    }
+                    else
+                    {
+                        var atSpecialTag = AtSpecialTag;
+                        if (!atSpecialTag)
+                        {
+                            // Start a tag block.  This is used to wrap things like <p> or <a class="btn"> etc.
+                            var pooledResult = Pool.Allocate<RazorSyntaxNode>();
+                            tagBuilderDisposable = pooledResult;
+                            tagBuilder = pooledResult.Builder;
+                        }
+                        _bufferedOpenAngle = null;
+                        _lastTagStart = CurrentStart;
+                        Assert(SyntaxKind.OpenAngle);
+                        _bufferedOpenAngle = CurrentToken;
+                        var tagStart = CurrentStart;
+                        if (!NextToken())
+                        {
+                            Accept(_bufferedOpenAngle);
+                            EndTagBlock(tagBuilder, tags, complete: false);
+                        }
+                        else if (atSpecialTag && At(SyntaxKind.Bang))
+                        {
+                            Accept(_bufferedOpenAngle);
+                            completeTag = ParseBangTag(builder);
+                            blockAlreadyBuilt = completeTag;
+                        }
+                        else
+                        {
+                            var result = ParseAfterTagStart(tagBuilder, builder, tagStart, tags);
+                            completeTag = result.Item1;
+                            blockAlreadyBuilt = result.Item2;
+                        }
+                    }
+
+                    if (completeTag)
+                    {
+                        // Completed tags have no accepted characters inside of blocks.
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                    }
+
+                    if (blockAlreadyBuilt)
+                    {
+                        // Output the contents of the tag into its own markup span.
+                        builder.Add(OutputAsMarkupLiteral());
+                    }
+                    else if (tagBuilderDisposable != null)
+                    {
+                        // A new tag block was started. Build it.
+                        // Output the contents of the tag into its own markup span.
+                        tagBuilder.Add(OutputAsMarkupLiteral());
+                        var tagBlock = SyntaxFactory.MarkupTagBlock(tagBuilder.ToList());
+                        builder.Add(tagBlock);
+                    }
+                }
+                finally
+                {
+                    // Will be null if we were at end of file or special tag when initially created.
+                    if (tagBuilderDisposable != null)
+                    {
+                        // End tag block
+                        tagBuilderDisposable.Dispose();
+                    }
+                }
+            }
+            while (tags.Count > 0);
+
+            EndTagBlock(builder, tags, completeTag);
+        }
+
+        private Tuple<bool, bool> ParseAfterTagStart(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
+            SourceLocation tagStart,
+            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
+        {
+            var blockAlreadyBuilt = false;
+            if (!EndOfFile)
+            {
+                switch (CurrentToken.Kind)
+                {
+                    case SyntaxKind.ForwardSlash:
+                        // End Tag
+                        return ParseEndTag(builder, parentBuilder, tagStart, tags);
+                    case SyntaxKind.QuestionMark:
+                        // XML PI
+                        Accept(_bufferedOpenAngle);
+                        var complete = TryParseXmlPI(builder);
+                        // No block is created for Xml PI. So return the same value as complete.
+                        blockAlreadyBuilt = complete;
+                        return Tuple.Create(complete, blockAlreadyBuilt);
+                    default:
+                        // Start Tag
+                        return ParseStartTag(builder, parentBuilder, tags);
+                }
+            }
+            if (tags.Count == 0)
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_OuterTagMissingName(
+                        new SourceSpan(CurrentStart, contentLength: 1 /* end of file */)));
+            }
+
+            return Tuple.Create(false, blockAlreadyBuilt);
+        }
+
+        private Tuple<bool, bool> ParseStartTag(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
+            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
+        {
+            SyntaxToken bangToken = null;
+            SyntaxToken potentialTagNameToken;
+
+            if (At(SyntaxKind.Bang))
+            {
+                bangToken = CurrentToken;
+
+                potentialTagNameToken = Lookahead(count: 1);
+            }
+            else
+            {
+                potentialTagNameToken = CurrentToken;
+            }
+
+            SyntaxToken tagName;
+
+            if (potentialTagNameToken == null || potentialTagNameToken.Kind != SyntaxKind.Text)
+            {
+                tagName = SyntaxFactory.Token(SyntaxKind.Marker, string.Empty);
+            }
+            else if (bangToken != null)
+            {
+                tagName = SyntaxFactory.Token(SyntaxKind.Text, "!" + potentialTagNameToken.Content);
+            }
+            else
+            {
+                tagName = potentialTagNameToken;
+            }
+
+            var tag = Tuple.Create(tagName, _lastTagStart);
+
+            if (tags.Count == 0 &&
+                // Note tagName may contain a '!' escape character. This ensures <!text> doesn't match here.
+                // <!text> tags are treated like any other escaped HTML start tag.
+                string.Equals(tag.Item1.Content, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase))
+            {
+                builder.Add(OutputAsMarkupLiteral());
+                SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+
+                Accept(_bufferedOpenAngle);
+                var textLocation = CurrentStart;
+                Assert(SyntaxKind.Text);
+
+                AcceptAndMoveNext();
+
+                var bookmark = CurrentStart.AbsoluteIndex;
+                var tokens = ReadWhile(IsSpacingToken(includeNewLines: true));
+                var empty = At(SyntaxKind.ForwardSlash);
+                if (empty)
+                {
+                    Accept(tokens);
+                    Assert(SyntaxKind.ForwardSlash);
+                    AcceptAndMoveNext();
+                    bookmark = CurrentStart.AbsoluteIndex;
+                    tokens = ReadWhile(IsSpacingToken(includeNewLines: true));
+                }
+
+                if (!TryAccept(SyntaxKind.CloseAngle))
+                {
+                    Context.Source.Position = bookmark;
+                    NextToken();
+                    Context.ErrorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
+                            new SourceSpan(textLocation, contentLength: 4 /* text */)));
+
+                    RecoverTextTag();
+                }
+                else
+                {
+                    Accept(tokens);
+                    SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                }
+
+                if (!empty)
+                {
+                    tags.Push(tag);
+                }
+
+                var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
+                builder.Add(transition);
+                var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
+                parentBuilder.Add(tagBlock);
+
+                return Tuple.Create(true, true);
+            }
+
+            Accept(_bufferedOpenAngle);
+            ParseOptionalBangEscape(builder);
+            TryAccept(SyntaxKind.Text);
+            return ParseRestOfTag(builder, parentBuilder, tag, tags);
+        }
+
+        private Tuple<bool, bool> ParseRestOfTag(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
+            Tuple<SyntaxToken, SourceLocation> tag,
+            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
+        {
+            var blockAlreadyBuilt = false;
+            ParseTagContent(builder);
+
+            // We are now at a possible end of the tag
+            // Found '<', so we just abort this tag.
+            if (At(SyntaxKind.OpenAngle))
+            {
+                return Tuple.Create(false, blockAlreadyBuilt);
+            }
+
+            var isEmpty = At(SyntaxKind.ForwardSlash);
+            // Found a solidus, so don't accept it but DON'T push the tag to the stack
+            if (isEmpty)
+            {
+                AcceptAndMoveNext();
+            }
+
+            // Check for the '>' to determine if the tag is finished
+            var seenClose = TryAccept(SyntaxKind.CloseAngle);
+            if (!seenClose)
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
+                        new SourceSpan(
+                            SourceLocationTracker.Advance(tag.Item2, "<"),
+                            Math.Max(tag.Item1.Content.Length, 1)),
+                        tag.Item1.Content));
+            }
+            else
+            {
+                if (!isEmpty)
+                {
+                    // Is this a void element?
+                    var tagName = tag.Item1.Content.Trim();
+                    if (VoidElements.Contains(tagName))
+                    {
+                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                        builder.Add(OutputAsMarkupLiteral());
+                        var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
+                        parentBuilder.Add(tagBlock);
+                        blockAlreadyBuilt = true;
+
+                        // Technically, void elements like "meta" are not allowed to have end tags. Just in case they do,
+                        // we need to look ahead at the next set of tokens. If we see "<", "/", tag name, accept it and the ">" following it
+                        // Place a bookmark
+                        var bookmark = CurrentStart.AbsoluteIndex;
+
+                        // Skip whitespace
+                        var whiteSpace = ReadWhile(IsSpacingToken(includeNewLines: true));
+
+                        // Open Angle
+                        if (At(SyntaxKind.OpenAngle) && NextIs(SyntaxKind.ForwardSlash))
+                        {
+                            var openAngle = CurrentToken;
+                            NextToken();
+                            Assert(SyntaxKind.ForwardSlash);
+                            var solidus = CurrentToken;
+                            NextToken();
+                            if (At(SyntaxKind.Text) && string.Equals(CurrentToken.Content, tagName, StringComparison.OrdinalIgnoreCase))
+                            {
+                                // Accept up to here
+                                Accept(whiteSpace);
+                                parentBuilder.Add(OutputAsMarkupLiteral()); // Output the whitespace
+
+                                using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+                                {
+                                    var tagBuilder = pooledResult.Builder;
+                                    Accept(openAngle);
+                                    Accept(solidus);
+                                    AcceptAndMoveNext();
+
+                                    // Accept to '>', '<' or EOF
+                                    AcceptUntil(SyntaxKind.CloseAngle, SyntaxKind.OpenAngle);
+                                    // Accept the '>' if we saw it. And if we do see it, we're complete
+                                    var complete = TryAccept(SyntaxKind.CloseAngle);
+
+                                    if (complete)
+                                    {
+                                        SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                                    }
+
+                                    // Output the closing void element
+                                    tagBuilder.Add(OutputAsMarkupLiteral());
+                                    parentBuilder.Add(SyntaxFactory.MarkupTagBlock(tagBuilder.ToList()));
+
+                                    return Tuple.Create(complete, blockAlreadyBuilt);
+                                }
+                            }
+                        }
+
+                        // Go back to the bookmark and just finish this tag at the close angle
+                        Context.Source.Position = bookmark;
+                        NextToken();
+                    }
+                    else if (string.Equals(tagName, ScriptTagName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        if (!CurrentScriptTagExpectsHtml(builder))
+                        {
+                            SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                            builder.Add(OutputAsMarkupLiteral());
+                            var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
+                            parentBuilder.Add(tagBlock);
+                            blockAlreadyBuilt = true;
+
+                            SkipToEndScriptAndParseCode(parentBuilder, endTagAcceptedCharacters: AcceptedCharactersInternal.None);
+                        }
+                        else
+                        {
+                            // Push the script tag onto the tag stack, it should be treated like all other HTML tags.
+                            tags.Push(tag);
+                        }
+                    }
+                    else
+                    {
+                        // Push the tag on to the stack
+                        tags.Push(tag);
+                    }
+                }
+            }
+            return Tuple.Create(seenClose, blockAlreadyBuilt);
+        }
+
+        private Tuple<bool, bool> ParseEndTag(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
+            SourceLocation tagStart,
+            Stack<Tuple<SyntaxToken, SourceLocation>> tags)
+        {
+            // Accept "/" and move next
+            Assert(SyntaxKind.ForwardSlash);
+            var forwardSlash = CurrentToken;
+            if (!NextToken())
+            {
+                Accept(_bufferedOpenAngle);
+                Accept(forwardSlash);
+                return Tuple.Create(false, false);
+            }
+            else
+            {
+                var tagName = string.Empty;
+                SyntaxToken bangToken = null;
+
+                if (At(SyntaxKind.Bang))
+                {
+                    bangToken = CurrentToken;
+
+                    var nextToken = Lookahead(count: 1);
+
+                    if (nextToken != null && nextToken.Kind == SyntaxKind.Text)
+                    {
+                        tagName = "!" + nextToken.Content;
+                    }
+                }
+                else if (At(SyntaxKind.Text))
+                {
+                    tagName = CurrentToken.Content;
+                }
+
+                var matched = RemoveTag(tags, tagName, tagStart);
+
+                if (tags.Count == 0 &&
+                    // Note tagName may contain a '!' escape character. This ensures </!text> doesn't match here.
+                    // </!text> tags are treated like any other escaped HTML end tag.
+                    string.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase) &&
+                    matched)
+                {
+                    return EndTextTag(builder, parentBuilder, forwardSlash);
+                }
+                Accept(_bufferedOpenAngle);
+                Accept(forwardSlash);
+
+                ParseOptionalBangEscape(builder);
+
+                AcceptUntil(SyntaxKind.CloseAngle);
+
+                // Accept the ">"
+                return Tuple.Create(TryAccept(SyntaxKind.CloseAngle), false);
+            }
+        }
+
+        private Tuple<bool, bool> EndTextTag(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            in SyntaxListBuilder<RazorSyntaxNode> parentBuilder,
+            SyntaxToken solidus)
+        {
+            Accept(_bufferedOpenAngle);
+            Accept(solidus);
+
+            var textLocation = CurrentStart;
+            Assert(SyntaxKind.Text);
+            AcceptAndMoveNext();
+
+            var seenCloseAngle = TryAccept(SyntaxKind.CloseAngle);
+
+            if (!seenCloseAngle)
+            {
+                Context.ErrorSink.OnError(
+                    RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
+                        new SourceSpan(textLocation, contentLength: 4 /* text */)));
+
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any;
+                RecoverTextTag();
+            }
+            else
+            {
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+            }
+
+            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+
+            var transition = GetNodeWithSpanContext(SyntaxFactory.MarkupTransition(Output()));
+            builder.Add(transition);
+            var tagBlock = SyntaxFactory.MarkupTagBlock(builder.ToList());
+            parentBuilder.Add(tagBlock);
+
+            return Tuple.Create(seenCloseAngle, true);
+        }
+
+        private bool RemoveTag(Stack<Tuple<SyntaxToken, SourceLocation>> tags, string tagName, SourceLocation tagStart)
+        {
+            Tuple<SyntaxToken, SourceLocation> currentTag = null;
             while (tags.Count > 0)
             {
                 currentTag = tags.Pop();
@@ -1486,7 +1676,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return false;
         }
 
-        private void EndTagBlock(Stack<Tuple<HtmlToken, SourceLocation>> tags, bool complete)
+        private void RecoverTextTag()
+        {
+            // We don't want to skip-to and parse because there shouldn't be anything in the body of text tags.
+            AcceptUntil(SyntaxKind.CloseAngle, SyntaxKind.NewLine);
+
+            // Include the close angle in the text tag block if it's there, otherwise just move on
+            TryAccept(SyntaxKind.CloseAngle);
+        }
+
+        private void EndTagBlock(
+            in SyntaxListBuilder<RazorSyntaxNode> builder,
+            Stack<Tuple<SyntaxToken, SourceLocation>> tags,
+            bool complete)
         {
             if (tags.Count > 0)
             {
@@ -1505,21 +1707,23 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
             else if (complete)
             {
-                Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
+                SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
             }
             tags.Clear();
             if (!Context.DesignTimeMode)
             {
                 var shouldAcceptWhitespaceAndNewLine = true;
 
-                if (Context.Builder.LastSpan.Kind == SpanKindInternal.Transition)
+                // Check if the previous span was a transition.
+                var previousSpan = builder.Count > 0 ? GetLastSpan(builder[builder.Count - 1]) : null;
+                if (previousSpan != null && previousSpan.Kind == SyntaxKind.MarkupTransition)
                 {
                     var tokens = ReadWhile(
-                        f => (f.Type == HtmlTokenType.WhiteSpace) || (f.Type == HtmlTokenType.NewLine));
+                        f => (f.Kind == SyntaxKind.Whitespace) || (f.Kind == SyntaxKind.NewLine));
 
                     // Make sure the current token is not markup, which can be html start tag or @:
-                    if (!(At(HtmlTokenType.OpenAngle) ||
-                        (At(HtmlTokenType.Transition) && Lookahead(count: 1).Content.StartsWith(":"))))
+                    if (!(At(SyntaxKind.OpenAngle) ||
+                        (At(SyntaxKind.Transition) && Lookahead(count: 1).Content.StartsWith(":"))))
                     {
                         // Don't accept whitespace as markup if the end text tag is followed by csharp.
                         shouldAcceptWhitespaceAndNewLine = false;
@@ -1533,261 +1737,58 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 if (shouldAcceptWhitespaceAndNewLine)
                 {
                     // Accept whitespace and a single newline if present
-                    AcceptWhile(HtmlTokenType.WhiteSpace);
-                    Optional(HtmlTokenType.NewLine);
+                    AcceptWhile(SyntaxKind.Whitespace);
+                    TryAccept(SyntaxKind.NewLine);
                 }
             }
-            else if (Span.EditHandler.AcceptedCharacters == AcceptedCharactersInternal.Any)
+            else if (SpanContext.EditHandler.AcceptedCharacters == AcceptedCharactersInternal.Any)
             {
-                AcceptWhile(HtmlTokenType.WhiteSpace);
-                Optional(HtmlTokenType.NewLine);
+                AcceptWhile(SyntaxKind.Whitespace);
+                TryAccept(SyntaxKind.NewLine);
             }
             PutCurrentBack();
 
             if (!complete)
             {
-                AddMarkerTokenIfNecessary();
-            }
-            Output(SpanKindInternal.Markup);
-        }
-
-        internal static bool IsValidAttributeNameToken(HtmlToken token)
-        {
-            if (token == null)
-            {
-                return false;
+                AcceptMarkerTokenIfNecessary();
             }
 
-            // These restrictions cover most of the spec defined: http://www.w3.org/TR/html5/syntax.html#attributes-0
-            // However, it's not all of it. For instance we don't special case control characters or allow OpenAngle.
-            // It also doesn't try to exclude Razor specific features such as the @ transition. This is based on the
-            // expectation that the parser handles such scenarios prior to falling through to name resolution.
-            var tokenType = token.Type;
-            return tokenType != HtmlTokenType.WhiteSpace &&
-                tokenType != HtmlTokenType.NewLine &&
-                tokenType != HtmlTokenType.CloseAngle &&
-                tokenType != HtmlTokenType.OpenAngle &&
-                tokenType != HtmlTokenType.ForwardSlash &&
-                tokenType != HtmlTokenType.DoubleQuote &&
-                tokenType != HtmlTokenType.SingleQuote &&
-                tokenType != HtmlTokenType.Equals &&
-                tokenType != HtmlTokenType.Unknown;
+            builder.Add(OutputAsMarkupLiteral());
         }
 
-        public void ParseDocument()
+        public MarkupBlockSyntax ParseRazorBlock(Tuple<string, string> nestingSequences, bool caseSensitive)
         {
             if (Context == null)
             {
                 throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
             }
 
-            using (PushSpanConfig(DefaultMarkupSpan))
+            using (var pooledResult = Pool.Allocate<RazorSyntaxNode>())
+            using (PushSpanContextConfig(DefaultMarkupSpanContext))
             {
-                using (Context.Builder.StartBlock(BlockKindInternal.Markup))
-                {
-                    Span.Start = CurrentLocation;
+                var builder = pooledResult.Builder;
 
-                    NextToken();
-                    while (!EndOfFile)
-                    {
-                        SkipToAndParseCode(HtmlTokenType.OpenAngle);
-                        ScanTagInDocumentContext();
-                    }
-                    AddMarkerTokenIfNecessary();
-                    Output(SpanKindInternal.Markup);
-                }
+                NextToken();
+                CaseSensitive = caseSensitive;
+                NestingBlock(builder, nestingSequences);
+                AcceptMarkerTokenIfNecessary();
+                builder.Add(OutputAsMarkupLiteral());
+
+                return SyntaxFactory.MarkupBlock(builder.ToList());
             }
         }
 
-        /// <summary>
-        /// Reads the content of a tag (if present) in the MarkupDocument (or MarkupSection) context,
-        /// where we don't care about maintaining a stack of tags.
-        /// </summary>
-        private void ScanTagInDocumentContext()
-        {
-            if (At(HtmlTokenType.OpenAngle))
-            {
-                if (NextIs(HtmlTokenType.Bang))
-                {
-                    // Checking to see if we meet the conditions of a special '!' tag: <!DOCTYPE, <![CDATA[, <!--.
-                    if (!IsBangEscape(lookahead: 1))
-                    {
-                        if (Lookahead(2)?.Type == HtmlTokenType.DoubleHyphen)
-                        {
-                            Output(SpanKindInternal.Markup);
-                        }
-
-                        AcceptAndMoveNext(); // Accept '<'
-                        BangTag();
-
-                        return;
-                    }
-
-                    // We should behave like a normal tag that has a parser escape, fall through to the normal
-                    // tag logic.
-                }
-                else if (NextIs(HtmlTokenType.QuestionMark))
-                {
-                    AcceptAndMoveNext(); // Accept '<'
-                    XmlPI();
-                    return;
-                }
-
-                Output(SpanKindInternal.Markup);
-
-                // Start tag block
-                var tagBlock = Context.Builder.StartBlock(BlockKindInternal.Tag);
-
-                AcceptAndMoveNext(); // Accept '<'
-
-                if (!At(HtmlTokenType.ForwardSlash))
-                {
-                    OptionalBangEscape();
-
-                    // Parsing a start tag
-                    var scriptTag = At(HtmlTokenType.Text) &&
-                                    string.Equals(CurrentToken.Content, "script", StringComparison.OrdinalIgnoreCase);
-                    Optional(HtmlTokenType.Text);
-                    TagContent(); // Parse the tag, don't care about the content
-                    Optional(HtmlTokenType.ForwardSlash);
-                    Optional(HtmlTokenType.CloseAngle);
-
-                    // If the script tag expects javascript content then we should do minimal parsing until we reach
-                    // the end script tag. Don't want to incorrectly parse a "var tag = '<input />';" as an HTML tag.
-                    if (scriptTag && !CurrentScriptTagExpectsHtml())
-                    {
-                        Output(SpanKindInternal.Markup);
-                        tagBlock.Dispose();
-
-                        SkipToEndScriptAndParseCode();
-                        return;
-                    }
-                }
-                else
-                {
-                    // Parsing an end tag
-                    // This section can accept things like: '</p  >' or '</p>' etc.
-                    Optional(HtmlTokenType.ForwardSlash);
-
-                    // Whitespace here is invalid (according to the spec)
-                    OptionalBangEscape();
-                    Optional(HtmlTokenType.Text);
-                    Optional(HtmlTokenType.WhiteSpace);
-                    Optional(HtmlTokenType.CloseAngle);
-                }
-
-                Output(SpanKindInternal.Markup);
-
-                // End tag block
-                tagBlock.Dispose();
-            }
-        }
-
-        private bool CurrentScriptTagExpectsHtml()
-        {
-            var blockBuilder = Context.Builder.CurrentBlock;
-
-            Debug.Assert(blockBuilder != null);
-
-            var typeAttribute = blockBuilder.Children
-                .OfType<Block>()
-                .Where(block =>
-                    block.ChunkGenerator is AttributeBlockChunkGenerator &&
-                    block.Children.Count() >= 2)
-                .FirstOrDefault(IsTypeAttribute);
-
-            if (typeAttribute != null)
-            {
-                var contentValues = typeAttribute.Children
-                    .OfType<Span>()
-                    .Where(childSpan => childSpan.ChunkGenerator is LiteralAttributeChunkGenerator)
-                    .Select(childSpan => childSpan.Content);
-
-                var scriptType = string.Concat(contentValues).Trim();
-
-                // Does not allow charset parameter (or any other parameters).
-                return string.Equals(scriptType, "text/html", StringComparison.OrdinalIgnoreCase);
-            }
-
-            return false;
-        }
-
-        private static bool IsTypeAttribute(Block block)
-        {
-            var span = block.Children.First() as Span;
-
-            if (span == null)
-            {
-                return false;
-            }
-
-            var trimmedStartContent = span.Content.TrimStart();
-            if (trimmedStartContent.StartsWith("type", StringComparison.OrdinalIgnoreCase) &&
-                (trimmedStartContent.Length == 4 ||
-                ValidAfterTypeAttributeNameCharacters.Contains(trimmedStartContent[4])))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        public void ParseRazorBlock(Tuple<string, string> nestingSequences, bool caseSensitive)
-        {
-            if (Context == null)
-            {
-                throw new InvalidOperationException(Resources.Parser_Context_Not_Set);
-            }
-
-            using (PushSpanConfig(DefaultMarkupSpan))
-            {
-                Span.Start = CurrentLocation;
-
-                using (Context.Builder.StartBlock(BlockKindInternal.Markup))
-                {
-                    NextToken();
-                    CaseSensitive = caseSensitive;
-                    if (nestingSequences.Item1 == null)
-                    {
-                        NonNestingSection(nestingSequences.Item2.Split());
-                    }
-                    else
-                    {
-                        NestingSection(nestingSequences);
-                    }
-                    AddMarkerTokenIfNecessary();
-                    Output(SpanKindInternal.Markup);
-                }
-            }
-        }
-
-        private void NonNestingSection(string[] nestingSequenceComponents)
-        {
-            do
-            {
-                SkipToAndParseCode(token => token.Type == HtmlTokenType.OpenAngle || AtEnd(nestingSequenceComponents));
-                ScanTagInDocumentContext();
-                if (!EndOfFile && AtEnd(nestingSequenceComponents))
-                {
-                    break;
-                }
-            }
-            while (!EndOfFile);
-
-            PutCurrentBack();
-        }
-
-        private void NestingSection(Tuple<string, string> nestingSequences)
+        private void NestingBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Tuple<string, string> nestingSequences)
         {
             var nesting = 1;
             while (nesting > 0 && !EndOfFile)
             {
-                SkipToAndParseCode(token =>
-                    token.Type == HtmlTokenType.Text ||
-                    token.Type == HtmlTokenType.OpenAngle);
-                if (At(HtmlTokenType.Text))
+                SkipToAndParseCode(builder, token =>
+                    token.Kind == SyntaxKind.Text ||
+                    token.Kind == SyntaxKind.OpenAngle);
+                if (At(SyntaxKind.Text))
                 {
-                    nesting += ProcessTextToken(nestingSequences, nesting);
+                    nesting += ProcessTextToken(builder, nestingSequences, nesting);
                     if (CurrentToken != null)
                     {
                         AcceptAndMoveNext();
@@ -1799,50 +1800,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 }
                 else
                 {
-                    ScanTagInDocumentContext();
+                    ParseTagInDocumentContext(builder);
                 }
             }
         }
 
-        private bool AtEnd(string[] nestingSequenceComponents)
+        private int ProcessTextToken(in SyntaxListBuilder<RazorSyntaxNode> builder, Tuple<string, string> nestingSequences, int currentNesting)
         {
-            EnsureCurrent();
-            if (string.Equals(CurrentToken.Content, nestingSequenceComponents[0], Comparison))
+            for (var i = 0; i < CurrentToken.Content.Length; i++)
             {
-                var bookmark = Context.Source.Position - CurrentToken.Content.Length;
-                try
-                {
-                    foreach (string component in nestingSequenceComponents)
-                    {
-                        if (!EndOfFile && !string.Equals(CurrentToken.Content, component, Comparison))
-                        {
-                            return false;
-                        }
-                        NextToken();
-                        while (!EndOfFile && IsSpacingToken(includeNewLines: true)(CurrentToken))
-                        {
-                            NextToken();
-                        }
-                    }
-                    return true;
-                }
-                finally
-                {
-                    Context.Source.Position = bookmark;
-                    NextToken();
-                }
-            }
-            return false;
-        }
-
-        private int ProcessTextToken(Tuple<string, string> nestingSequences, int currentNesting)
-        {
-            for (int i = 0; i < CurrentToken.Content.Length; i++)
-            {
-                var nestingDelta = HandleNestingSequence(nestingSequences.Item1, i, currentNesting, 1);
+                var nestingDelta = HandleNestingSequence(builder, nestingSequences.Item1, i, currentNesting, 1);
                 if (nestingDelta == 0)
                 {
-                    nestingDelta = HandleNestingSequence(nestingSequences.Item2, i, currentNesting, -1);
+                    nestingDelta = HandleNestingSequence(builder, nestingSequences.Item2, i, currentNesting, -1);
                 }
 
                 if (nestingDelta != 0)
@@ -1853,7 +1823,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return 0;
         }
 
-        private int HandleNestingSequence(string sequence, int position, int currentNesting, int retIfMatched)
+        private int HandleNestingSequence(in SyntaxListBuilder<RazorSyntaxNode> builder, string sequence, int position, int currentNesting, int retIfMatched)
         {
             if (sequence != null &&
                 CurrentToken.Content[position] == sequence[0] &&
@@ -1868,10 +1838,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     PutCurrentBack();
 
                     // Carve up the token
-                    Tuple<HtmlToken, HtmlToken> pair = Language.SplitToken(token, position, HtmlTokenType.Text);
+                    var pair = Language.SplitToken(token, position, SyntaxKind.Text);
                     var preSequence = pair.Item1;
                     Debug.Assert(pair.Item2 != null);
-                    pair = Language.SplitToken(pair.Item2, sequence.Length, HtmlTokenType.Text);
+                    pair = Language.SplitToken(pair.Item2, sequence.Length, SyntaxKind.Text);
                     var sequenceToken = pair.Item1;
                     var postSequence = pair.Item2;
                     var postSequenceBookmark = bookmark.AbsoluteIndex + preSequence.Content.Length + pair.Item1.Content.Length;
@@ -1904,5 +1874,78 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
             return 0;
         }
+
+        private Syntax.GreenNode GetLastSpan(RazorSyntaxNode node)
+        {
+            if (node == null)
+            {
+                return null;
+            }
+
+            // Find the last token of this node and return its immediate non-list parent.
+            var red = node.CreateRed();
+            var last = red.GetLastTerminal();
+            if (last == null)
+            {
+                return null;
+            }
+
+            while (last.Green.IsToken || last.Green.IsList)
+            {
+                last = last.Parent;
+            }
+
+            return last.Green;
+        }
+
+        private void DefaultMarkupSpanContext(SpanContextBuilder spanContext)
+        {
+            spanContext.ChunkGenerator = new MarkupChunkGenerator();
+            spanContext.EditHandler = new SpanEditHandler(Language.TokenizeString, AcceptedCharactersInternal.Any);
+        }
+
+        private void OtherParserBlock(in SyntaxListBuilder<RazorSyntaxNode> builder)
+        {
+            AcceptMarkerTokenIfNecessary();
+            builder.Add(OutputAsMarkupLiteral());
+
+            RazorSyntaxNode codeBlock;
+            using (PushSpanContextConfig())
+            {
+                codeBlock = CodeParser.ParseBlock();
+            }
+
+            builder.Add(codeBlock);
+            InitializeContext(SpanContext);
+            NextToken();
+        }
+
+        protected static Func<SyntaxToken, bool> IsSpacingToken(bool includeNewLines)
+        {
+            return token => token.Kind == SyntaxKind.Whitespace || (includeNewLines && token.Kind == SyntaxKind.NewLine);
+        }
+
+        internal static bool IsValidAttributeNameToken(SyntaxToken token)
+        {
+            if (token == null)
+            {
+                return false;
+            }
+
+            // These restrictions cover most of the spec defined: http://www.w3.org/TR/html5/syntax.html#attributes-0
+            // However, it's not all of it. For instance we don't special case control characters or allow OpenAngle.
+            // It also doesn't try to exclude Razor specific features such as the @ transition. This is based on the
+            // expectation that the parser handles such scenarios prior to falling through to name resolution.
+            var tokenType = token.Kind;
+            return tokenType != SyntaxKind.Whitespace &&
+                tokenType != SyntaxKind.NewLine &&
+                tokenType != SyntaxKind.CloseAngle &&
+                tokenType != SyntaxKind.OpenAngle &&
+                tokenType != SyntaxKind.ForwardSlash &&
+                tokenType != SyntaxKind.DoubleQuote &&
+                tokenType != SyntaxKind.SingleQuote &&
+                tokenType != SyntaxKind.Equals &&
+                tokenType != SyntaxKind.Marker;
+        }
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlToken.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlToken.cs
deleted file mode 100644
index 2d52ed14e2..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlToken.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// 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;
-using System.Collections.Generic;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class HtmlToken : TokenBase<HtmlTokenType>
-    {
-        internal static readonly HtmlToken Hyphen = new HtmlToken("-", HtmlTokenType.Text);
-
-        public HtmlToken(string content, HtmlTokenType type)
-            : base(content, type, RazorDiagnostic.EmptyArray)
-        {
-            if (content == null)
-            {
-                throw new ArgumentNullException(nameof(content));
-            }
-        }
-
-        public HtmlToken(
-            string content,
-            HtmlTokenType type,
-            IReadOnlyList<RazorDiagnostic> errors)
-            : base(content, type, errors)
-        {
-            if (content == null)
-            {
-                throw new ArgumentNullException(nameof(content));
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlTokenType.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlTokenType.cs
deleted file mode 100644
index 82d96d7ebc..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlTokenType.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// 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;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    [Flags]
-    internal enum HtmlTokenType
-    {
-        Unknown,
-        Text, // Text which isn't one of the below
-        WhiteSpace, // Non-newline Whitespace
-        NewLine, // Newline
-        OpenAngle, // <
-        Bang, // !
-        ForwardSlash, // /
-        QuestionMark, // ?
-        DoubleHyphen, // --
-        LeftBracket, // [
-        CloseAngle, // >
-        RightBracket, // ]
-        Equals, // =
-        DoubleQuote, // "
-        SingleQuote, // '
-        Transition, // @
-        Colon,
-        RazorComment,
-        RazorCommentStar,
-        RazorCommentTransition
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlTokenizer.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlTokenizer.cs
index 99a7152447..b06f49f9ea 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlTokenizer.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlTokenizer.cs
@@ -3,11 +3,12 @@
 
 using System.Collections.Generic;
 using System.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     // Tokenizer _loosely_ based on http://dev.w3.org/html5/spec/Overview.html#tokenization
-    internal class HtmlTokenizer : Tokenizer<HtmlToken, HtmlTokenType>
+    internal class HtmlTokenizer : Tokenizer
     {
         private const char TransitionChar = '@';
 
@@ -21,24 +22,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         private new HtmlTokenizerState? CurrentState => (HtmlTokenizerState?)base.CurrentState;
 
-        public override HtmlTokenType RazorCommentType
+        public override SyntaxKind RazorCommentKind
         {
-            get { return HtmlTokenType.RazorComment; }
+            get { return SyntaxKind.RazorCommentLiteral; }
         }
 
-        public override HtmlTokenType RazorCommentTransitionType
+        public override SyntaxKind RazorCommentTransitionKind
         {
-            get { return HtmlTokenType.RazorCommentTransition; }
+            get { return SyntaxKind.RazorCommentTransition; }
         }
 
-        public override HtmlTokenType RazorCommentStarType
+        public override SyntaxKind RazorCommentStarKind
         {
-            get { return HtmlTokenType.RazorCommentStar; }
+            get { return SyntaxKind.RazorCommentStar; }
         }
 
-        protected override HtmlToken CreateToken(string content, HtmlTokenType type, IReadOnlyList<RazorDiagnostic> errors)
+        protected override SyntaxToken CreateToken(string content, SyntaxKind type, IReadOnlyList<RazorDiagnostic> errors)
         {
-            return new HtmlToken(content, type, errors);
+            return SyntaxFactory.Token(type, content, errors);
         }
 
         protected override StateResult Dispatch()
@@ -66,7 +67,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         // Optimize memory allocation by returning constants for the most frequent cases
-        protected override string GetTokenContent(HtmlTokenType type)
+        protected override string GetTokenContent(SyntaxKind type)
         {
             var tokenLength = Buffer.Length;
 
@@ -74,27 +75,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             {
                 switch (type)
                 {
-                    case HtmlTokenType.OpenAngle:
+                    case SyntaxKind.OpenAngle:
                         return "<";
-                    case HtmlTokenType.Bang:
+                    case SyntaxKind.Bang:
                         return "!";
-                    case HtmlTokenType.ForwardSlash:
+                    case SyntaxKind.ForwardSlash:
                         return "/";
-                    case HtmlTokenType.QuestionMark:
+                    case SyntaxKind.QuestionMark:
                         return "?";
-                    case HtmlTokenType.LeftBracket:
+                    case SyntaxKind.LeftBracket:
                         return "[";
-                    case HtmlTokenType.CloseAngle:
+                    case SyntaxKind.CloseAngle:
                         return ">";
-                    case HtmlTokenType.RightBracket:
+                    case SyntaxKind.RightBracket:
                         return "]";
-                    case HtmlTokenType.Equals:
+                    case SyntaxKind.Equals:
                         return "=";
-                    case HtmlTokenType.DoubleQuote:
+                    case SyntaxKind.DoubleQuote:
                         return "\"";
-                    case HtmlTokenType.SingleQuote:
+                    case SyntaxKind.SingleQuote:
                         return "'";
-                    case HtmlTokenType.WhiteSpace:
+                    case SyntaxKind.Whitespace:
                         if (Buffer[0] == ' ')
                         {
                             return " ";
@@ -104,7 +105,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                             return "\t";
                         }
                         break;
-                    case HtmlTokenType.NewLine:
+                    case SyntaxKind.NewLine:
                         if (Buffer[0] == '\n')
                         {
                             return "\n";
@@ -113,7 +114,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 }
             }
 
-            if (tokenLength == 2 && type == HtmlTokenType.NewLine)
+            if (tokenLength == 2 && type == SyntaxKind.NewLine)
             {
                 return "\r\n";
             }
@@ -139,17 +140,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 {
                     return Transition(
                         HtmlTokenizerState.AfterRazorCommentTransition,
-                        EndToken(HtmlTokenType.RazorCommentTransition));
+                        EndToken(SyntaxKind.RazorCommentTransition));
                 }
                 else if (CurrentCharacter == '@')
                 {
                     // Could be escaped comment transition
                     return Transition(
                         HtmlTokenizerState.EscapedRazorCommentTransition,
-                        EndToken(HtmlTokenType.Transition));
+                        EndToken(SyntaxKind.Transition));
                 }
 
-                return Stay(EndToken(HtmlTokenType.Transition));
+                return Stay(EndToken(SyntaxKind.Transition));
             }
             else if (AtToken())
             {
@@ -164,7 +165,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         private StateResult EscapedRazorCommentTransition()
         {
             TakeCurrent();
-            return Transition(HtmlTokenizerState.Data, EndToken(HtmlTokenType.Transition));
+            return Transition(HtmlTokenizerState.Data, EndToken(SyntaxKind.Transition));
         }
 
         private StateResult Text()
@@ -190,10 +191,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
 
             // Output the Text token and return to the Data state to tokenize the next character (if there is one)
-            return Transition(HtmlTokenizerState.Data, EndToken(HtmlTokenType.Text));
+            return Transition(HtmlTokenizerState.Data, EndToken(SyntaxKind.Text));
         }
 
-        private HtmlToken Token()
+        private SyntaxToken Token()
         {
             Debug.Assert(AtToken());
             var sym = CurrentCharacter;
@@ -201,45 +202,45 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             switch (sym)
             {
                 case '<':
-                    return EndToken(HtmlTokenType.OpenAngle);
+                    return EndToken(SyntaxKind.OpenAngle);
                 case '!':
-                    return EndToken(HtmlTokenType.Bang);
+                    return EndToken(SyntaxKind.Bang);
                 case '/':
-                    return EndToken(HtmlTokenType.ForwardSlash);
+                    return EndToken(SyntaxKind.ForwardSlash);
                 case '?':
-                    return EndToken(HtmlTokenType.QuestionMark);
+                    return EndToken(SyntaxKind.QuestionMark);
                 case '[':
-                    return EndToken(HtmlTokenType.LeftBracket);
+                    return EndToken(SyntaxKind.LeftBracket);
                 case '>':
-                    return EndToken(HtmlTokenType.CloseAngle);
+                    return EndToken(SyntaxKind.CloseAngle);
                 case ']':
-                    return EndToken(HtmlTokenType.RightBracket);
+                    return EndToken(SyntaxKind.RightBracket);
                 case '=':
-                    return EndToken(HtmlTokenType.Equals);
+                    return EndToken(SyntaxKind.Equals);
                 case '"':
-                    return EndToken(HtmlTokenType.DoubleQuote);
+                    return EndToken(SyntaxKind.DoubleQuote);
                 case '\'':
-                    return EndToken(HtmlTokenType.SingleQuote);
+                    return EndToken(SyntaxKind.SingleQuote);
                 case '-':
                     Debug.Assert(CurrentCharacter == '-');
                     TakeCurrent();
-                    return EndToken(HtmlTokenType.DoubleHyphen);
+                    return EndToken(SyntaxKind.DoubleHyphen);
                 default:
                     Debug.Fail("Unexpected token!");
-                    return EndToken(HtmlTokenType.Unknown);
+                    return EndToken(SyntaxKind.Marker);
             }
         }
 
-        private HtmlToken Whitespace()
+        private SyntaxToken Whitespace()
         {
             while (ParserHelpers.IsWhitespace(CurrentCharacter))
             {
                 TakeCurrent();
             }
-            return EndToken(HtmlTokenType.WhiteSpace);
+            return EndToken(SyntaxKind.Whitespace);
         }
 
-        private HtmlToken Newline()
+        private SyntaxToken Newline()
         {
             Debug.Assert(ParserHelpers.IsNewLine(CurrentCharacter));
             // CSharp Spec §2.3.1
@@ -249,7 +250,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             {
                 TakeCurrent();
             }
-            return EndToken(HtmlTokenType.NewLine);
+            return EndToken(SyntaxKind.NewLine);
         }
 
         private bool AtToken()
@@ -274,7 +275,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return Transition((int)state, result: null);
         }
 
-        private StateResult Transition(HtmlTokenizerState state, HtmlToken result)
+        private StateResult Transition(HtmlTokenizerState state, SyntaxToken result)
         {
             return Transition((int)state, result);
         }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/IParentChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/IParentChunkGenerator.cs
deleted file mode 100644
index 355923e240..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/IParentChunkGenerator.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal interface IParentChunkGenerator
-    {
-        void GenerateStartParentChunk(Block target, ChunkGeneratorContext context);
-        void GenerateEndParentChunk(Block target, ChunkGeneratorContext context);
-
-        void Accept(ParserVisitor visitor, Block block);
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ISpanChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ISpanChunkGenerator.cs
index ef402d411d..1ed28f13c8 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ISpanChunkGenerator.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ISpanChunkGenerator.cs
@@ -5,8 +5,5 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal interface ISpanChunkGenerator
     {
-        void GenerateChunk(Span target, ChunkGeneratorContext context);
-
-        void Accept(ParserVisitor visitor, Span span);
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/IToken.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/IToken.cs
deleted file mode 100644
index 2f8eb1214d..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/IToken.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal interface IToken
-    {
-        Span Parent { get; set; }
-
-        string Content { get; }
-
-        SourceLocation Start { get; }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ITokenizer.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ITokenizer.cs
index 530df75dbc..0dac9f1b4f 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ITokenizer.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ITokenizer.cs
@@ -1,10 +1,12 @@
 // 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal interface ITokenizer
     {
-        IToken NextToken();
+        SyntaxToken NextToken();
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ImplicitExpressionEditHandler.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ImplicitExpressionEditHandler.cs
index b3869f00d0..6bd5e900ec 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ImplicitExpressionEditHandler.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ImplicitExpressionEditHandler.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
@@ -16,7 +17,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         private readonly ISet<string> _keywords;
         private readonly IReadOnlyCollection<string> _readOnlyKeywords;
 
-        public ImplicitExpressionEditHandler(Func<string, IEnumerable<IToken>> tokenizer, ISet<string> keywords, bool acceptTrailingDot)
+        public ImplicitExpressionEditHandler(Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> tokenizer, ISet<string> keywords, bool acceptTrailingDot)
             : base(tokenizer)
         {
             _keywords = keywords ?? new HashSet<string>();
@@ -59,7 +60,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return hashCodeCombiner;
         }
 
-        protected override PartialParseResultInternal CanAcceptChange(Span target, SourceChange change)
+        protected override PartialParseResultInternal CanAcceptChange(SyntaxNode target, SourceChange change)
         {
             if (AcceptedCharacters == AcceptedCharactersInternal.Any)
             {
@@ -87,13 +88,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             {
                 return HandleReplacement(target, change);
             }
-            var changeRelativePosition = change.Span.AbsoluteIndex - target.Start.AbsoluteIndex;
+            var changeRelativePosition = change.Span.AbsoluteIndex - target.Position;
 
             // Get the edit context
             char? lastChar = null;
-            if (changeRelativePosition > 0 && target.Content.Length > 0)
+            if (changeRelativePosition > 0 && target.FullWidth > 0)
             {
-                lastChar = target.Content[changeRelativePosition - 1];
+                lastChar = target.GetContent()[changeRelativePosition - 1];
             }
 
             // Don't support 0->1 length edits
@@ -128,18 +129,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         // A dotless commit is the process of inserting a '.' with an intellisense selection.
-        private static bool IsDotlessCommitInsertion(Span target, SourceChange change)
+        private static bool IsDotlessCommitInsertion(SyntaxNode target, SourceChange change)
         {
             return IsNewDotlessCommitInsertion(target, change) || IsSecondaryDotlessCommitInsertion(target, change);
         }
 
         // Completing 'DateTime' in intellisense with a '.' could result in: '@DateT' -> '@DateT.' -> '@DateTime.' which is accepted.
-        private static bool IsNewDotlessCommitInsertion(Span target, SourceChange change)
+        private static bool IsNewDotlessCommitInsertion(SyntaxNode target, SourceChange change)
         {
             return !IsAtEndOfSpan(target, change) &&
                    change.Span.AbsoluteIndex > 0 &&
                    change.NewText.Length > 0 &&
-                   target.Content.Last() == '.' &&
+                   target.GetContent().Last() == '.' &&
                    ParserHelpers.IsIdentifier(change.NewText, requireIdentifierStart: false) &&
                    (change.Span.Length == 0 || ParserHelpers.IsIdentifier(change.GetOriginalText(target), requireIdentifierStart: false));
         }
@@ -147,45 +148,46 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         // Once a dotless commit has been performed you then have something like '@DateTime.'.  This scenario is used to detect the
         // situation when you try to perform another dotless commit resulting in a textchange with '..'.  Completing 'DateTime.Now'
         // in intellisense with a '.' could result in: '@DateTime.' -> '@DateTime..' -> '@DateTime.Now.' which is accepted.
-        private static bool IsSecondaryDotlessCommitInsertion(Span target, SourceChange change)
+        private static bool IsSecondaryDotlessCommitInsertion(SyntaxNode target, SourceChange change)
         {
             // Do not need to worry about other punctuation, just looking for double '.' (after change)
             return change.NewText.Length == 1 &&
                    change.NewText == "." &&
-                   !string.IsNullOrEmpty(target.Content) &&
-                   target.Content.Last() == '.' &&
+                   !string.IsNullOrEmpty(target.GetContent()) &&
+                   target.GetContent().Last() == '.' &&
                    change.Span.Length == 0;
         }
 
-        private static bool IsAcceptableReplace(Span target, SourceChange change)
+        private static bool IsAcceptableReplace(SyntaxNode target, SourceChange change)
         {
             return IsEndReplace(target, change) ||
                    (change.IsReplace && RemainingIsWhitespace(target, change));
         }
 
-        private bool IsAcceptableIdentifierReplacement(Span target, SourceChange change)
+        private bool IsAcceptableIdentifierReplacement(SyntaxNode target, SourceChange change)
         {
             if (!change.IsReplace)
             {
                 return false;
             }
 
-            for (var i = 0; i < target.Tokens.Count; i++)
+            var tokens = target.DescendantNodes().Where(n => n.IsToken).Cast<SyntaxToken>().ToArray();
+            for (var i = 0; i < tokens.Length; i++)
             {
-                var token = target.Tokens[i] as CSharpToken;
+                var token = tokens[i];
 
                 if (token == null)
                 {
                     break;
                 }
 
-                var tokenStartIndex = token.Start.AbsoluteIndex;
-                var tokenEndIndex = tokenStartIndex + token.Content.Length;
+                var tokenStartIndex = token.Position;
+                var tokenEndIndex = token.EndPosition;
 
                 // We're looking for the first token that contains the SourceChange.
                 if (tokenEndIndex > change.Span.AbsoluteIndex)
                 {
-                    if (tokenEndIndex >= change.Span.AbsoluteIndex + change.Span.Length && token.Type == CSharpTokenType.Identifier)
+                    if (tokenEndIndex >= change.Span.AbsoluteIndex + change.Span.Length && token.Kind == SyntaxKind.Identifier)
                     {
                         // The token we're changing happens to be an identifier. Need to check if its transformed state is also one.
                         // We do this transformation logic to capture the case that the new text change happens to not be an identifier;
@@ -200,8 +202,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                             break;
                         }
 
-                        var newToken = (CSharpToken)newTokens.First();
-                        if (newToken.Type == CSharpTokenType.Identifier)
+                        var newToken = newTokens.First();
+                        if (newToken.Kind == SyntaxKind.Identifier)
                         {
                             return true;
                         }
@@ -216,14 +218,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return false;
         }
 
-        private static bool IsAcceptableDeletion(Span target, SourceChange change)
+        private static bool IsAcceptableDeletion(SyntaxNode target, SourceChange change)
         {
             return IsEndDeletion(target, change) ||
                    (change.IsDelete && RemainingIsWhitespace(target, change));
         }
 
         // Acceptable insertions can occur at the end of a span or when a '.' is inserted within a span.
-        private static bool IsAcceptableInsertion(Span target, SourceChange change)
+        private static bool IsAcceptableInsertion(SyntaxNode target, SourceChange change)
         {
             return change.IsInsert &&
                 (IsAcceptableEndInsertion(target, change) ||
@@ -231,7 +233,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         // Internal for testing
-        internal static bool IsAcceptableDeletionInBalancedParenthesis(Span target, SourceChange change)
+        internal static bool IsAcceptableDeletionInBalancedParenthesis(SyntaxNode target, SourceChange change)
         {
             if (!change.IsDelete)
             {
@@ -241,15 +243,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             var changeStart = change.Span.AbsoluteIndex;
             var changeLength = change.Span.Length;
             var changeEnd = changeStart + changeLength;
-            var tokens = target.Tokens.Cast<CSharpToken>().ToArray();
+            var tokens = target.DescendantNodes().Where(n => n.IsToken).Cast<SyntaxToken>().ToArray();
             if (!IsInsideParenthesis(changeStart, tokens) || !IsInsideParenthesis(changeEnd, tokens))
             {
                 // Either the start or end of the delete does not fall inside of parenthesis, unacceptable inner deletion.
                 return false;
             }
 
-            var relativePosition = changeStart - target.Start.AbsoluteIndex;
-            var deletionContent = target.Content.Substring(relativePosition, changeLength);
+            var relativePosition = changeStart - target.Position;
+            var deletionContent = target.GetContent().Substring(relativePosition, changeLength);
 
             if (deletionContent.IndexOfAny(new[] { '(', ')' }) >= 0)
             {
@@ -261,7 +263,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         // Internal for testing
-        internal static bool IsAcceptableInsertionInBalancedParenthesis(Span target, SourceChange change)
+        internal static bool IsAcceptableInsertionInBalancedParenthesis(SyntaxNode target, SourceChange change)
         {
             if (!change.IsInsert)
             {
@@ -274,7 +276,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 return false;
             }
 
-            var tokens = target.Tokens.Cast<CSharpToken>().ToArray();
+            var tokens = target.DescendantNodes().Where(n => n.IsToken).Cast<SyntaxToken>().ToArray();
             if (IsInsideParenthesis(change.Span.AbsoluteIndex, tokens))
             {
                 return true;
@@ -284,7 +286,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         // Internal for testing
-        internal static bool IsInsideParenthesis(int position, IReadOnlyList<CSharpToken> tokens)
+        internal static bool IsInsideParenthesis(int position, IReadOnlyList<SyntaxToken> tokens)
         {
             var balanceCount = 0;
             var foundInsertionPoint = false;
@@ -322,9 +324,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         // Internal for testing
-        internal static bool ContainsPosition(int position, CSharpToken currentToken)
+        internal static bool ContainsPosition(int position, SyntaxToken currentToken)
         {
-            var tokenStart = currentToken.Start.AbsoluteIndex;
+            var tokenStart = currentToken.Position;
             if (tokenStart == position)
             {
                 // Token is exactly at the insertion point.
@@ -342,14 +344,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         // Internal for testing
-        internal static bool TryUpdateBalanceCount(CSharpToken token, ref int count)
+        internal static bool TryUpdateBalanceCount(SyntaxToken token, ref int count)
         {
             var updatedCount = count;
-            if (token.Type == CSharpTokenType.LeftParenthesis)
+            if (token.Kind == SyntaxKind.LeftParenthesis)
             {
                 updatedCount++;
             }
-            else if (token.Type == CSharpTokenType.RightParenthesis)
+            else if (token.Kind == SyntaxKind.RightParenthesis)
             {
                 if (updatedCount == 0)
                 {
@@ -358,7 +360,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
                 updatedCount--;
             }
-            else if (token.Type == CSharpTokenType.StringLiteral)
+            else if (token.Kind == SyntaxKind.StringLiteral)
             {
                 var content = token.Content;
                 if (content.Length > 0 && content[content.Length - 1] != '"')
@@ -370,7 +372,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     }
                 }
             }
-            else if (token.Type == CSharpTokenType.CharacterLiteral)
+            else if (token.Kind == SyntaxKind.CharacterLiteral)
             {
                 var content = token.Content;
                 if (content.Length > 0 && content[content.Length - 1] != '\'')
@@ -419,7 +421,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         // Accepts character insertions at the end of spans.  AKA: '@foo' -> '@fooo' or '@foo' -> '@foo   ' etc.
-        private static bool IsAcceptableEndInsertion(Span target, SourceChange change)
+        private static bool IsAcceptableEndInsertion(SyntaxNode target, SourceChange change)
         {
             Debug.Assert(change.IsInsert);
 
@@ -429,7 +431,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         // Accepts '.' insertions in the middle of spans. Ex: '@foo.baz.bar' -> '@foo..baz.bar'
         // This is meant to allow intellisense when editing a span.
-        private static bool IsAcceptableInnerInsertion(Span target, SourceChange change)
+        private static bool IsAcceptableInnerInsertion(SyntaxNode target, SourceChange change)
         {
             Debug.Assert(change.IsInsert);
 
@@ -441,23 +443,23 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                    change.NewText == ".";
         }
 
-        private static bool RemainingIsWhitespace(Span target, SourceChange change)
+        private static bool RemainingIsWhitespace(SyntaxNode target, SourceChange change)
         {
-            var offset = (change.Span.AbsoluteIndex - target.Start.AbsoluteIndex) + change.Span.Length;
-            return string.IsNullOrWhiteSpace(target.Content.Substring(offset));
+            var offset = (change.Span.AbsoluteIndex - target.Position) + change.Span.Length;
+            return string.IsNullOrWhiteSpace(target.GetContent().Substring(offset));
         }
 
-        private PartialParseResultInternal HandleDotlessCommitInsertion(Span target)
+        private PartialParseResultInternal HandleDotlessCommitInsertion(SyntaxNode target)
         {
             var result = PartialParseResultInternal.Accepted;
-            if (!AcceptTrailingDot && target.Content.LastOrDefault() == '.')
+            if (!AcceptTrailingDot && target.GetContent().LastOrDefault() == '.')
             {
                 result |= PartialParseResultInternal.Provisional;
             }
             return result;
         }
 
-        private PartialParseResultInternal HandleReplacement(Span target, SourceChange change)
+        private PartialParseResultInternal HandleReplacement(SyntaxNode target, SourceChange change)
         {
             // Special Case for IntelliSense commits.
             //  When IntelliSense commits, we get two changes (for example user typed "Date", then committed "DateTime" by pressing ".")
@@ -478,7 +480,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return result;
         }
 
-        private PartialParseResultInternal HandleDeletion(Span target, char previousChar, SourceChange change)
+        private PartialParseResultInternal HandleDeletion(SyntaxNode target, char previousChar, SourceChange change)
         {
             // What's left after deleting?
             if (previousChar == '.')
@@ -491,8 +493,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
             else if (previousChar == '(')
             {
-                var changeRelativePosition = change.Span.AbsoluteIndex - target.Start.AbsoluteIndex;
-                if (target.Content[changeRelativePosition] == ')')
+                var changeRelativePosition = change.Span.AbsoluteIndex - target.Position;
+                if (target.GetContent()[changeRelativePosition] == ')')
                 {
                     return PartialParseResultInternal.Accepted | PartialParseResultInternal.Provisional;
                 }
@@ -501,7 +503,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return PartialParseResultInternal.Rejected;
         }
 
-        private PartialParseResultInternal HandleInsertion(Span target, char previousChar, SourceChange change)
+        private PartialParseResultInternal HandleInsertion(SyntaxNode target, char previousChar, SourceChange change)
         {
             // What are we inserting after?
             if (previousChar == '.')
@@ -522,7 +524,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        private PartialParseResultInternal HandleInsertionAfterIdPart(Span target, SourceChange change)
+        private PartialParseResultInternal HandleInsertionAfterIdPart(SyntaxNode target, SourceChange change)
         {
             // If the insertion is a full identifier part, accept it
             if (ParserHelpers.IsIdentifier(change.NewText, requireIdentifierStart: false))
@@ -551,7 +553,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        private PartialParseResultInternal HandleInsertionAfterOpenParenthesis(Span target, SourceChange change)
+        private PartialParseResultInternal HandleInsertionAfterOpenParenthesis(SyntaxNode target, SourceChange change)
         {
             if (IsCloseParenthesisInsertion(change))
             {
@@ -561,6 +563,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return PartialParseResultInternal.Rejected;
         }
 
+        private PartialParseResultInternal HandleInsertionAfterDot(SyntaxNode target, SourceChange change)
+        {
+            // If the insertion is a full identifier or another dot, accept it
+            if (ParserHelpers.IsIdentifier(change.NewText) || change.NewText == ".")
+            {
+                return TryAcceptChange(target, change);
+            }
+            return PartialParseResultInternal.Rejected;
+        }
+
+        private PartialParseResultInternal TryAcceptChange(SyntaxNode target, SourceChange change, PartialParseResultInternal acceptResult = PartialParseResultInternal.Accepted)
+        {
+            var content = change.GetEditedContent(target);
+            if (StartsWithKeyword(content))
+            {
+                return PartialParseResultInternal.Rejected | PartialParseResultInternal.SpanContextChanged;
+            }
+
+            return acceptResult;
+        }
+
         private static bool IsDoubleParenthesisInsertion(SourceChange change)
         {
             return
@@ -592,27 +615,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     content.Take(content.Length - 1).All(ParserHelpers.IsIdentifierPart));
         }
 
-        private PartialParseResultInternal HandleInsertionAfterDot(Span target, SourceChange change)
-        {
-            // If the insertion is a full identifier or another dot, accept it
-            if (ParserHelpers.IsIdentifier(change.NewText) || change.NewText == ".")
-            {
-                return TryAcceptChange(target, change);
-            }
-            return PartialParseResultInternal.Rejected;
-        }
-
-        private PartialParseResultInternal TryAcceptChange(Span target, SourceChange change, PartialParseResultInternal acceptResult = PartialParseResultInternal.Accepted)
-        {
-            var content = change.GetEditedContent(target);
-            if (StartsWithKeyword(content))
-            {
-                return PartialParseResultInternal.Rejected | PartialParseResultInternal.SpanContextChanged;
-            }
-
-            return acceptResult;
-        }
-
         private bool StartsWithKeyword(string newContent)
         {
             using (var reader = new StringReader(newContent))
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/KnownTokenType.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/KnownTokenType.cs
index ca5fad7254..da9290ef53 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/KnownTokenType.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/KnownTokenType.cs
@@ -5,7 +5,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal enum KnownTokenType
     {
-        WhiteSpace,
+        Whitespace,
         NewLine,
         Identifier,
         Keyword,
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LanguageCharacteristics.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LanguageCharacteristics.cs
index b12bf612b9..94b3f9acee 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LanguageCharacteristics.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LanguageCharacteristics.cs
@@ -3,30 +3,29 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
-    internal abstract class LanguageCharacteristics<TTokenizer, TToken, TTokenType>
-        where TTokenType : struct
-        where TTokenizer : Tokenizer<TToken, TTokenType>
-        where TToken : TokenBase<TTokenType>
+    internal abstract class LanguageCharacteristics<TTokenizer>
+        where TTokenizer : Tokenizer
     {
-        public abstract string GetSample(TTokenType type);
+        public abstract string GetSample(SyntaxKind type);
         public abstract TTokenizer CreateTokenizer(ITextDocument source);
-        public abstract TTokenType FlipBracket(TTokenType bracket);
-        public abstract TToken CreateMarkerToken();
+        public abstract SyntaxKind FlipBracket(SyntaxKind bracket);
+        public abstract SyntaxToken CreateMarkerToken();
 
-        public virtual IEnumerable<TToken> TokenizeString(string content)
+        public virtual IEnumerable<SyntaxToken> TokenizeString(string content)
         {
             return TokenizeString(SourceLocation.Zero, content);
         }
 
-        public virtual IEnumerable<TToken> TokenizeString(SourceLocation start, string input)
+        public virtual IEnumerable<SyntaxToken> TokenizeString(SourceLocation start, string input)
         {
             using (var reader = new SeekableTextReader(input, start.FilePath))
             {
                 var tok = CreateTokenizer(reader);
-                TToken token;
+                SyntaxToken token;
                 while ((token = tok.NextToken()) != null)
                 {
                     yield return token;
@@ -34,76 +33,76 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        public virtual bool IsWhiteSpace(TToken token)
+        public virtual bool IsWhitespace(SyntaxToken token)
         {
-            return IsKnownTokenType(token, KnownTokenType.WhiteSpace);
+            return IsKnownTokenType(token, KnownTokenType.Whitespace);
         }
 
-        public virtual bool IsNewLine(TToken token)
+        public virtual bool IsNewLine(SyntaxToken token)
         {
             return IsKnownTokenType(token, KnownTokenType.NewLine);
         }
 
-        public virtual bool IsIdentifier(TToken token)
+        public virtual bool IsIdentifier(SyntaxToken token)
         {
             return IsKnownTokenType(token, KnownTokenType.Identifier);
         }
 
-        public virtual bool IsKeyword(TToken token)
+        public virtual bool IsKeyword(SyntaxToken token)
         {
             return IsKnownTokenType(token, KnownTokenType.Keyword);
         }
 
-        public virtual bool IsTransition(TToken token)
+        public virtual bool IsTransition(SyntaxToken token)
         {
             return IsKnownTokenType(token, KnownTokenType.Transition);
         }
 
-        public virtual bool IsCommentStart(TToken token)
+        public virtual bool IsCommentStart(SyntaxToken token)
         {
             return IsKnownTokenType(token, KnownTokenType.CommentStart);
         }
 
-        public virtual bool IsCommentStar(TToken token)
+        public virtual bool IsCommentStar(SyntaxToken token)
         {
             return IsKnownTokenType(token, KnownTokenType.CommentStar);
         }
 
-        public virtual bool IsCommentBody(TToken token)
+        public virtual bool IsCommentBody(SyntaxToken token)
         {
             return IsKnownTokenType(token, KnownTokenType.CommentBody);
         }
 
-        public virtual bool IsUnknown(TToken token)
+        public virtual bool IsUnknown(SyntaxToken token)
         {
             return IsKnownTokenType(token, KnownTokenType.Unknown);
         }
 
-        public virtual bool IsKnownTokenType(TToken token, KnownTokenType type)
+        public virtual bool IsKnownTokenType(SyntaxToken token, KnownTokenType type)
         {
-            return token != null && Equals(token.Type, GetKnownTokenType(type));
+            return token != null && Equals(token.Kind, GetKnownTokenType(type));
         }
 
-        public virtual Tuple<TToken, TToken> SplitToken(TToken token, int splitAt, TTokenType leftType)
+        public virtual Tuple<SyntaxToken, SyntaxToken> SplitToken(SyntaxToken token, int splitAt, SyntaxKind leftType)
         {
             var left = CreateToken(token.Content.Substring(0, splitAt), leftType, RazorDiagnostic.EmptyArray);
 
-            TToken right = null;
+            SyntaxToken right = null;
             if (splitAt < token.Content.Length)
             {
-                right = CreateToken(token.Content.Substring(splitAt), token.Type, token.Errors);
+                right = CreateToken(token.Content.Substring(splitAt), token.Kind, token.GetDiagnostics());
             }
 
             return Tuple.Create(left, right);
         }
 
-        public abstract TTokenType GetKnownTokenType(KnownTokenType type);
+        public abstract SyntaxKind GetKnownTokenType(KnownTokenType type);
 
         public virtual bool KnowsTokenType(KnownTokenType type)
         {
             return type == KnownTokenType.Unknown || !Equals(GetKnownTokenType(type), GetKnownTokenType(KnownTokenType.Unknown));
         }
 
-        protected abstract TToken CreateToken(string content, TTokenType type, IReadOnlyList<RazorDiagnostic> errors);
+        protected abstract SyntaxToken CreateToken(string content, SyntaxKind type, IReadOnlyList<RazorDiagnostic> errors);
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LegacySyntaxNodeExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LegacySyntaxNodeExtensions.cs
new file mode 100644
index 0000000000..cfe840d4f3
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LegacySyntaxNodeExtensions.cs
@@ -0,0 +1,248 @@
+// 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;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal static class LegacySyntaxNodeExtensions
+    {
+        private static readonly SyntaxKind[] TransitionSpanKinds = new SyntaxKind[]
+        {
+            SyntaxKind.CSharpTransition,
+            SyntaxKind.MarkupTransition,
+        };
+
+        private static readonly SyntaxKind[] MetaCodeSpanKinds = new SyntaxKind[]
+        {
+            SyntaxKind.RazorMetaCode,
+        };
+
+        private static readonly SyntaxKind[] CommentSpanKinds = new SyntaxKind[]
+        {
+            SyntaxKind.RazorCommentLiteral,
+        };
+
+        private static readonly SyntaxKind[] CodeSpanKinds = new SyntaxKind[]
+        {
+            SyntaxKind.CSharpStatementLiteral,
+            SyntaxKind.CSharpExpressionLiteral,
+            SyntaxKind.CSharpEphemeralTextLiteral,
+        };
+
+        private static readonly SyntaxKind[] MarkupSpanKinds = new SyntaxKind[]
+        {
+            SyntaxKind.MarkupTextLiteral,
+            SyntaxKind.MarkupEphemeralTextLiteral,
+        };
+
+        private static readonly SyntaxKind[] NoneSpanKinds = new SyntaxKind[]
+        {
+            SyntaxKind.UnclassifiedTextLiteral,
+        };
+
+        public static SpanContext GetSpanContext(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var context = node.GetAnnotationValue(SyntaxConstants.SpanContextKind);
+
+            return context is SpanContext ? (SpanContext)context : null;
+        }
+
+        public static TNode WithSpanContext<TNode>(this TNode node, SpanContext spanContext) where TNode : SyntaxNode
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var newAnnotation = new SyntaxAnnotation(SyntaxConstants.SpanContextKind, spanContext);
+
+            var newAnnotations = new List<SyntaxAnnotation>();
+            newAnnotations.Add(newAnnotation);
+            foreach (var annotation in node.GetAnnotations())
+            {
+                if (annotation.Kind != newAnnotation.Kind)
+                {
+                    newAnnotations.Add(annotation);
+                }
+            }
+
+            return node.WithAnnotations(newAnnotations.ToArray());
+        }
+
+        public static SyntaxNode LocateOwner(this SyntaxNode node, SourceChange change)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            if (change.Span.AbsoluteIndex < node.Position)
+            {
+                // Early escape for cases where changes overlap multiple spans
+                // In those cases, the span will return false, and we don't want to search the whole tree
+                // So if the current span starts after the change, we know we've searched as far as we need to
+                return null;
+            }
+
+            if (IsSpanKind(node))
+            {
+                var editHandler = node.GetSpanContext()?.EditHandler ?? SpanEditHandler.CreateDefault();
+                return editHandler.OwnsChange(node, change) ? node : null;
+            }
+
+            SyntaxNode owner = null;
+            var children = node.ChildNodes();
+            foreach (var child in children)
+            {
+                owner = LocateOwner(child, change);
+                if (owner != null)
+                {
+                    break;
+                }
+            }
+
+            return owner;
+        }
+
+        public static bool IsTransitionSpanKind(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return TransitionSpanKinds.Contains(node.Kind);
+        }
+
+        public static bool IsMetaCodeSpanKind(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return MetaCodeSpanKinds.Contains(node.Kind);
+        }
+
+        public static bool IsCommentSpanKind(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return CommentSpanKinds.Contains(node.Kind);
+        }
+
+        public static bool IsCodeSpanKind(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return CodeSpanKinds.Contains(node.Kind);
+        }
+
+        public static bool IsMarkupSpanKind(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return MarkupSpanKinds.Contains(node.Kind);
+        }
+
+        public static bool IsNoneSpanKind(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return NoneSpanKinds.Contains(node.Kind);
+        }
+
+        public static bool IsSpanKind(this SyntaxNode node)
+        {
+            return IsTransitionSpanKind(node) ||
+                IsMetaCodeSpanKind(node) ||
+                IsCommentSpanKind(node) ||
+                IsCodeSpanKind(node) ||
+                IsMarkupSpanKind(node) ||
+                IsNoneSpanKind(node);
+        }
+
+        public static IEnumerable<SyntaxNode> FlattenSpans(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            foreach (var child in node.DescendantNodes())
+            {
+                if (child.IsSpanKind())
+                {
+                    yield return child;
+                }
+            }
+        }
+
+        public static SyntaxNode PreviousSpan(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var parent = node.Parent;
+            while (parent != null)
+            {
+                var flattenedSpans = parent.FlattenSpans();
+                var prevSpan = flattenedSpans.LastOrDefault(n => n.EndPosition <= node.Position && n != node);
+                if (prevSpan != null)
+                {
+                    return prevSpan;
+                }
+
+                parent = parent.Parent;
+            }
+
+            return null;
+        }
+
+        public static SyntaxNode NextSpan(this SyntaxNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var parent = node.Parent;
+            while (parent != null)
+            {
+                var flattenedSpans = parent.FlattenSpans();
+                var nextSpan = flattenedSpans.FirstOrDefault(n => n.Position >= node.EndPosition && n != node);
+                if (nextSpan != null)
+                {
+                    return nextSpan;
+                }
+
+                parent = parent.Parent;
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LiteralAttributeChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LiteralAttributeChunkGenerator.cs
index 3cc5f8ca26..4cbdb9bd7a 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LiteralAttributeChunkGenerator.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/LiteralAttributeChunkGenerator.cs
@@ -18,29 +18,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public LocationTagged<string> Value { get; }
 
-        public override void Accept(ParserVisitor visitor, Span span)
-        {
-            visitor.VisitLiteralAttributeSpan(this, span);
-        }
-
-        public override void GenerateChunk(Span target, ChunkGeneratorContext context)
-        {
-            //var chunk = context.ChunkTreeBuilder.StartParentChunk<LiteralCodeAttributeChunk>(target);
-            //chunk.Prefix = Prefix;
-            //chunk.Value = Value;
-
-            //if (ValueGenerator != null)
-            //{
-            //    chunk.ValueLocation = ValueGenerator.Location;
-
-            //    ValueGenerator.Value.GenerateChunk(target, context);
-
-            //    chunk.ValueLocation = ValueGenerator.Location;
-            //}
-
-            //context.ChunkTreeBuilder.EndParentChunk();
-        }
-
         public override string ToString()
         {
             return string.Format(CultureInfo.CurrentCulture, "LitAttr:{0:F}", Prefix);
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/MarkupChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/MarkupChunkGenerator.cs
index d2941ce518..796bf545a6 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/MarkupChunkGenerator.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/MarkupChunkGenerator.cs
@@ -5,16 +5,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal class MarkupChunkGenerator : SpanChunkGenerator
     {
-        public override void GenerateChunk(Span target, ChunkGeneratorContext context)
-        {
-            //context.ChunkTreeBuilder.AddLiteralChunk(target.Content, target);
-        }
-
-        public override void Accept(ParserVisitor visitor, Span span)
-        {
-            visitor.VisitMarkupSpan(this, span);
-        }
-
         public override string ToString()
         {
             return "Markup";
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/MarkupRewriter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/MarkupRewriter.cs
deleted file mode 100644
index 42074050ff..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/MarkupRewriter.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// 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.Collections.Generic;
-using System.Diagnostics;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal abstract class MarkupRewriter : ParserVisitor
-    {
-        private Stack<BlockBuilder> _blocks;
-
-        protected MarkupRewriter()
-        {
-            _blocks = new Stack<BlockBuilder>();
-        }
-
-        protected BlockBuilder Parent => _blocks.Count > 0 ? _blocks.Peek() : null;
-
-        public Block Rewrite(Block root)
-        {
-            root.Accept(this);
-            Debug.Assert(_blocks.Count == 1);
-            var rewrittenRoot = _blocks.Pop().Build();
-
-            return rewrittenRoot;
-        }
-
-        public override void VisitBlock(Block block)
-        {
-            if (CanRewrite(block))
-            {
-                var newNode = RewriteBlock(Parent, block);
-                if (newNode != null)
-                {
-                    Parent.Children.Add(newNode);
-                }
-            }
-            else
-            {
-                // Not rewritable.
-                var builder = new BlockBuilder(block);
-                builder.Children.Clear();
-                _blocks.Push(builder);
-                base.VisitBlock(block);
-                Debug.Assert(ReferenceEquals(builder, Parent));
-
-                if (_blocks.Count > 1)
-                {
-                    _blocks.Pop();
-                    Parent.Children.Add(builder.Build());
-                }
-            }
-        }
-
-        protected abstract bool CanRewrite(Block block);
-
-        protected abstract SyntaxTreeNode RewriteBlock(BlockBuilder parent, Block block);
-
-        public override void VisitSpan(Span span)
-        {
-            Parent.Children.Add(span);
-        }
-
-        protected void FillSpan(SpanBuilder builder, SourceLocation start, string content)
-        {
-            builder.Kind = SpanKindInternal.Markup;
-            builder.ChunkGenerator = new MarkupChunkGenerator();
-
-            foreach (IToken sym in HtmlLanguageCharacteristics.Instance.TokenizeString(start, content))
-            {
-                builder.Accept(sym);
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParentChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParentChunkGenerator.cs
deleted file mode 100644
index 09a8c94f28..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParentChunkGenerator.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal abstract class ParentChunkGenerator : IParentChunkGenerator
-    {
-        private static readonly int TypeHashCode = typeof(ParentChunkGenerator).GetHashCode();
-
-        public static readonly IParentChunkGenerator Null = new NullParentChunkGenerator();
-
-        public abstract void Accept(ParserVisitor visitor, Block block);
-
-        public virtual void GenerateStartParentChunk(Block target, ChunkGeneratorContext context)
-        {
-        }
-
-        public virtual void GenerateEndParentChunk(Block target, ChunkGeneratorContext context)
-        {
-        }
-
-        public override bool Equals(object obj)
-        {
-            return obj != null &&
-                GetType() == obj.GetType();
-        }
-
-        public override int GetHashCode()
-        {
-            return TypeHashCode;
-        }
-
-        private class NullParentChunkGenerator : IParentChunkGenerator
-        {
-            public void GenerateStartParentChunk(Block target, ChunkGeneratorContext context)
-            {
-            }
-
-            public void GenerateEndParentChunk(Block target, ChunkGeneratorContext context)
-            {
-            }
-
-            public override string ToString()
-            {
-                return "None";
-            }
-
-            public void Accept(ParserVisitor visitor, Block block)
-            {
-                visitor.VisitDefault(block);
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserBase.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserBase.cs
index 28a60a09d8..6d07a26c60 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserBase.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserBase.cs
@@ -11,9 +11,5 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         public ParserContext Context { get; }
-
-        public abstract void BuildSpan(SpanBuilder span, SourceLocation start, string content);
-
-        public abstract void ParseBlock();
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserContext.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserContext.cs
index 0bd3da36ff..f8cebfdd35 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserContext.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserContext.cs
@@ -25,13 +25,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             DesignTimeMode = options.DesignTime;
             FeatureFlags = options.FeatureFlags;
             ParseLeadingDirectives = options.ParseLeadingDirectives;
-            Builder = new SyntaxTreeBuilder();
             ErrorSink = new ErrorSink();
             SeenDirectives = new HashSet<string>(StringComparer.Ordinal);
         }
 
-        public SyntaxTreeBuilder Builder { get; }
-
         public ErrorSink ErrorSink { get; set; }
 
         public RazorParserFeatureFlags FeatureFlags { get; }
@@ -50,6 +47,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public bool NullGenerateWhitespaceAndNewLine { get; set; }
 
+        public bool InTemplateContext { get; set; }
+
+        public AcceptedCharactersInternal LastAcceptedCharacters { get; set; } = AcceptedCharactersInternal.None;
+
         public bool EndOfFile
         {
             get { return Source.Peek() == -1; }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserVisitor.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserVisitor.cs
deleted file mode 100644
index fe6031046e..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserVisitor.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal abstract class ParserVisitor
-    {
-        public virtual void Visit(SyntaxTreeNode node)
-        {
-            node.Accept(this);
-        }
-
-        public virtual void VisitDefault(Block block)
-        {
-            for (var i = 0; i < block.Children.Count; i++)
-            {
-                block.Children[i].Accept(this);
-            }
-        }
-
-        public virtual void VisitDefault(Span span)
-        {
-        }
-
-        public virtual void VisitBlock(Block block)
-        {
-            if (block.ChunkGenerator != null)
-            {
-                block.ChunkGenerator.Accept(this, block);
-            }
-        }
-
-        public virtual void VisitSpan(Span span)
-        {
-            if (span.ChunkGenerator != null)
-            {
-                span.ChunkGenerator.Accept(this, span);
-            }
-        }
-
-        public virtual void VisitDynamicAttributeBlock(DynamicAttributeBlockChunkGenerator chunkGenerator, Block block)
-        {
-            VisitDefault(block);
-        }
-
-        public virtual void VisitExpressionBlock(ExpressionChunkGenerator chunkGenerator, Block block)
-        {
-            VisitDefault(block);
-        }
-
-        public virtual void VisitAttributeBlock(AttributeBlockChunkGenerator chunkGenerator, Block block)
-        {
-            VisitDefault(block);
-        }
-
-        public virtual void VisitTemplateBlock(TemplateBlockChunkGenerator chunkGenerator, Block block)
-        {
-            VisitDefault(block);
-        }
-
-        public virtual void VisitCommentBlock(RazorCommentChunkGenerator chunkGenerator, Block block)
-        {
-            VisitDefault(block);
-        }
-
-        public virtual void VisitTagHelperBlock(TagHelperChunkGenerator chunkGenerator, Block block)
-        {
-            VisitDefault(block);
-        }
-
-        public virtual void VisitDirectiveBlock(DirectiveChunkGenerator chunkGenerator, Block block)
-        {
-            VisitDefault(block);
-        }
-
-        public virtual void VisitExpressionSpan(ExpressionChunkGenerator chunkGenerator, Span span)
-        {
-            VisitDefault(span);
-        }
-
-        public virtual void VisitMarkupSpan(MarkupChunkGenerator chunkGenerator, Span span)
-        {
-            VisitDefault(span);
-        }
-
-        public virtual void VisitImportSpan(AddImportChunkGenerator chunkGenerator, Span span)
-        {
-            VisitDefault(span);
-        }
-
-        public virtual void VisitStatementSpan(StatementChunkGenerator chunkGenerator, Span span)
-        {
-            VisitDefault(span);
-        }
-
-        public virtual void VisitLiteralAttributeSpan(LiteralAttributeChunkGenerator chunkGenerator, Span span)
-        {
-            VisitDefault(span);
-        }
-
-        public virtual void VisitDirectiveToken(DirectiveTokenChunkGenerator chunkGenerator, Span span)
-        {
-            VisitDefault(span);
-        }
-
-        public virtual void VisitAddTagHelperSpan(AddTagHelperChunkGenerator chunkGenerator, Span span)
-        {
-            VisitDefault(span);
-        }
-
-        public virtual void VisitRemoveTagHelperSpan(RemoveTagHelperChunkGenerator chunkGenerator, Span span)
-        {
-            VisitDefault(span);
-        }
-
-        public virtual void VisitTagHelperPrefixDirectiveSpan(TagHelperPrefixDirectiveChunkGenerator chunkGenerator, Span span)
-        {
-            VisitDefault(span);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RazorCommentChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RazorCommentChunkGenerator.cs
deleted file mode 100644
index 4d3d13f0b0..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RazorCommentChunkGenerator.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class RazorCommentChunkGenerator : ParentChunkGenerator
-    {
-        public override void Accept(ParserVisitor visitor, Block block)
-        {
-            visitor.VisitCommentBlock(this, block);
-        }
-
-        public override string ToString()
-        {
-            return "RazorComment";
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RazorParser.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RazorParser.cs
index 8e79907b8c..c840bcb707 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RazorParser.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RazorParser.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Linq;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
@@ -39,12 +38,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             codeParser.HtmlParser = markupParser;
             markupParser.CodeParser = codeParser;
 
-            markupParser.ParseDocument();
-            
-            var root = context.Builder.Build();
-
             var diagnostics = context.ErrorSink.Errors;
 
+            var root = markupParser.ParseDocument().CreateRed();
             return RazorSyntaxTree.Create(root, source, diagnostics, Options);
         }
     }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RazorSyntaxTreeExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RazorSyntaxTreeExtensions.cs
index a07082152c..2a3d016224 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RazorSyntaxTreeExtensions.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RazorSyntaxTreeExtensions.cs
@@ -16,31 +16,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 throw new ArgumentNullException(nameof(syntaxTree));
             }
 
-            var spans = Flatten(syntaxTree);
+            var visitor = new ClassifiedSpanVisitor(syntaxTree.Source);
+            visitor.Visit(syntaxTree.Root);
 
-            var result = new ClassifiedSpanInternal[spans.Count];
-            for (var i = 0; i < spans.Count; i++)
-            {
-                var span = spans[i];
-                result[i] = new ClassifiedSpanInternal(
-                    new SourceSpan(
-                        span.Start.FilePath ?? syntaxTree.Source.FilePath,
-                        span.Start.AbsoluteIndex,
-                        span.Start.LineIndex,
-                        span.Start.CharacterIndex,
-                        span.Length),
-                    new SourceSpan(
-                        span.Parent.Start.FilePath ?? syntaxTree.Source.FilePath,
-                        span.Parent.Start.AbsoluteIndex,
-                        span.Parent.Start.LineIndex,
-                        span.Parent.Start.CharacterIndex,
-                        span.Parent.Length),
-                    span.Kind,
-                    span.Parent.Type,
-                    span.EditHandler.AcceptedCharacters);
-            }
-
-            return result;
+            return visitor.ClassifiedSpans;
         }
 
         public static IReadOnlyList<TagHelperSpanInternal> GetTagHelperSpans(this RazorSyntaxTree syntaxTree)
@@ -50,81 +29,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 throw new ArgumentNullException(nameof(syntaxTree));
             }
 
-            var results = new List<TagHelperSpanInternal>();
+            var visitor = new TagHelperSpanVisitor(syntaxTree.Source);
+            visitor.Visit(syntaxTree.Root);
 
-            var toProcess = new List<Block>();
-            var blockChildren = new List<Block>();
-            toProcess.Add(syntaxTree.Root);
-
-            for (var i = 0; i < toProcess.Count; i++)
-            {
-                var blockNode = toProcess[i];
-                if (blockNode is TagHelperBlock tagHelperNode)
-                {
-                    results.Add(new TagHelperSpanInternal(
-                        new SourceSpan(
-                            tagHelperNode.Start.FilePath ?? syntaxTree.Source.FilePath,
-                            tagHelperNode.Start.AbsoluteIndex,
-                            tagHelperNode.Start.LineIndex,
-                            tagHelperNode.Start.CharacterIndex,
-                            tagHelperNode.Length),
-                        tagHelperNode.Binding));
-                }
-
-                // collect all child blocks and inject into toProcess as a single InsertRange
-                foreach (var child in blockNode.Children)
-                {
-                    if (child is Block block)
-                    {
-                        blockChildren.Add(block);
-                    }
-                }
-
-                if (blockChildren.Count > 0)
-                {
-                    toProcess.InsertRange(i + 1, blockChildren);
-                    blockChildren.Clear();
-                }
-            }
-
-            return results;
-        }
-
-        private static List<Span> Flatten(RazorSyntaxTree syntaxTree)
-        {
-            var result = new List<Span>();
-            AppendFlattenedSpans(syntaxTree.Root, result);
-            return result;
-
-            void AppendFlattenedSpans(SyntaxTreeNode node, List<Span> foundSpans)
-            {
-                if (node is Span spanNode)
-                {
-                    foundSpans.Add(spanNode);
-                }
-                else
-                {
-                    if (node is TagHelperBlock tagHelperNode)
-                    {
-                        // These aren't in document order, sort them first and then dig in
-                        var attributeNodes = tagHelperNode.Attributes.Select(kvp => kvp.Value).Where(att => att != null).ToList();
-                        attributeNodes.Sort((x, y) => x.Start.AbsoluteIndex.CompareTo(y.Start.AbsoluteIndex));
-
-                        foreach (var attributeNode in attributeNodes)
-                        {
-                            AppendFlattenedSpans(attributeNode, foundSpans);
-                        }
-                    }
-
-                    if (node is Block block)
-                    {
-                        foreach (var child in block.Children)
-                        {
-                            AppendFlattenedSpans(child, foundSpans);
-                        }
-                    }
-                }
-            }
+            return visitor.TagHelperSpans;
         }
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RemoveTagHelperChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RemoveTagHelperChunkGenerator.cs
index 58b170d33e..6a05c951f0 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RemoveTagHelperChunkGenerator.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/RemoveTagHelperChunkGenerator.cs
@@ -35,11 +35,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public List<RazorDiagnostic> Diagnostics { get; }
 
-        public override void Accept(ParserVisitor visitor, Span span)
-        {
-            visitor.VisitRemoveTagHelperSpan(this, span);
-        }
-
         /// <inheritdoc />
         public override bool Equals(object obj)
         {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/Span.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/Span.cs
deleted file mode 100644
index fbf9f9f2c2..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/Span.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-// 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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class Span : SyntaxTreeNode
-    {
-        private static readonly int TypeHashCode = typeof(Span).GetHashCode();
-        private string _content;
-        private int? _length;
-        private SourceLocation _start;
-
-        public Span(SpanBuilder builder)
-        {
-            ReplaceWith(builder);
-        }
-
-        public ISpanChunkGenerator ChunkGenerator { get; private set; }
-
-        public SpanKindInternal Kind { get; private set; }
-        public IReadOnlyList<IToken> Tokens { get; private set; }
-
-        // Allow test code to re-link spans
-        public Span Previous { get; internal set; }
-        public Span Next { get; internal set; }
-
-        public SpanEditHandler EditHandler { get; private set; }
-
-        public override bool IsBlock => false;
-
-        public override int Length
-        {
-            get
-            {
-                if (_length == null)
-                {
-                    var length = 0;
-                    if (_content == null)
-                    {
-                        for (var i = 0; i < Tokens.Count; i++)
-                        {
-                            length += Tokens[i].Content.Length;
-                        }
-                    }
-                    else
-                    {
-                        length = _content.Length;
-                    }
-
-                    _length = length;
-                }
-
-                return _length.Value;
-            }
-        }
-
-        public override SourceLocation Start => _start;
-
-        public string Content
-        {
-            get
-            {
-                if (_content == null)
-                {
-                    var tokenCount = Tokens.Count;
-                    if (tokenCount == 1)
-                    {
-                        // Perf: no StringBuilder allocation if not necessary
-                        _content = Tokens[0].Content;
-                    }
-                    else
-                    {
-                        var builder = new StringBuilder();
-                        for (var i = 0; i < tokenCount; i++)
-                        {
-                            var token = Tokens[i];
-                            builder.Append(token.Content);
-                        }
-
-                        _content = builder.ToString();
-                    }
-                }
-
-                return _content;
-            }
-        }
-
-        public void ReplaceWith(SpanBuilder builder)
-        {
-            Kind = builder.Kind;
-            Tokens = builder.Tokens;
-
-            for (var i = 0; i <Tokens.Count; i++)
-            {
-                Tokens[i].Parent = this;
-            }
-
-            EditHandler = builder.EditHandler;
-            ChunkGenerator = builder.ChunkGenerator ?? SpanChunkGenerator.Null;
-            _start = builder.Start;
-            _content = null;
-            _length = null;
-
-            Parent?.ChildChanged();
-
-            // Since we took references to the values in SpanBuilder, clear its references out
-            builder.Reset();
-        }
-
-        public override string ToString()
-        {
-            var builder = new StringBuilder();
-            builder.Append(Kind);
-            builder.AppendFormat(" Span at {0}::{1} - [{2}]", Start, Length, Content);
-            builder.Append(" Edit: <");
-            builder.Append(EditHandler.ToString());
-            builder.Append("> Gen: <");
-            builder.Append(ChunkGenerator.ToString());
-            builder.Append("> {");
-            builder.Append(string.Join(";", Tokens.GroupBy(sym => sym.GetType()).Select(grp => string.Concat(grp.Key.Name, ":", grp.Count()))));
-            builder.Append("}");
-            return builder.ToString();
-        }
-
-        public void ChangeStart(SourceLocation newStart)
-        {
-            _start = newStart;
-            var current = this;
-            var tracker = new SourceLocationTracker(newStart);
-            tracker.UpdateLocation(Content);
-            while ((current = current.Next) != null)
-            {
-                current._start = tracker.CurrentLocation;
-                tracker.UpdateLocation(current.Content);
-            }
-        }
-
-        /// <summary>
-        /// Checks that the specified span is equivalent to the other in that it has the same start point and content.
-        /// </summary>
-        public override bool EquivalentTo(SyntaxTreeNode node)
-        {
-            var other = node as Span;
-            return other != null &&
-                Kind.Equals(other.Kind) &&
-                Start.Equals(other.Start) &&
-                EditHandler.Equals(other.EditHandler) &&
-                string.Equals(other.Content, Content, StringComparison.Ordinal);
-        }
-
-        public override int GetEquivalenceHash()
-        {
-            // Hash code should include only immutable properties but EquivalentTo also checks the type.
-            return TypeHashCode;
-        }
-
-        public override bool Equals(object obj)
-        {
-            var other = obj as Span;
-            return other != null &&
-                Kind.Equals(other.Kind) &&
-                EditHandler.Equals(other.EditHandler) &&
-                ChunkGenerator.Equals(other.ChunkGenerator) &&
-                Tokens.SequenceEqual(other.Tokens);
-        }
-
-        public override int GetHashCode()
-        {
-            // Hash code should include only immutable properties but Equals also checks the type.
-            return TypeHashCode;
-        }
-
-        public override void Accept(ParserVisitor visitor)
-        {
-            visitor.VisitSpan(this);
-        }
-
-        public override SyntaxTreeNode Clone()
-        {
-            var spanBuilder = new SpanBuilder(this);
-            return spanBuilder.Build();
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanBuilder.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanBuilder.cs
deleted file mode 100644
index 6d2e647b91..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanBuilder.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-// 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;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class SpanBuilder
-    {
-        private SourceLocation _start;
-        private List<IToken> _tokens;
-        private SourceLocationTracker _tracker;
-
-        public SpanBuilder(Span original)
-        {
-            Kind = original.Kind;
-            EditHandler = original.EditHandler;
-            _start = original.Start;
-            ChunkGenerator = original.ChunkGenerator;
-
-            _tokens = new List<IToken>(original.Tokens);
-            _tracker = new SourceLocationTracker(original.Start);
-        }
-
-        public SpanBuilder(SourceLocation location)
-        {
-            _tracker = new SourceLocationTracker();
-
-            Reset();
-
-            Start = location;
-        }
-
-        public ISpanChunkGenerator ChunkGenerator { get; set; }
-
-        public SourceLocation Start
-        {
-            get { return _start; }
-            set
-            {
-                _start = value;
-                _tracker.CurrentLocation = value;
-            }
-        }
-
-        public SourceLocation End => _tracker.CurrentLocation;
-
-        public SpanKindInternal Kind { get; set; }
-
-        public IReadOnlyList<IToken> Tokens
-        {
-            get
-            {
-                if (_tokens == null)
-                {
-                    _tokens = new List<IToken>();
-                }
-
-                return _tokens;
-            }
-        }
-
-        public SpanEditHandler EditHandler { get; set; }
-
-        public void Reset()
-        {
-            // Need to potentially allocate a new list because Span.ReplaceWith takes ownership
-            // of the original list.
-            _tokens = null;
-            _tokens = new List<IToken>();
-
-            EditHandler = SpanEditHandler.CreateDefault((content) => Enumerable.Empty<IToken>());
-            ChunkGenerator = SpanChunkGenerator.Null;
-            Start = SourceLocation.Undefined;
-        }
-
-        public Span Build()
-        {
-            var span = new Span(this);
-            
-            for (var i = 0; i < span.Tokens.Count; i++)
-            {
-                var token = span.Tokens[i];
-                token.Parent = span;
-            }
-
-            return span;
-        }
-
-        public void ClearTokens()
-        {
-            _tokens?.Clear();
-        }
-
-        public void Accept(IToken token)
-        {
-            if (token == null)
-            {
-                return;
-            }
-
-            if (Start.Equals(SourceLocation.Undefined))
-            {
-                throw new InvalidOperationException("SpanBuilder must have a valid location");
-            }
-
-            _tokens.Add(token);
-            _tracker.UpdateLocation(token.Content);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanChunkGenerator.cs
index 4e15538609..146a5c7d4c 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanChunkGenerator.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanChunkGenerator.cs
@@ -11,12 +11,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public static readonly ISpanChunkGenerator Null = new NullSpanChunkGenerator();
 
-        public abstract void Accept(ParserVisitor visitor, Span span);
-
-        public virtual void GenerateChunk(Span target, ChunkGeneratorContext context)
-        {
-        }
-
         public override bool Equals(object obj)
         {
             return obj != null &&
@@ -30,15 +24,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         private class NullSpanChunkGenerator : ISpanChunkGenerator
         {
-            public void Accept(ParserVisitor visitor, Span span)
-            {
-                visitor.VisitDefault(span);
-            }
-
-            public void GenerateChunk(Span target, ChunkGeneratorContext context)
-            {
-            }
-
             public override string ToString()
             {
                 return "None";
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanContext.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanContext.cs
new file mode 100644
index 0000000000..2eff0fdac1
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanContext.cs
@@ -0,0 +1,52 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class SpanContext
+    {
+        public SpanContext(ISpanChunkGenerator chunkGenerator, SpanEditHandler editHandler)
+        {
+            ChunkGenerator = chunkGenerator;
+            EditHandler = editHandler;
+        }
+
+        public ISpanChunkGenerator ChunkGenerator { get; }
+
+        public SpanEditHandler EditHandler { get; }
+    }
+
+    internal class SpanContextBuilder
+    {
+        public SpanContextBuilder()
+        {
+            Reset();
+        }
+
+        public SpanContextBuilder(SpanContext context)
+        {
+            EditHandler = context.EditHandler;
+            ChunkGenerator = context.ChunkGenerator;
+        }
+
+        public ISpanChunkGenerator ChunkGenerator { get; set; }
+
+        public SpanEditHandler EditHandler { get; set; }
+
+        public SpanContext Build()
+        {
+            var result = new SpanContext(ChunkGenerator, EditHandler);
+            Reset();
+            return result;
+        }
+
+        public void Reset()
+        {
+            EditHandler = SpanEditHandler.CreateDefault((content) => Enumerable.Empty<SyntaxToken>());
+            ChunkGenerator = SpanChunkGenerator.Null;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanEditHandler.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanEditHandler.cs
index d5407f34dd..cf2d7a629d 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanEditHandler.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanEditHandler.cs
@@ -4,6 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
@@ -11,12 +13,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     {
         private static readonly int TypeHashCode = typeof(SpanEditHandler).GetHashCode();
 
-        public SpanEditHandler(Func<string, IEnumerable<IToken>> tokenizer)
+        public SpanEditHandler(Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> tokenizer)
             : this(tokenizer, AcceptedCharactersInternal.Any)
         {
         }
 
-        public SpanEditHandler(Func<string, IEnumerable<IToken>> tokenizer, AcceptedCharactersInternal accepted)
+        public SpanEditHandler(Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> tokenizer, AcceptedCharactersInternal accepted)
         {
             AcceptedCharacters = accepted;
             Tokenizer = tokenizer;
@@ -24,19 +26,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public AcceptedCharactersInternal AcceptedCharacters { get; set; }
 
-        public Func<string, IEnumerable<IToken>> Tokenizer { get; set; }
+        public Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> Tokenizer { get; set; }
 
-        public static SpanEditHandler CreateDefault(Func<string, IEnumerable<IToken>> tokenizer)
+        public static SpanEditHandler CreateDefault()
+        {
+            return CreateDefault(c => Enumerable.Empty<Syntax.InternalSyntax.SyntaxToken>());
+        }
+
+        public static SpanEditHandler CreateDefault(Func<string, IEnumerable<Syntax.InternalSyntax.SyntaxToken>> tokenizer)
         {
             return new SpanEditHandler(tokenizer);
         }
 
-        public virtual EditResult ApplyChange(Span target, SourceChange change)
+        public virtual EditResult ApplyChange(SyntaxNode target, SourceChange change)
         {
             return ApplyChange(target, change, force: false);
         }
 
-        public virtual EditResult ApplyChange(Span target, SourceChange change, bool force)
+        public virtual EditResult ApplyChange(SyntaxNode target, SourceChange change, bool force)
         {
             var result = PartialParseResultInternal.Accepted;
             if (!force)
@@ -49,49 +56,81 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             {
                 return new EditResult(result, UpdateSpan(target, change));
             }
-            return new EditResult(result, new SpanBuilder(target));
+            return new EditResult(result, target);
         }
 
-        public virtual bool OwnsChange(Span target, SourceChange change)
+        public virtual bool OwnsChange(SyntaxNode target, SourceChange change)
         {
-            var end = target.Start.AbsoluteIndex + target.Length;
+            var end = target.EndPosition;
             var changeOldEnd = change.Span.AbsoluteIndex + change.Span.Length;
-            return change.Span.AbsoluteIndex >= target.Start.AbsoluteIndex &&
+            return change.Span.AbsoluteIndex >= target.Position &&
                    (changeOldEnd < end || (changeOldEnd == end && AcceptedCharacters != AcceptedCharactersInternal.None));
         }
 
-        protected virtual PartialParseResultInternal CanAcceptChange(Span target, SourceChange change)
+        protected virtual PartialParseResultInternal CanAcceptChange(SyntaxNode target, SourceChange change)
         {
             return PartialParseResultInternal.Rejected;
         }
 
-        protected virtual SpanBuilder UpdateSpan(Span target, SourceChange change)
+        protected virtual SyntaxNode UpdateSpan(SyntaxNode target, SourceChange change)
         {
             var newContent = change.GetEditedContent(target);
-            var newSpan = new SpanBuilder(target);
-            newSpan.ClearTokens();
+            var builder = Syntax.InternalSyntax.SyntaxListBuilder<Syntax.InternalSyntax.SyntaxToken>.Create();
             foreach (var token in Tokenizer(newContent))
             {
-                newSpan.Accept(token);
+                builder.Add(token);
             }
-            if (target.Next != null)
+
+            SyntaxNode newTarget = null;
+            if (target is RazorMetaCodeSyntax)
             {
-                var newEnd = SourceLocationTracker.CalculateNewLocation(target.Start, newContent);
-                target.Next.ChangeStart(newEnd);
+                newTarget = Syntax.InternalSyntax.SyntaxFactory.RazorMetaCode(builder.ToList()).CreateRed(target.Parent, target.Position);
             }
-            return newSpan;
+            else if (target is MarkupTextLiteralSyntax)
+            {
+                newTarget = Syntax.InternalSyntax.SyntaxFactory.MarkupTextLiteral(builder.ToList()).CreateRed(target.Parent, target.Position);
+            }
+            else if (target is MarkupEphemeralTextLiteralSyntax)
+            {
+                newTarget = Syntax.InternalSyntax.SyntaxFactory.MarkupEphemeralTextLiteral(builder.ToList()).CreateRed(target.Parent, target.Position);
+            }
+            else if (target is CSharpStatementLiteralSyntax)
+            {
+                newTarget = Syntax.InternalSyntax.SyntaxFactory.CSharpStatementLiteral(builder.ToList()).CreateRed(target.Parent, target.Position);
+            }
+            else if (target is CSharpExpressionLiteralSyntax)
+            {
+                newTarget = Syntax.InternalSyntax.SyntaxFactory.CSharpExpressionLiteral(builder.ToList()).CreateRed(target.Parent, target.Position);
+            }
+            else if (target is CSharpEphemeralTextLiteralSyntax)
+            {
+                newTarget = Syntax.InternalSyntax.SyntaxFactory.CSharpEphemeralTextLiteral(builder.ToList()).CreateRed(target.Parent, target.Position);
+            }
+            else if (target is UnclassifiedTextLiteralSyntax)
+            {
+                newTarget = Syntax.InternalSyntax.SyntaxFactory.UnclassifiedTextLiteral(builder.ToList()).CreateRed(target.Parent, target.Position);
+            }
+            else
+            {
+                Debug.Fail($"The type {target?.GetType().Name} is not a supported span node.");
+            }
+
+            var context = target.GetSpanContext();
+            newTarget = context != null ? newTarget?.WithSpanContext(context) : newTarget;
+
+            return newTarget;
         }
 
-        protected internal static bool IsAtEndOfFirstLine(Span target, SourceChange change)
+        protected internal static bool IsAtEndOfFirstLine(SyntaxNode target, SourceChange change)
         {
-            var endOfFirstLine = target.Content.IndexOfAny(new char[] { (char)0x000d, (char)0x000a, (char)0x2028, (char)0x2029 });
-            return (endOfFirstLine == -1 || (change.Span.AbsoluteIndex - target.Start.AbsoluteIndex) <= endOfFirstLine);
+            var endOfFirstLine = target.GetContent().IndexOfAny(new char[] { (char)0x000d, (char)0x000a, (char)0x2028, (char)0x2029 });
+            return (endOfFirstLine == -1 || (change.Span.AbsoluteIndex - target.Position) <= endOfFirstLine);
         }
 
         /// <summary>
         /// Returns true if the specified change is an insertion of text at the end of this span.
         /// </summary>
-        protected internal static bool IsEndDeletion(Span target, SourceChange change)
+        protected internal static bool IsEndDeletion(SyntaxNode target, SourceChange change)
         {
             return change.IsDelete && IsAtEndOfSpan(target, change);
         }
@@ -99,14 +138,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         /// <summary>
         /// Returns true if the specified change is a replacement of text at the end of this span.
         /// </summary>
-        protected internal static bool IsEndReplace(Span target, SourceChange change)
+        protected internal static bool IsEndReplace(SyntaxNode target, SourceChange change)
         {
             return change.IsReplace && IsAtEndOfSpan(target, change);
         }
 
-        protected internal static bool IsAtEndOfSpan(Span target, SourceChange change)
+        protected internal static bool IsAtEndOfSpan(SyntaxNode target, SourceChange change)
         {
-            return (change.Span.AbsoluteIndex + change.Span.Length) == (target.Start.AbsoluteIndex + target.Length);
+            return (change.Span.AbsoluteIndex + change.Span.Length) == target.EndPosition;
         }
 
         public override string ToString()
@@ -116,8 +155,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public override bool Equals(object obj)
         {
-            var other = obj as SpanEditHandler;
-            return other != null &&
+            return obj is SpanEditHandler other &&
                 GetType() == other.GetType() &&
                 AcceptedCharacters == other.AcceptedCharacters;
         }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/StatementChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/StatementChunkGenerator.cs
index a2588f16c9..7874800a96 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/StatementChunkGenerator.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/StatementChunkGenerator.cs
@@ -5,16 +5,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal class StatementChunkGenerator : SpanChunkGenerator
     {
-        public override void Accept(ParserVisitor visitor, Span span)
-        {
-            visitor.VisitStatementSpan(this, span);
-        }
-
-        public override void GenerateChunk(Span target, ChunkGeneratorContext context)
-        {
-            //context.ChunkTreeBuilder.AddStatementChunk(target.Content, target);
-        }
-
         public override string ToString()
         {
             return "Stmt";
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxConstants.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxConstants.cs
index 58540c315f..a4314b285a 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxConstants.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxConstants.cs
@@ -10,6 +10,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public static readonly string TransitionString = "@";
         public static readonly string StartCommentSequence = "@*";
         public static readonly string EndCommentSequence = "*@";
+        public static readonly string SpanContextKind = "SpanData";
 
         public static class CSharp
         {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxTreeBuilder.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxTreeBuilder.cs
deleted file mode 100644
index 6a48614ad7..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxTreeBuilder.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// 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;
-using System.Collections.Generic;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class SyntaxTreeBuilder
-    {
-        private readonly Stack<BlockBuilder> _blockStack;
-        private readonly Action _endBlock;
-
-        public SyntaxTreeBuilder()
-        {
-            _blockStack = new Stack<BlockBuilder>();
-            _endBlock = EndBlock;
-        }
-
-        public IReadOnlyCollection<BlockBuilder> ActiveBlocks => _blockStack;
-
-        public BlockBuilder CurrentBlock => _blockStack.Peek();
-
-        public Span LastSpan { get; private set; }
-
-        public AcceptedCharactersInternal LastAcceptedCharacters
-        {
-            get
-            {
-                if (LastSpan == null)
-                {
-                    return AcceptedCharactersInternal.None;
-                }
-                return LastSpan.EditHandler.AcceptedCharacters;
-            }
-        }
-
-        public void Add(Span span)
-        {
-            if (_blockStack.Count == 0)
-            {
-                throw new InvalidOperationException(Resources.ParserContext_NoCurrentBlock);
-            }
-            CurrentBlock.Children.Add(span);
-            LastSpan = span;
-        }
-
-        /// <summary>
-        /// Starts a block of the specified type
-        /// </summary>
-        /// <param name="blockType">The type of the block to start</param>
-        public IDisposable StartBlock(BlockKindInternal blockType)
-        {
-            var builder = new BlockBuilder() { Type = blockType };
-            _blockStack.Push(builder);
-            return new DisposableAction(_endBlock);
-        }
-
-        /// <summary>
-        /// Ends the current block
-        /// </summary>
-        public void EndBlock()
-        {
-            if (_blockStack.Count == 0)
-            {
-                throw new InvalidOperationException(Resources.EndBlock_Called_Without_Matching_StartBlock);
-            }
-
-            if (_blockStack.Count > 1)
-            {
-                var initialBlockBuilder = _blockStack.Pop();
-                var initialBlock = initialBlockBuilder.Build();
-                CurrentBlock.Children.Add(initialBlock);
-            }
-        }
-
-        public Block Build()
-        {
-            if (_blockStack.Count == 0)
-            {
-                throw new InvalidOperationException(Resources.ParserContext_CannotCompleteTree_NoRootBlock);
-            }
-            if (_blockStack.Count != 1)
-            {
-                throw new InvalidOperationException(Resources.ParserContext_CannotCompleteTree_OutstandingBlocks);
-            }
-
-            var rootBuilder = _blockStack.Pop();
-            var root = rootBuilder.Build();
-
-            root.LinkNodes();
-
-            return root;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxTreeNode.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxTreeNode.cs
deleted file mode 100644
index 1b7b192db9..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxTreeNode.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal abstract class SyntaxTreeNode
-    {
-        public Block Parent { get; internal set; }
-
-        /// <summary>
-        /// Returns true if this element is a block (to avoid casting)
-        /// </summary>
-        public abstract bool IsBlock { get; }
-
-        /// <summary>
-        /// The length of all the content contained in this node
-        /// </summary>
-        public abstract int Length { get; }
-
-        /// <summary>
-        /// The start point of this node
-        /// </summary>
-        public abstract SourceLocation Start { get; }
-
-        /// <summary>
-        /// Determines if the specified node is equivalent to this node
-        /// </summary>
-        /// <param name="node">The node to compare this node with</param>
-        /// <returns>
-        /// true if the provided node has all the same content and metadata, though the specific quantity and type of
-        /// tokens may be different.
-        /// </returns>
-        public abstract bool EquivalentTo(SyntaxTreeNode node);
-
-        /// <summary>
-        /// Determines a hash code for the <see cref="SyntaxTreeNode"/> using only information relevant in
-        /// <see cref="EquivalentTo"/> comparisons.
-        /// </summary>
-        /// <returns>
-        /// A hash code for the <see cref="SyntaxTreeNode"/> using only information relevant in
-        /// <see cref="EquivalentTo"/> comparisons.
-        /// </returns>
-        public abstract int GetEquivalenceHash();
-
-        public abstract void Accept(ParserVisitor visitor);
-
-        public abstract SyntaxTreeNode Clone();
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperAttributeNode.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperAttributeNode.cs
index 7fa090259a..139badfe5e 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperAttributeNode.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperAttributeNode.cs
@@ -1,11 +1,13 @@
 // 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 Microsoft.AspNetCore.Razor.Language.Syntax;
+
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal class TagHelperAttributeNode
     {
-        public TagHelperAttributeNode(string name, SyntaxTreeNode value, AttributeStructure attributeStructure)
+        public TagHelperAttributeNode(string name, SyntaxNode value, AttributeStructure attributeStructure)
         {
             Name = name;
             Value = value;
@@ -13,14 +15,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         }
 
         // Internal for testing
-        internal TagHelperAttributeNode(string name, SyntaxTreeNode value)
+        internal TagHelperAttributeNode(string name, SyntaxNode value)
             : this(name, value, AttributeStructure.DoubleQuotes)
         {
         }
 
         public string Name { get; }
 
-        public SyntaxTreeNode Value { get; }
+        public SyntaxNode Value { get; }
 
         public AttributeStructure AttributeStructure { get; }
     }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlock.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlock.cs
deleted file mode 100644
index b8863247bd..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlock.cs
+++ /dev/null
@@ -1,233 +0,0 @@
-// 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;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using Microsoft.Extensions.Internal;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    /// <summary>
-    /// A <see cref="Block"/> that reprents a special HTML element.
-    /// </summary>
-    internal class TagHelperBlock : Block, IEquatable<TagHelperBlock>
-    {
-        private readonly SourceLocation _start;
-
-        /// <summary>
-        /// Instantiates a new instance of a <see cref="TagHelperBlock"/>.
-        /// </summary>
-        /// <param name="source">A <see cref="TagHelperBlockBuilder"/> used to construct a valid
-        /// <see cref="TagHelperBlock"/>.</param>
-        public TagHelperBlock(TagHelperBlockBuilder source)
-            : base(source.Type, source.Children, source.ChunkGenerator)
-        {
-            TagName = source.TagName;
-            Binding = source.BindingResult;
-            Attributes = new List<TagHelperAttributeNode>(source.Attributes);
-            _start = source.Start;
-            TagMode = source.TagMode;
-            SourceStartTag = source.SourceStartTag;
-            SourceEndTag = source.SourceEndTag;
-
-            source.Reset();
-
-            foreach (var attributeChildren in Attributes)
-            {
-                if (attributeChildren.Value != null)
-                {
-                    attributeChildren.Value.Parent = this;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the unrewritten source start tag.
-        /// </summary>
-        /// <remarks>This is used by design time to properly format <see cref="TagHelperBlock"/>s.</remarks>
-        public Block SourceStartTag { get; }
-
-        /// <summary>
-        /// Gets the unrewritten source end tag.
-        /// </summary>
-        /// <remarks>This is used by design time to properly format <see cref="TagHelperBlock"/>s.</remarks>
-        public Block SourceEndTag { get; }
-
-        /// <summary>
-        /// Gets the HTML syntax of the element in the Razor source.
-        /// </summary>
-        public TagMode TagMode { get; }
-
-        /// <summary>
-        /// <see cref="TagHelperDescriptor"/> bindings for the HTML element.
-        /// </summary>
-        public TagHelperBinding Binding { get; }
-
-        /// <summary>
-        /// The HTML attributes.
-        /// </summary>
-        public IList<TagHelperAttributeNode> Attributes { get; }
-
-        /// <inheritdoc />
-        public override SourceLocation Start
-        {
-            get
-            {
-                return _start;
-            }
-        }
-
-        /// <summary>
-        /// The HTML tag name.
-        /// </summary>
-        public string TagName { get; }
-
-        public override int Length
-        {
-            get
-            {
-                var startTagLength = SourceStartTag?.Length ?? 0;
-                var childrenLength = base.Length;
-                var endTagLength = SourceEndTag?.Length ?? 0;
-
-                return startTagLength + childrenLength + endTagLength;
-            }
-        }
-
-        public override IEnumerable<Span> Flatten()
-        {
-            if (SourceStartTag != null)
-            {
-                foreach (var childSpan in SourceStartTag.Flatten())
-                {
-                    yield return childSpan;
-                }
-            }
-
-            foreach (var childSpan in base.Flatten())
-            {
-                yield return childSpan;
-            }
-
-            if (SourceEndTag != null)
-            {
-                foreach (var childSpan in SourceEndTag.Flatten())
-                {
-                    yield return childSpan;
-                }
-            }
-        }
-
-        public override Span LocateOwner(SourceChange change)
-        {
-            var oldPosition = change.Span.AbsoluteIndex;
-            if (oldPosition < Start.AbsoluteIndex)
-            {
-                // Change occurs prior to the TagHelper.
-                return null;
-            }
-
-            var bodyEndLocation = SourceStartTag?.Start.AbsoluteIndex + SourceStartTag?.Length + base.Length;
-            if (oldPosition > bodyEndLocation)
-            {
-                // Change occurs after the TagHelpers body. End tags for TagHelpers cannot claim ownership of changes
-                // because any change to them impacts whether or not a tag is a TagHelper.
-                return null;
-            }
-
-            var startTagEndLocation = Start.AbsoluteIndex + SourceStartTag?.Length;
-            if (oldPosition < startTagEndLocation)
-            {
-                // Change occurs in the start tag.
-
-                var attributeElements = Attributes
-                    .Select(attribute => attribute.Value)
-                    .Where(value => value != null);
-
-                return LocateOwner(change, attributeElements);
-            }
-
-            if (oldPosition < bodyEndLocation)
-            {
-                // Change occurs in the body
-                return base.LocateOwner(change);
-            }
-
-            // TagHelper does not contain a Span that can claim ownership.
-            return null;
-        }
-
-        public override SyntaxTreeNode Clone()
-        {
-            var tagHelperBlockBuilder = new TagHelperBlockBuilder(this);
-
-            tagHelperBlockBuilder.Children.Clear();
-            for (var i = 0; i < Children.Count; i++)
-            {
-                var clonedChild = Children[i].Clone();
-                tagHelperBlockBuilder.Children.Add(clonedChild);
-            }
-
-            tagHelperBlockBuilder.Attributes.Clear();
-            for (var i = 0; i < Attributes.Count; i++)
-            {
-                var existingAttribute = Attributes[i];
-                var clonedValue = existingAttribute.Value != null ? existingAttribute.Value.Clone() : null;
-                tagHelperBlockBuilder.Attributes.Add(
-                    new TagHelperAttributeNode(existingAttribute.Name, clonedValue, existingAttribute.AttributeStructure));
-            }
-
-            if (SourceStartTag != null)
-            {
-                var clonedStartTag = (Block)SourceStartTag.Clone();
-                tagHelperBlockBuilder.SourceStartTag = clonedStartTag;
-            }
-
-            if (SourceEndTag != null)
-            {
-                var clonedEndTag = (Block)SourceEndTag.Clone();
-                tagHelperBlockBuilder.SourceEndTag = clonedEndTag;
-            }
-
-            return tagHelperBlockBuilder.Build();
-        }
-
-        /// <inheritdoc />
-        public override string ToString()
-        {
-            return string.Format(CultureInfo.CurrentCulture,
-                                 "'{0}' (Attrs: {1}) Tag Helper Block at {2}::{3} (Gen:{4})",
-                                 TagName, Attributes.Count, Start, Length, ChunkGenerator);
-        }
-
-        /// <summary>
-        /// Determines whether two <see cref="TagHelperBlock"/>s are equal by comparing the <see cref="TagName"/>,
-        /// <see cref="Attributes"/>, <see cref="Block.Type"/>, <see cref="Block.ChunkGenerator"/> and
-        /// <see cref="Block.Children"/>.
-        /// </summary>
-        /// <param name="other">The <see cref="TagHelperBlock"/> to check equality against.</param>
-        /// <returns>
-        /// <c>true</c> if the current <see cref="TagHelperBlock"/> is equivalent to the given
-        /// <paramref name="other"/>, <c>false</c> otherwise.
-        /// </returns>
-        public bool Equals(TagHelperBlock other)
-        {
-            return base.Equals(other) &&
-                string.Equals(TagName, other.TagName, StringComparison.OrdinalIgnoreCase) &&
-                Attributes.SequenceEqual(other.Attributes);
-        }
-
-        /// <inheritdoc />
-        public override int GetHashCode()
-        {
-            var hashCodeCombiner = HashCodeCombiner.Start();
-            hashCodeCombiner.Add(base.GetHashCode());
-            hashCodeCombiner.Add(TagName, StringComparer.OrdinalIgnoreCase);
-            hashCodeCombiner.Add(Attributes);
-
-            return hashCodeCombiner;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockBuilder.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockBuilder.cs
deleted file mode 100644
index 29e39bb3ae..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockBuilder.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-// 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.Collections.Generic;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    /// <summary>
-    /// A <see cref="BlockBuilder"/> used to create <see cref="TagHelperBlock"/>s.
-    /// </summary>
-    internal class TagHelperBlockBuilder : BlockBuilder
-    {
-        /// <summary>
-        /// Instantiates a new <see cref="TagHelperBlockBuilder"/> instance based on the given
-        /// <paramref name="original"/>.
-        /// </summary>
-        /// <param name="original">The original <see cref="TagHelperBlock"/> to copy data from.</param>
-        public TagHelperBlockBuilder(TagHelperBlock original)
-            : base(original)
-        {
-            SourceStartTag = original.SourceStartTag;
-            SourceEndTag = original.SourceEndTag;
-            TagMode = original.TagMode;
-            BindingResult = original.Binding;
-            Attributes = new List<TagHelperAttributeNode>(original.Attributes);
-            TagName = original.TagName;
-        }
-
-        /// <summary>
-        /// Instantiates a new instance of the <see cref="TagHelperBlockBuilder"/> class
-        /// with the provided values.
-        /// </summary>
-        /// <param name="tagName">An HTML tag name.</param>
-        /// <param name="tagMode">HTML syntax of the element in the Razor source.</param>
-        /// <param name="start">Starting location of the <see cref="TagHelperBlock"/>.</param>
-        /// <param name="attributes">Attributes of the <see cref="TagHelperBlock"/>.</param>
-        /// <param name="bindingResult"></param>
-        public TagHelperBlockBuilder(
-            string tagName,
-            TagMode tagMode,
-            SourceLocation start,
-            IList<TagHelperAttributeNode> attributes,
-            TagHelperBinding bindingResult)
-        {
-            TagName = tagName;
-            TagMode = tagMode;
-            Start = start;
-            BindingResult = bindingResult;
-            Attributes = new List<TagHelperAttributeNode>(attributes);
-            Type = BlockKindInternal.Tag;
-            ChunkGenerator = new TagHelperChunkGenerator();
-        }
-
-        // Internal for testing
-        internal TagHelperBlockBuilder(
-            string tagName,
-            TagMode tagMode,
-            IList<TagHelperAttributeNode> attributes,
-            IEnumerable<SyntaxTreeNode> children)
-        {
-            TagName = tagName;
-            TagMode = tagMode;
-            Attributes = attributes;
-            Type = BlockKindInternal.Tag;
-            ChunkGenerator = new TagHelperChunkGenerator();
-
-            // Children is IList, no AddRange
-            foreach (var child in children)
-            {
-                Children.Add(child);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unrewritten source start tag.
-        /// </summary>
-        /// <remarks>This is used by design time to properly format <see cref="TagHelperBlock"/>s.</remarks>
-        public Block SourceStartTag { get; set; }
-
-        /// <summary>
-        /// Gets or sets the unrewritten source end tag.
-        /// </summary>
-        /// <remarks>This is used by design time to properly format <see cref="TagHelperBlock"/>s.</remarks>
-        public Block SourceEndTag { get; set; }
-
-        /// <summary>
-        /// Gets the HTML syntax of the element in the Razor source.
-        /// </summary>
-        public TagMode TagMode { get; }
-
-        /// <summary>
-        /// <see cref="TagHelperDescriptor"/>s for the HTML element.
-        /// </summary>
-        public TagHelperBinding BindingResult { get; }
-
-        /// <summary>
-        /// The HTML attributes.
-        /// </summary>
-        public IList<TagHelperAttributeNode> Attributes { get; }
-
-        /// <summary>
-        /// The HTML tag name.
-        /// </summary>
-        public string TagName { get; set; }
-
-        /// <summary>
-        /// Constructs a new <see cref="TagHelperBlock"/>.
-        /// </summary>
-        /// <returns>A <see cref="TagHelperBlock"/>.</returns>
-        public override Block Build()
-        {
-            return new TagHelperBlock(this);
-        }
-
-        /// <inheritdoc />
-        /// <remarks>
-        /// Sets the <see cref="TagName"/> to <c>null</c> and clears the <see cref="Attributes"/>.
-        /// </remarks>
-        public override void Reset()
-        {
-            TagName = null;
-
-            if (Attributes != null)
-            {
-                Attributes.Clear();
-            }
-
-            base.Reset();
-        }
-
-        /// <summary>
-        /// The starting <see cref="SourceLocation"/> of the tag helper.
-        /// </summary>
-        public SourceLocation Start { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockRewriter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockRewriter.cs
index f08d0579e5..421485fdcc 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockRewriter.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockRewriter.cs
@@ -1,11 +1,10 @@
-// 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;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
-using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
@@ -13,107 +12,30 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     {
         private static readonly string StringTypeName = typeof(string).FullName;
 
-        public static TagHelperBlockBuilder Rewrite(
+        public static MarkupTagHelperStartTagSyntax Rewrite(
             string tagName,
             bool validStructure,
             RazorParserFeatureFlags featureFlags,
-            Block tag,
-            TagHelperBinding bindingResult,
-            ErrorSink errorSink)
-        {
-            // There will always be at least one child for the '<'.
-            var start = tag.Children.First().Start;
-            var attributes = GetTagAttributes(tagName, validStructure, tag, bindingResult, errorSink, featureFlags);
-            var tagMode = GetTagMode(tagName, tag, bindingResult, errorSink);
-
-            return new TagHelperBlockBuilder(tagName, tagMode, start, attributes, bindingResult);
-        }
-
-        private static IList<TagHelperAttributeNode> GetTagAttributes(
-            string tagName,
-            bool validStructure,
-            Block tagBlock,
+            MarkupTagBlockSyntax tag,
             TagHelperBinding bindingResult,
             ErrorSink errorSink,
-            RazorParserFeatureFlags featureFlags)
+            RazorSourceDocument source)
         {
-            var attributes = new List<TagHelperAttributeNode>();
+            // There will always be at least one child for the '<'.
+            var rewrittenChildren = GetRewrittenChildren(tagName, validStructure, tag, bindingResult, featureFlags, errorSink, source);
 
-            // We skip the first child "<tagname" and take everything up to the ending portion of the tag ">" or "/>".
-            // The -2 accounts for both the start and end tags. If the tag does not have a valid structure then there's
-            // no end tag to ignore.
-            var tokenOffset = validStructure ? 2 : 1;
-            var attributeChildren = tagBlock.Children.Skip(1).Take(tagBlock.Children.Count() - tokenOffset);
-            var processedBoundAttributeNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-
-            foreach (var child in attributeChildren)
-            {
-                TryParseResult result;
-                if (child.IsBlock)
-                {
-                    result = TryParseBlock(tagName, (Block)child, bindingResult.Descriptors, errorSink, processedBoundAttributeNames);
-                }
-                else
-                {
-                    result = TryParseSpan((Span)child, bindingResult.Descriptors, errorSink, processedBoundAttributeNames);
-                }
-
-                // Only want to track the attribute if we succeeded in parsing its corresponding Block/Span.
-                if (result != null)
-                {
-                    // Check if it's a non-boolean bound attribute that is minimized or if it's a bound
-                    // non-string attribute that has null or whitespace content.
-                    var isMinimized = result.AttributeValueNode == null;
-                    var isValidMinimizedAttribute = featureFlags.AllowMinimizedBooleanTagHelperAttributes && result.IsBoundBooleanAttribute;
-                    if ((isMinimized &&
-                        result.IsBoundAttribute &&
-                        !isValidMinimizedAttribute) ||
-                        (!isMinimized &&
-                        result.IsBoundNonStringAttribute &&
-                         IsNullOrWhitespaceAttributeValue(result.AttributeValueNode)))
-                    {
-                        var errorLocation = GetAttributeNameLocation(child, result.AttributeName);
-                        var propertyTypeName = GetPropertyType(result.AttributeName, bindingResult.Descriptors);
-                        var diagnostic = RazorDiagnosticFactory.CreateTagHelper_EmptyBoundAttribute(errorLocation, result.AttributeName, tagName, propertyTypeName);
-                        errorSink.OnError(diagnostic);
-                    }
-
-                    // Check if the attribute was a prefix match for a tag helper dictionary property but the
-                    // dictionary key would be the empty string.
-                    if (result.IsMissingDictionaryKey)
-                    {
-                        var errorLocation = GetAttributeNameLocation(child, result.AttributeName);
-                        var diagnostic = RazorDiagnosticFactory.CreateParsing_TagHelperIndexerAttributeNameMustIncludeKey(errorLocation, result.AttributeName, tagName);
-                        errorSink.OnError(diagnostic);
-                    }
-
-                    var attributeNode = new TagHelperAttributeNode(
-                        result.AttributeName,
-                        result.AttributeValueNode,
-                        result.AttributeStructure);
-
-                    attributes.Add(attributeNode);
-                }
-                else
-                {
-                    // Error occurred while parsing the attribute. Don't try parsing the rest to avoid misleading errors.
-                    break;
-                }
-            }
-
-            return attributes;
+            return SyntaxFactory.MarkupTagHelperStartTag(rewrittenChildren);
         }
 
-        private static TagMode GetTagMode(
-            string tagName,
-            Block beginTagBlock,
+        public static TagMode GetTagMode(
+            MarkupTagBlockSyntax tagBlock,
             TagHelperBinding bindingResult,
             ErrorSink errorSink)
         {
-            var childSpan = beginTagBlock.FindLastDescendentSpan();
+            var childSpan = tagBlock.GetLastToken()?.Parent;
 
             // Self-closing tags are always valid despite descriptors[X].TagStructure.
-            if (childSpan?.Content.EndsWith("/>", StringComparison.Ordinal) ?? false)
+            if (childSpan?.GetContent().EndsWith("/>", StringComparison.Ordinal) ?? false)
             {
                 return TagMode.SelfClosing;
             }
@@ -132,263 +54,189 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return TagMode.StartTagAndEndTag;
         }
 
-        // This method handles cases when the attribute is a simple span attribute such as
-        // class="something moresomething".  This does not handle complex attributes such as
-        // class="@myclass". Therefore the span.Content is equivalent to the entire attribute.
-        private static TryParseResult TryParseSpan(
-            Span span,
-            IEnumerable<TagHelperDescriptor> descriptors,
+        private static SyntaxList<RazorSyntaxNode> GetRewrittenChildren(
+            string tagName,
+            bool validStructure,
+            MarkupTagBlockSyntax tagBlock,
+            TagHelperBinding bindingResult,
+            RazorParserFeatureFlags featureFlags,
             ErrorSink errorSink,
-            HashSet<string> processedBoundAttributeNames)
+            RazorSourceDocument source)
         {
-            var afterEquals = false;
-            var builder = new SpanBuilder(span.Start)
+            var tagHelperBuilder = SyntaxListBuilder<RazorSyntaxNode>.Create();
+            var processedBoundAttributeNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+            if (tagBlock.Children.Count == 1)
             {
-                ChunkGenerator = span.ChunkGenerator,
-                EditHandler = span.EditHandler,
-                Kind = span.Kind
-            };
-
-            // Will contain tokens that represent a single attribute value: <input| class="btn"| />
-            var htmlTokens = span.Tokens.OfType<HtmlToken>().ToArray();
-            var capturedAttributeValueStart = false;
-            var attributeValueStartLocation = span.Start;
-
-            // Default to DoubleQuotes. We purposefully do not persist NoQuotes ValueStyle to stay consistent with the
-            // TryParseBlock() variation of attribute parsing.
-            var attributeValueStyle = AttributeStructure.DoubleQuotes;
-
-            // The tokenOffset is initialized to 0 to expect worst case: "class=". If a quote is found later on for
-            // the attribute value the tokenOffset is adjusted accordingly.
-            var tokenOffset = 0;
-            string name = null;
-
-            // Iterate down through the tokens to find the name and the start of the value.
-            // We subtract the tokenOffset so we don't accept an ending quote of a span.
-            for (var i = 0; i < htmlTokens.Length - tokenOffset; i++)
-            {
-                var token = htmlTokens[i];
-
-                if (afterEquals)
-                {
-                    // We've captured all leading whitespace, the attribute name, and an equals with an optional
-                    // quote/double quote. We're now at: " asp-for='|...'" or " asp-for=|..."
-                    // The goal here is to capture all tokens until the end of the attribute. Note this will not
-                    // consume an ending quote due to the tokenOffset.
-
-                    // When tokens are accepted into SpanBuilders, their locations get altered to be offset by the
-                    // parent which is why we need to mark our start location prior to adding the token.
-                    // This is needed to know the location of the attribute value start within the document.
-                    if (!capturedAttributeValueStart)
-                    {
-                        capturedAttributeValueStart = true;
-
-                        attributeValueStartLocation = token.Start;
-                    }
-
-                    builder.Accept(token);
-                }
-                else if (name == null && HtmlMarkupParser.IsValidAttributeNameToken(token))
-                {
-                    // We've captured all leading whitespace prior to the attribute name.
-                    // We're now at: " |asp-for='...'" or " |asp-for=..."
-                    // The goal here is to capture the attribute name.
-
-                    var nameBuilder = new StringBuilder();
-                    // Move the indexer past the attribute name tokens.
-                    for (var j = i; j < htmlTokens.Length; j++)
-                    {
-                        var nameToken = htmlTokens[j];
-                        if (!HtmlMarkupParser.IsValidAttributeNameToken(nameToken))
-                        {
-                            break;
-                        }
-
-                        nameBuilder.Append(nameToken.Content);
-                        i++;
-                    }
-
-                    i--;
-
-                    name = nameBuilder.ToString();
-                    attributeValueStartLocation = SourceLocationTracker.Advance(attributeValueStartLocation, name);
-                }
-                else if (token.Type == HtmlTokenType.Equals)
-                {
-                    // We've captured all leading whitespace and the attribute name.
-                    // We're now at: " asp-for|='...'" or " asp-for|=..."
-                    // The goal here is to consume the equal sign and the optional single/double-quote.
-
-                    // The coming tokens will either be a quote or value (in the case that the value is unquoted).
-
-                    SourceLocation tokenStartLocation;
-
-                    // Skip the whitespace preceding the start of the attribute value.
-                    do
-                    {
-                        i++; // Start from the token after '='.
-                    } while (i < htmlTokens.Length &&
-                        (htmlTokens[i].Type == HtmlTokenType.WhiteSpace ||
-                        htmlTokens[i].Type == HtmlTokenType.NewLine));
-
-                    // Check for attribute start values, aka single or double quote
-                    if (i < htmlTokens.Length && IsQuote(htmlTokens[i]))
-                    {
-                        if (htmlTokens[i].Type == HtmlTokenType.SingleQuote)
-                        {
-                            attributeValueStyle = AttributeStructure.SingleQuotes;
-                        }
-
-                        tokenStartLocation = htmlTokens[i].Start;
-
-                        // If there's a start quote then there must be an end quote to be valid, skip it.
-                        tokenOffset = 1;
-                    }
-                    else
-                    {
-                        // We are at the token after equals. Go back to equals to ensure we don't skip past that token.
-                        i--;
-
-                        tokenStartLocation = token.Start;
-                    }
-
-                    attributeValueStartLocation = new SourceLocation(
-                        tokenStartLocation.FilePath,
-                        tokenStartLocation.AbsoluteIndex + 1,
-                        tokenStartLocation.LineIndex,
-                        tokenStartLocation.CharacterIndex + 1);
-
-                    afterEquals = true;
-                }
-                else if (token.Type == HtmlTokenType.WhiteSpace)
-                {
-                    // We're at the start of the attribute, this branch may be hit on the first iterations of
-                    // the loop since the parser separates attributes with their spaces included as tokens.
-                    // We're at: "| asp-for='...'" or "| asp-for=..."
-                    // Note: This will not be hit even for situations like asp-for  ="..." because the core Razor
-                    // parser currently does not know how to handle attributes in that format. This will be addressed
-                    // by https://github.com/aspnet/Razor/issues/123.
-
-                    attributeValueStartLocation = SourceLocationTracker.Advance(attributeValueStartLocation, token.Content);
-                }
+                // Tag with no attributes. We have nothing to rewrite here.
+                return tagBlock.Children;
             }
 
-            // After all tokens have been added we need to set the builders start position so we do not indirectly
-            // modify the span's start location.
-            builder.Start = attributeValueStartLocation;
+            // Add the tag start
+            tagHelperBuilder.Add(tagBlock.Children.First());
 
-            if (name == null)
+            // We skip the first child "<tagname" and take everything up to the ending portion of the tag ">" or "/>".
+            // If the tag does not have a valid structure then there's no close angle to ignore.
+            var tokenOffset = validStructure ? 1 : 0;
+            for (var i = 1; i < tagBlock.Children.Count - tokenOffset; i++)
             {
-                // We couldn't find a name, if the original span content was whitespace it ultimately means the tag
-                // that owns this "attribute" is malformed and is expecting a user to type a new attribute.
-                // ex: <myTH class="btn"| |
-                if (!string.IsNullOrWhiteSpace(span.Content))
+                var isMinimized = false;
+                var attributeNameLocation = SourceLocation.Undefined;
+                var child = tagBlock.Children[i];
+                TryParseResult result;
+                if (child is MarkupAttributeBlockSyntax attributeBlock)
                 {
-                    var location = new SourceSpan(span.Start, span.Content.Length);
-                    var diagnostic = RazorDiagnosticFactory.CreateParsing_TagHelperAttributeListMustBeWellFormed(location);
+                    attributeNameLocation = attributeBlock.Name.GetSourceLocation(source);
+                    result = TryParseAttribute(
+                        tagName,
+                        attributeBlock,
+                        bindingResult.Descriptors,
+                        errorSink,
+                        processedBoundAttributeNames);
+                    tagHelperBuilder.Add(result.RewrittenAttribute);
+                }
+                else if (child is MarkupMinimizedAttributeBlockSyntax minimizedAttributeBlock)
+                {
+                    isMinimized = true;
+                    attributeNameLocation = minimizedAttributeBlock.Name.GetSourceLocation(source);
+                    result = TryParseMinimizedAttribute(
+                        tagName,
+                        minimizedAttributeBlock,
+                        bindingResult.Descriptors,
+                        errorSink,
+                        processedBoundAttributeNames);
+                    tagHelperBuilder.Add(result.RewrittenAttribute);
+                }
+                else if (child is CSharpCodeBlockSyntax)
+                {
+                    // TODO: Accept more than just Markup attributes: https://github.com/aspnet/Razor/issues/96.
+                    // Something like:
+                    // <input @checked />
+                    var location = new SourceSpan(child.GetSourceLocation(source), child.FullWidth);
+                    var diagnostic = RazorDiagnosticFactory.CreateParsing_TagHelpersCannotHaveCSharpInTagDeclaration(location, tagName);
+                    errorSink.OnError(diagnostic);
+
+                    result = null;
+                }
+                else if (child is MarkupTextLiteralSyntax)
+                {
+                    // If the original span content was whitespace it ultimately means the tag
+                    // that owns this "attribute" is malformed and is expecting a user to type a new attribute.
+                    // ex: <myTH class="btn"| |
+                    var literalContent = child.GetContent();
+                    if (!string.IsNullOrWhiteSpace(literalContent))
+                    {
+                        var location = child.GetSourceSpan(source);
+                        var diagnostic = RazorDiagnosticFactory.CreateParsing_TagHelperAttributeListMustBeWellFormed(location);
+                        errorSink.OnError(diagnostic);
+                    }
+                    result = null;
+                }
+                else
+                {
+                    result = null;
+                }
+
+                // Only want to track the attribute if we succeeded in parsing its corresponding Block/Span.
+                if (result == null)
+                {
+                    // Error occurred while parsing the attribute. Don't try parsing the rest to avoid misleading errors.
+                    for (var j = i; j < tagBlock.Children.Count; j++)
+                    {
+                        tagHelperBuilder.Add(tagBlock.Children[j]);
+                    }
+
+                    return tagHelperBuilder.ToList();
+                }
+
+                // Check if it's a non-boolean bound attribute that is minimized or if it's a bound
+                // non-string attribute that has null or whitespace content.
+                var isValidMinimizedAttribute = featureFlags.AllowMinimizedBooleanTagHelperAttributes && result.IsBoundBooleanAttribute;
+                if ((isMinimized &&
+                    result.IsBoundAttribute &&
+                    !isValidMinimizedAttribute) ||
+                    (!isMinimized &&
+                    result.IsBoundNonStringAttribute &&
+                     string.IsNullOrWhiteSpace(GetAttributeValueContent(result.RewrittenAttribute))))
+                {
+                    var errorLocation = new SourceSpan(attributeNameLocation, result.AttributeName.Length);
+                    var propertyTypeName = GetPropertyType(result.AttributeName, bindingResult.Descriptors);
+                    var diagnostic = RazorDiagnosticFactory.CreateTagHelper_EmptyBoundAttribute(errorLocation, result.AttributeName, tagName, propertyTypeName);
                     errorSink.OnError(diagnostic);
                 }
 
-                return null;
+                // Check if the attribute was a prefix match for a tag helper dictionary property but the
+                // dictionary key would be the empty string.
+                if (result.IsMissingDictionaryKey)
+                {
+                    var errorLocation = new SourceSpan(attributeNameLocation, result.AttributeName.Length);
+                    var diagnostic = RazorDiagnosticFactory.CreateParsing_TagHelperIndexerAttributeNameMustIncludeKey(errorLocation, result.AttributeName, tagName);
+                    errorSink.OnError(diagnostic);
+                }
             }
 
-            var result = CreateTryParseResult(name, descriptors, processedBoundAttributeNames);
-
-            // If we're not after an equal then we should treat the value as if it were a minimized attribute.
-            Span attributeValue = null;
-            if (afterEquals)
+            if (validStructure)
             {
-                attributeValue = CreateMarkupAttribute(builder, result);
-            }
-            else
-            {
-                attributeValueStyle = AttributeStructure.Minimized;
+                // Add the tag end.
+                tagHelperBuilder.Add(tagBlock.Children[tagBlock.Children.Count - 1]);
             }
 
-            result.AttributeValueNode = attributeValue;
-            result.AttributeStructure = attributeValueStyle;
-            return result;
+            return tagHelperBuilder.ToList();
         }
 
-        private static TryParseResult TryParseBlock(
+        private static TryParseResult TryParseMinimizedAttribute(
             string tagName,
-            Block block,
+            MarkupMinimizedAttributeBlockSyntax attributeBlock,
             IEnumerable<TagHelperDescriptor> descriptors,
             ErrorSink errorSink,
             HashSet<string> processedBoundAttributeNames)
         {
-            // TODO: Accept more than just spans: https://github.com/aspnet/Razor/issues/96.
-            // The first child will only ever NOT be a Span if a user is doing something like:
-            // <input @checked />
-
-            var childSpan = block.Children.First() as Span;
-
-            if (childSpan == null || childSpan.Kind != SpanKindInternal.Markup)
-            {
-                var location = new SourceSpan(block.Start, block.Length);
-                var diagnostic = RazorDiagnosticFactory.CreateParsing_TagHelpersCannotHaveCSharpInTagDeclaration(location, tagName);
-                errorSink.OnError(diagnostic);
-
-                return null;
-            }
-
-            var builder = new BlockBuilder(block);
-
-            // If there's only 1 child it means that it's plain text inside of the attribute.
-            // i.e. <div class="plain text in attribute">
-            if (builder.Children.Count == 1)
-            {
-                return TryParseSpan(childSpan, descriptors, errorSink, processedBoundAttributeNames);
-            }
-
-            var nameTokens = childSpan
-                .Tokens
-                .OfType<HtmlToken>()
-                .SkipWhile(token => !HtmlMarkupParser.IsValidAttributeNameToken(token)) // Skip prefix
-                .TakeWhile(nameToken => HtmlMarkupParser.IsValidAttributeNameToken(nameToken))
-                .Select(nameToken => nameToken.Content);
-
-            var name = string.Concat(nameTokens);
-            if (string.IsNullOrEmpty(name))
-            {
-                var location = new SourceSpan(childSpan.Start, childSpan.Length);
-                var diagnostic = RazorDiagnosticFactory.CreateParsing_TagHelperAttributesMustHaveAName(location, tagName);
-                errorSink.OnError(diagnostic);
-
-                return null;
-            }
-
             // Have a name now. Able to determine correct isBoundNonStringAttribute value.
-            var result = CreateTryParseResult(name, descriptors, processedBoundAttributeNames);
+            var result = CreateTryParseResult(attributeBlock.Name.GetContent(), descriptors, processedBoundAttributeNames);
 
-            var firstChild = builder.Children[0] as Span;
-            if (firstChild != null && firstChild.Tokens[0] is HtmlToken)
+            result.AttributeStructure = AttributeStructure.Minimized;
+            var rewritten = SyntaxFactory.MarkupMinimizedTagHelperAttribute(
+                attributeBlock.NamePrefix,
+                attributeBlock.Name);
+
+            rewritten = rewritten.WithTagHelperAttributeInfo(
+                new TagHelperAttributeInfo(result.AttributeName, result.AttributeStructure, result.IsBoundAttribute));
+
+            result.RewrittenAttribute = rewritten;
+
+            return result;
+        }
+
+        private static TryParseResult TryParseAttribute(
+            string tagName,
+            MarkupAttributeBlockSyntax attributeBlock,
+            IEnumerable<TagHelperDescriptor> descriptors,
+            ErrorSink errorSink,
+            HashSet<string> processedBoundAttributeNames)
+        {
+            // Have a name now. Able to determine correct isBoundNonStringAttribute value.
+            var result = CreateTryParseResult(attributeBlock.Name.GetContent(), descriptors, processedBoundAttributeNames);
+
+            if (attributeBlock.ValuePrefix == null)
             {
-                var htmlToken = firstChild.Tokens[firstChild.Tokens.Count - 1] as HtmlToken;
-                switch (htmlToken.Type)
+                // We are purposefully not persisting NoQuotes even for unbound attributes because it is still possible to
+                // rewrite the values that introduces a space like in UrlResolutionTagHelper.
+                // The other case is it could be an expression, treat NoQuotes and DoubleQuotes equivalently. We purposefully do not persist NoQuotes
+                // ValueStyles at code generation time to protect users from rendering dynamic content with spaces
+                // that can break attributes.
+                // Ex: <tag my-attribute=@value /> where @value results in the test "hello world".
+                // This way, the above code would render <tag my-attribute="hello world" />.
+                result.AttributeStructure = AttributeStructure.DoubleQuotes;
+            }
+            else
+            {
+                var lastToken = attributeBlock.ValuePrefix.GetLastToken();
+                switch (lastToken.Kind)
                 {
-                    case HtmlTokenType.Equals:
-                        if (builder.Children.Count == 2 &&
-                            builder.Children[1] is Span value &&
-                            value.Kind == SpanKindInternal.Markup)
-                        {
-                            // Attribute value is a string literal. Eg: <tag my-attribute=foo />.
-                            result.AttributeStructure = AttributeStructure.NoQuotes;
-                        }
-                        else
-                        {
-                            // Could be an expression, treat NoQuotes and DoubleQuotes equivalently. We purposefully do not persist NoQuotes
-                            // ValueStyles at code generation time to protect users from rendering dynamic content with spaces
-                            // that can break attributes.
-                            // Ex: <tag my-attribute=@value /> where @value results in the test "hello world".
-                            // This way, the above code would render <tag my-attribute="hello world" />.
-                            result.AttributeStructure = AttributeStructure.DoubleQuotes;
-                        }
-                        break;
-                    case HtmlTokenType.DoubleQuote:
+                    case SyntaxKind.DoubleQuote:
                         result.AttributeStructure = AttributeStructure.DoubleQuotes;
                         break;
-                    case HtmlTokenType.SingleQuote:
+                    case SyntaxKind.SingleQuote:
                         result.AttributeStructure = AttributeStructure.SingleQuotes;
                         break;
                     default:
@@ -397,263 +245,48 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 }
             }
 
-            // Remove first child i.e. foo="
-            builder.Children.RemoveAt(0);
-
-            // Grabbing last child to check if the attribute value is quoted.
-            var endNode = block.Children.Last();
-            if (!endNode.IsBlock)
+            var attributeValue = attributeBlock.Value;
+            if (attributeValue == null)
             {
-                var endSpan = (Span)endNode;
+                var builder = SyntaxListBuilder<RazorSyntaxNode>.Create();
 
-                // In some malformed cases e.g. <p bar="false', the last Span (false' in the ex.) may contain more
-                // than a single HTML token. Do not ignore those other tokens.
-                var tokenCount = endSpan.Tokens.Count();
-                var endToken = tokenCount == 1 ? (HtmlToken)endSpan.Tokens.First() : null;
+                // Add a marker for attribute value when there are no quotes like, <p class= >
+                builder.Add(SyntaxFactory.MarkupTextLiteral(new SyntaxList<SyntaxToken>()));
 
-                // Checking to see if it's a quoted attribute, if so we should remove end quote
-                if (endToken != null && IsQuote(endToken))
-                {
-                    builder.Children.RemoveAt(builder.Children.Count - 1);
-                }
+                attributeValue = SyntaxFactory.GenericBlock(builder.ToList());
             }
+            var rewrittenValue = RewriteAttributeValue(result, attributeValue);
 
-            // We need to rebuild the chunk generators of the builder and its children (this is needed to
-            // ensure we don't do special attribute chunk generation since this is a tag helper).
-            block = RebuildChunkGenerators(builder.Build(), result.IsBoundAttribute);
+            var rewritten = SyntaxFactory.MarkupTagHelperAttribute(
+                attributeBlock.NamePrefix,
+                attributeBlock.Name,
+                attributeBlock.NameSuffix,
+                attributeBlock.EqualsToken,
+                attributeBlock.ValuePrefix,
+                rewrittenValue,
+                attributeBlock.ValueSuffix);
 
-            // If there's only 1 child at this point its value could be a simple markup span (treated differently than
-            // block level elements for attributes).
-            if (block.Children.Count() == 1)
-            {
-                var child = block.Children.First() as Span;
-                if (child != null)
-                {
-                    // After pulling apart the block we just have a value span.
-                    var spanBuilder = new SpanBuilder(child);
+            rewritten = rewritten.WithTagHelperAttributeInfo(
+                new TagHelperAttributeInfo(result.AttributeName, result.AttributeStructure, result.IsBoundAttribute));
 
-                    result.AttributeValueNode =
-                        CreateMarkupAttribute(spanBuilder, result);
-
-                    return result;
-                }
-            }
-
-            var isFirstSpan = true;
-
-            result.AttributeValueNode = ConvertToMarkupAttributeBlock(
-                block,
-                (parentBlock, span) =>
-                {
-                    // If the attribute was requested by a tag helper but the corresponding property was not a
-                    // string, then treat its value as code. A non-string value can be any C# value so we need
-                    // to ensure the SyntaxTreeNode reflects that.
-                    if (result.IsBoundNonStringAttribute)
-                    {
-                        // For bound non-string attributes, we'll only allow a transition span to appear at the very
-                        // beginning of the attribute expression. All later transitions would appear as code so that
-                        // they are part of the generated output. E.g.
-                        // key="@value" -> MyTagHelper.key = value
-                        // key=" @value" -> MyTagHelper.key =  @value
-                        // key="1 + @case" -> MyTagHelper.key = 1 + @case
-                        // key="@int + @case" -> MyTagHelper.key = int + @case
-                        // key="@(a + b) -> MyTagHelper.key = a + b
-                        // key="4 + @(a + b)" -> MyTagHelper.key = 4 + @(a + b)
-                        if (isFirstSpan && span.Kind == SpanKindInternal.Transition)
-                        {
-                            // do nothing.
-                        }
-                        else
-                        {
-                            var spanBuilder = new SpanBuilder(span);
-
-                            if (parentBlock.Type == BlockKindInternal.Expression &&
-                                (spanBuilder.Kind == SpanKindInternal.Transition ||
-                                spanBuilder.Kind == SpanKindInternal.MetaCode))
-                            {
-                                // Change to a MarkupChunkGenerator so that the '@' \ parenthesis is generated as part of the output.
-                                spanBuilder.ChunkGenerator = new MarkupChunkGenerator();
-                            }
-
-                            ConfigureNonStringAttribute(spanBuilder, result.IsDuplicateAttribute);
-
-                            span = spanBuilder.Build();
-                        }
-                    }
-
-                    isFirstSpan = false;
-
-                    return span;
-                });
+            result.RewrittenAttribute = rewritten;
 
             return result;
         }
 
-        private static Block ConvertToMarkupAttributeBlock(
-            Block block,
-            Func<Block, Span, Span> createMarkupAttribute)
+        private static MarkupTagHelperAttributeValueSyntax RewriteAttributeValue(TryParseResult result, RazorBlockSyntax attributeValue)
         {
-            var blockBuilder = new BlockBuilder
+            var rewriter = new AttributeValueRewriter(result);
+            var rewrittenValue = attributeValue;
+            if (result.IsBoundAttribute)
             {
-                ChunkGenerator = block.ChunkGenerator,
-                Type = block.Type
-            };
-
-            foreach (var child in block.Children)
-            {
-                SyntaxTreeNode markupAttributeChild;
-
-                if (child.IsBlock)
-                {
-                    markupAttributeChild = ConvertToMarkupAttributeBlock((Block)child, createMarkupAttribute);
-                }
-                else
-                {
-                    markupAttributeChild = createMarkupAttribute(block, (Span)child);
-                }
-
-                blockBuilder.Children.Add(markupAttributeChild);
+                // If the attribute was requested by a tag helper but the corresponding property was not a
+                // string, then treat its value as code. A non-string value can be any C# value so we need
+                // to ensure the tree reflects that.
+                rewrittenValue = (RazorBlockSyntax)rewriter.Visit(attributeValue);
             }
 
-            return blockBuilder.Build();
-        }
-
-        private static Block RebuildChunkGenerators(Block block, bool isBound)
-        {
-            var builder = new BlockBuilder(block);
-
-            // Don't want to rebuild unbound dynamic attributes. They need to run through the conditional attribute
-            // removal system at runtime. A conditional attribute at the parse tree rewriting level is defined by
-            // having at least 1 child with a DynamicAttributeBlockChunkGenerator.
-            if (!isBound &&
-                block.Children.Any(
-                    child => child.IsBlock &&
-                    ((Block)child).ChunkGenerator is DynamicAttributeBlockChunkGenerator))
-            {
-                // The parent chunk generator must be removed because it's normally responsible for conditionally
-                // generating the attribute prefix (class=") and suffix ("). The prefix and suffix concepts aren't
-                // applicable for the TagHelper use case since the attributes are put into a dictionary like object as
-                // name value pairs.
-                builder.ChunkGenerator = ParentChunkGenerator.Null;
-
-                return builder.Build();
-            }
-
-            var isDynamic = builder.ChunkGenerator is DynamicAttributeBlockChunkGenerator;
-
-            // We don't want any attribute specific logic here, null out the block chunk generator.
-            if (isDynamic || builder.ChunkGenerator is AttributeBlockChunkGenerator)
-            {
-                builder.ChunkGenerator = ParentChunkGenerator.Null;
-            }
-
-            for (var i = 0; i < builder.Children.Count; i++)
-            {
-                var child = builder.Children[i];
-
-                if (child.IsBlock)
-                {
-                    // The child is a block, recurse down into the block to rebuild its children
-                    builder.Children[i] = RebuildChunkGenerators((Block)child, isBound);
-                }
-                else
-                {
-                    var childSpan = (Span)child;
-                    ISpanChunkGenerator newChunkGenerator = null;
-                    var literalGenerator = childSpan.ChunkGenerator as LiteralAttributeChunkGenerator;
-
-                    if (literalGenerator != null)
-                    {
-                        newChunkGenerator = new MarkupChunkGenerator();
-                    }
-                    else if (isDynamic && childSpan.ChunkGenerator == SpanChunkGenerator.Null)
-                    {
-                        // Usually the dynamic chunk generator handles creating the null chunk generators underneath
-                        // it. This doesn't make sense in terms of tag helpers though, we need to change null code
-                        // generators to markup chunk generators.
-
-                        newChunkGenerator = new MarkupChunkGenerator();
-                    }
-
-                    // If we have a new chunk generator we'll need to re-build the child
-                    if (newChunkGenerator != null)
-                    {
-                        var childSpanBuilder = new SpanBuilder(childSpan)
-                        {
-                            ChunkGenerator = newChunkGenerator
-                        };
-
-                        builder.Children[i] = childSpanBuilder.Build();
-                    }
-                }
-            }
-
-            return builder.Build();
-        }
-
-        private static SourceSpan GetAttributeNameLocation(SyntaxTreeNode node, string attributeName)
-        {
-            Span span;
-            var nodeStart = SourceLocation.Undefined;
-
-            if (node.IsBlock)
-            {
-                span = ((Block)node).FindFirstDescendentSpan();
-                nodeStart = span.Parent.Start;
-            }
-            else
-            {
-                span = (Span)node;
-                nodeStart = span.Start;
-            }
-
-            // Span should never be null here, this should only ever be called if an attribute was successfully parsed.
-            Debug.Assert(span != null);
-
-            // Attributes must have at least one non-whitespace character to represent the tagName (even if its a C#
-            // expression).
-            var firstNonWhitespaceToken = span
-                .Tokens
-                .OfType<HtmlToken>()
-                .First(token => token.Type != HtmlTokenType.WhiteSpace && token.Type != HtmlTokenType.NewLine);
-
-            var location = new SourceSpan(firstNonWhitespaceToken.Start, attributeName.Length);
-            return location;
-        }
-
-        private static Span CreateMarkupAttribute(SpanBuilder builder, TryParseResult result)
-        {
-            Debug.Assert(builder != null);
-
-            // If the attribute was requested by a tag helper but the corresponding property was not a string,
-            // then treat its value as code. A non-string value can be any C# value so we need to ensure the
-            // SyntaxTreeNode reflects that.
-            if (result.IsBoundNonStringAttribute)
-            {
-                ConfigureNonStringAttribute(builder, result.IsDuplicateAttribute);
-            }
-
-            return builder.Build();
-        }
-
-        private static bool IsNullOrWhitespaceAttributeValue(SyntaxTreeNode attributeValue)
-        {
-            if (attributeValue.IsBlock)
-            {
-                foreach (var span in ((Block)attributeValue).Flatten())
-                {
-                    if (!string.IsNullOrWhiteSpace(span.Content))
-                    {
-                        return false;
-                    }
-                }
-
-                return true;
-            }
-            else
-            {
-                return string.IsNullOrWhiteSpace(((Span)attributeValue).Content);
-            }
+            return SyntaxFactory.MarkupTagHelperAttributeValue(rewrittenValue.Children);
         }
 
         // Determines the full name of the Type of the property corresponding to an attribute with the given name.
@@ -716,31 +349,281 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return firstBoundAttribute;
         }
 
-        private static bool IsQuote(HtmlToken htmlToken)
+        private static string GetAttributeValueContent(RazorSyntaxNode attributeBlock)
         {
-            return htmlToken.Type == HtmlTokenType.DoubleQuote ||
-                   htmlToken.Type == HtmlTokenType.SingleQuote;
+            if (attributeBlock is MarkupTagHelperAttributeSyntax tagHelperAttribute)
+            {
+                return tagHelperAttribute.Value?.GetContent();
+            }
+            else if (attributeBlock is MarkupAttributeBlockSyntax attribute)
+            {
+                return attribute.Value?.GetContent();
+            }
+
+            return null;
         }
 
-        private static void ConfigureNonStringAttribute(SpanBuilder builder, bool isDuplicateAttribute)
+        private class AttributeValueRewriter : SyntaxRewriter
         {
-            builder.Kind = SpanKindInternal.Code;
-            builder.EditHandler = new ImplicitExpressionEditHandler(
-                    builder.EditHandler.Tokenizer,
-                    CSharpCodeParser.DefaultKeywords,
-                    acceptTrailingDot: true)
-            {
-                AcceptedCharacters = AcceptedCharactersInternal.AnyExceptNewline
-            };
+            private readonly TryParseResult _tryParseResult;
+            private bool _rewriteAsMarkup = false;
 
-            if (!isDuplicateAttribute && builder.ChunkGenerator != SpanChunkGenerator.Null)
+            public AttributeValueRewriter(TryParseResult result)
             {
-                // We want to mark the value of non-string bound attributes to be CSharp.
-                // Except in two cases,
-                // 1. Cases when we don't want to render the span. Eg: Transition span '@'.
-                // 2. Cases when it is a duplicate of a bound attribute. This should just be rendered as html.
+                _tryParseResult = result;
+            }
 
-                builder.ChunkGenerator = new ExpressionChunkGenerator();
+            public override SyntaxNode VisitCSharpTransition(CSharpTransitionSyntax node)
+            {
+                if (!_tryParseResult.IsBoundNonStringAttribute)
+                {
+                    return base.VisitCSharpTransition(node);
+                }
+
+                // For bound non-string attributes, we'll only allow a transition span to appear at the very
+                // beginning of the attribute expression. All later transitions would appear as code so that
+                // they are part of the generated output. E.g.
+                // key="@value" -> MyTagHelper.key = value
+                // key=" @value" -> MyTagHelper.key =  @value
+                // key="1 + @case" -> MyTagHelper.key = 1 + @case
+                // key="@int + @case" -> MyTagHelper.key = int + @case
+                // key="@(a + b) -> MyTagHelper.key = a + b
+                // key="4 + @(a + b)" -> MyTagHelper.key = 4 + @(a + b)
+                if (_rewriteAsMarkup)
+                {
+                    // Change to a MarkupChunkGenerator so that the '@' \ parenthesis is generated as part of the output.
+                    var context = node.GetSpanContext();
+                    var newContext = new SpanContext(new MarkupChunkGenerator(), context.EditHandler);
+
+                    var expression = SyntaxFactory.CSharpExpressionLiteral(new SyntaxList<SyntaxToken>(node.Transition)).WithSpanContext(newContext);
+
+                    return base.VisitCSharpExpressionLiteral(expression);
+                }
+
+                _rewriteAsMarkup = true;
+                return base.VisitCSharpTransition(node);
+            }
+
+            public override SyntaxNode VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+            {
+                if (_rewriteAsMarkup)
+                {
+                    var builder = SyntaxListBuilder<RazorSyntaxNode>.Create();
+
+                    // Convert transition.
+                    // Change to a MarkupChunkGenerator so that the '@' \ parenthesis is generated as part of the output.
+                    var context = node.GetSpanContext();
+                    var newContext = new SpanContext(new MarkupChunkGenerator(), context?.EditHandler ?? SpanEditHandler.CreateDefault((content) => Enumerable.Empty<Syntax.InternalSyntax.SyntaxToken>()));
+
+                    var expression = SyntaxFactory.CSharpExpressionLiteral(new SyntaxList<SyntaxToken>(node.Transition.Transition)).WithSpanContext(newContext);
+                    expression = (CSharpExpressionLiteralSyntax)VisitCSharpExpressionLiteral(expression);
+                    builder.Add(expression);
+
+                    var rewrittenBody = (CSharpCodeBlockSyntax)VisitCSharpCodeBlock(((CSharpImplicitExpressionBodySyntax)node.Body).CSharpCode);
+                    builder.AddRange(rewrittenBody.Children);
+
+                    // Since the original transition is part of the body, we need something to take it's place.
+                    var transition = SyntaxFactory.CSharpTransition(SyntaxFactory.MissingToken(SyntaxKind.Transition));
+
+                    var rewrittenCodeBlock = SyntaxFactory.CSharpCodeBlock(builder.ToList());
+                    return SyntaxFactory.CSharpImplicitExpression(transition, SyntaxFactory.CSharpImplicitExpressionBody(rewrittenCodeBlock));
+                }
+
+                return base.VisitCSharpImplicitExpression(node);
+            }
+
+            public override SyntaxNode VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+            {
+                CSharpTransitionSyntax transition = null;
+                var builder = SyntaxListBuilder<RazorSyntaxNode>.Create();
+                if (_rewriteAsMarkup)
+                {
+                    // Convert transition.
+                    // Change to a MarkupChunkGenerator so that the '@' \ parenthesis is generated as part of the output.
+                    var context = node.GetSpanContext();
+                    var newContext = new SpanContext(new MarkupChunkGenerator(), context?.EditHandler ?? SpanEditHandler.CreateDefault((content) => Enumerable.Empty<Syntax.InternalSyntax.SyntaxToken>()));
+
+                    var expression = SyntaxFactory.CSharpExpressionLiteral(new SyntaxList<SyntaxToken>(node.Transition.Transition)).WithSpanContext(newContext);
+                    expression = (CSharpExpressionLiteralSyntax)VisitCSharpExpressionLiteral(expression);
+                    builder.Add(expression);
+
+                    // Since the original transition is part of the body, we need something to take it's place.
+                    transition = SyntaxFactory.CSharpTransition(SyntaxFactory.MissingToken(SyntaxKind.Transition));
+
+                    var body = (CSharpExplicitExpressionBodySyntax)node.Body;
+                    var rewrittenOpenParen = (RazorSyntaxNode)VisitRazorMetaCode(body.OpenParen);
+                    var rewrittenBody = (CSharpCodeBlockSyntax)VisitCSharpCodeBlock(body.CSharpCode);
+                    var rewrittenCloseParen = (RazorSyntaxNode)VisitRazorMetaCode(body.CloseParen);
+                    builder.Add(rewrittenOpenParen);
+                    builder.AddRange(rewrittenBody.Children);
+                    builder.Add(rewrittenCloseParen);
+                }
+                else
+                {
+                    // This is the first expression of a non-string attribute like attr=@(a + b)
+                    // Below code converts this to an implicit expression to make the parens
+                    // part of the expression so that it is rendered.
+                    transition = (CSharpTransitionSyntax)Visit(node.Transition);
+                    var body = (CSharpExplicitExpressionBodySyntax)node.Body;
+                    var rewrittenOpenParen = (RazorSyntaxNode)VisitRazorMetaCode(body.OpenParen);
+                    var rewrittenBody = (CSharpCodeBlockSyntax)VisitCSharpCodeBlock(body.CSharpCode);
+                    var rewrittenCloseParen = (RazorSyntaxNode)VisitRazorMetaCode(body.CloseParen);
+                    builder.Add(rewrittenOpenParen);
+                    builder.AddRange(rewrittenBody.Children);
+                    builder.Add(rewrittenCloseParen);
+                }
+
+                var rewrittenCodeBlock = SyntaxFactory.CSharpCodeBlock(builder.ToList());
+                return SyntaxFactory.CSharpImplicitExpression(transition, SyntaxFactory.CSharpImplicitExpressionBody(rewrittenCodeBlock));
+            }
+
+            public override SyntaxNode VisitRazorMetaCode(RazorMetaCodeSyntax node)
+            {
+                if (!_tryParseResult.IsBoundNonStringAttribute)
+                {
+                    return base.VisitRazorMetaCode(node);
+                }
+
+                if (_rewriteAsMarkup)
+                {
+                    // Change to a MarkupChunkGenerator so that the '@' \ parenthesis is generated as part of the output.
+                    var context = node.GetSpanContext();
+                    var newContext = new SpanContext(new MarkupChunkGenerator(), context.EditHandler);
+
+                    var expression = SyntaxFactory.CSharpExpressionLiteral(new SyntaxList<SyntaxToken>(node.MetaCode)).WithSpanContext(newContext);
+
+                    return VisitCSharpExpressionLiteral(expression);
+                }
+
+                _rewriteAsMarkup = true;
+                return base.VisitRazorMetaCode(node);
+            }
+
+            public override SyntaxNode VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+            {
+                if (!_tryParseResult.IsBoundNonStringAttribute)
+                {
+                    return base.VisitCSharpExpressionLiteral(node);
+                }
+
+                node = (CSharpExpressionLiteralSyntax)ConfigureNonStringAttribute(node);
+
+                _rewriteAsMarkup = true;
+                return base.VisitCSharpExpressionLiteral(node);
+            }
+
+            public override SyntaxNode VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
+            {
+                var builder = SyntaxListBuilder<SyntaxToken>.Create();
+                if (node.Prefix != null)
+                {
+                    builder.AddRange(node.Prefix.LiteralTokens);
+                }
+                if (node.Value != null)
+                {
+                    builder.AddRange(node.Value.LiteralTokens);
+                }
+
+                if (_tryParseResult.IsBoundNonStringAttribute)
+                {
+                    _rewriteAsMarkup = true;
+                    // Since this is a bound non-string attribute, we want to convert LiteralAttributeValue to just be a CSharp Expression literal.
+                    var expression = SyntaxFactory.CSharpExpressionLiteral(builder.ToList());
+                    return VisitCSharpExpressionLiteral(expression);
+                }
+                else
+                {
+                    var literal = SyntaxFactory.MarkupTextLiteral(builder.ToList());
+                    var context = node.Value?.GetSpanContext();
+                    literal = context != null ? literal.WithSpanContext(context) : literal;
+
+                    return Visit(literal);
+                }
+            }
+
+            public override SyntaxNode VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
+            {
+                // Move the prefix to be part of the actual value.
+                var builder = SyntaxListBuilder<RazorSyntaxNode>.Create();
+                if (node.Prefix != null)
+                {
+                    builder.Add(node.Prefix);
+                }
+                if (node.Value?.Children != null)
+                {
+                    builder.AddRange(node.Value.Children);
+                }
+                var rewrittenValue = SyntaxFactory.MarkupBlock(builder.ToList());
+
+                return base.VisitMarkupBlock(rewrittenValue);
+            }
+
+            public override SyntaxNode VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+            {
+                if (!_tryParseResult.IsBoundNonStringAttribute)
+                {
+                    return base.VisitCSharpStatementLiteral(node);
+                }
+
+                _rewriteAsMarkup = true;
+                return base.VisitCSharpStatementLiteral(node);
+            }
+
+            public override SyntaxNode VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+            {
+                if (!_tryParseResult.IsBoundNonStringAttribute)
+                {
+                    return base.VisitMarkupTextLiteral(node);
+                }
+
+                _rewriteAsMarkup = true;
+                node = (MarkupTextLiteralSyntax)ConfigureNonStringAttribute(node);
+                var tokens = new SyntaxList<SyntaxToken>(node.LiteralTokens);
+                var value = SyntaxFactory.CSharpExpressionLiteral(tokens);
+                return value.WithSpanContext(node.GetSpanContext());
+            }
+
+            public override SyntaxNode VisitMarkupEphemeralTextLiteral(MarkupEphemeralTextLiteralSyntax node)
+            {
+                if (!_tryParseResult.IsBoundNonStringAttribute)
+                {
+                    return base.VisitMarkupEphemeralTextLiteral(node);
+                }
+
+                // Since this is a non-string attribute we need to rewrite this as code.
+                // Rewriting it to CSharpEphemeralTextLiteral so that it is not rendered to output.
+                _rewriteAsMarkup = true;
+                node = (MarkupEphemeralTextLiteralSyntax)ConfigureNonStringAttribute(node);
+                var tokens = new SyntaxList<SyntaxToken>(node.LiteralTokens);
+                var value = SyntaxFactory.CSharpEphemeralTextLiteral(tokens);
+                return value.WithSpanContext(node.GetSpanContext());
+            }
+
+            private SyntaxNode ConfigureNonStringAttribute(SyntaxNode node)
+            {
+                var context = node.GetSpanContext();
+                var builder = context != null ? new SpanContextBuilder(context) : new SpanContextBuilder();
+                builder.EditHandler = new ImplicitExpressionEditHandler(
+                        builder.EditHandler.Tokenizer,
+                        CSharpCodeParser.DefaultKeywords,
+                        acceptTrailingDot: true)
+                {
+                    AcceptedCharacters = AcceptedCharactersInternal.AnyExceptNewline
+                };
+
+                if (!_tryParseResult.IsDuplicateAttribute && builder.ChunkGenerator != SpanChunkGenerator.Null)
+                {
+                    // We want to mark the value of non-string bound attributes to be CSharp.
+                    // Except in two cases,
+                    // 1. Cases when we don't want to render the span. Eg: Transition span '@'.
+                    // 2. Cases when it is a duplicate of a bound attribute. This should just be rendered as html.
+
+                    builder.ChunkGenerator = new ExpressionChunkGenerator();
+                }
+
+                context = builder.Build();
+
+                return node.WithSpanContext(context);
             }
         }
 
@@ -748,7 +631,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             public string AttributeName { get; set; }
 
-            public SyntaxTreeNode AttributeValueNode { get; set; }
+            public RazorSyntaxNode RewrittenAttribute { get; set; }
 
             public AttributeStructure AttributeStructure { get; set; }
 
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperChunkGenerator.cs
deleted file mode 100644
index 8f278edb2c..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperChunkGenerator.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class TagHelperChunkGenerator : ParentChunkGenerator
-    {
-        public override void GenerateStartParentChunk(Block target, ChunkGeneratorContext context)
-        {
-            //var tagHelperBlock = target as TagHelperBlock;
-
-            //Debug.Assert(
-            //    tagHelperBlock != null,
-            //    $"A {nameof(TagHelperChunkGenerator)} must only be used with {nameof(TagHelperBlock)}s.");
-
-            //var attributes = new List<TagHelperAttributeTracker>();
-
-            //// We need to create a chunk generator to create chunks for each of the attributes.
-            //var chunkGenerator = context.Host.CreateChunkGenerator(
-            //    context.ClassName,
-            //    context.RootNamespace,
-            //    context.SourceFile);
-
-            //foreach (var attribute in tagHelperBlock.Attributes)
-            //{
-            //    ParentChunk attributeChunkValue = null;
-
-            //    if (attribute.Value != null)
-            //    {
-            //        // Populates the chunk tree with chunks associated with attributes
-            //        attribute.Value.Accept(chunkGenerator);
-
-            //        var chunks = chunkGenerator.Context.ChunkTreeBuilder.Root.Children;
-            //        var first = chunks.FirstOrDefault();
-
-            //        attributeChunkValue = new ParentChunk
-            //        {
-            //            Association = first?.Association,
-            //            Children = chunks,
-            //            Start = first == null ? SourceLocation.Zero : first.Start
-            //        };
-            //    }
-
-            //    var attributeChunk = new TagHelperAttributeTracker(
-            //        attribute.Name,
-            //        attributeChunkValue,
-            //        attribute.ValueStyle);
-
-            //    attributes.Add(attributeChunk);
-
-            //    // Reset the chunk tree builder so we can build a new one for the next attribute
-            //    chunkGenerator.Context.ChunkTreeBuilder = new ChunkTreeBuilder();
-            //}
-
-            //var unprefixedTagName = tagHelperBlock.TagName.Substring(_tagHelperDescriptors.First().Prefix.Length);
-
-            //context.ChunkTreeBuilder.StartParentChunk(
-            //    new TagHelperChunk(
-            //        unprefixedTagName,
-            //        tagHelperBlock.TagMode,
-            //        attributes,
-            //        _tagHelperDescriptors),
-            //    target,
-            //    topLevel: false);
-        }
-
-        public override void GenerateEndParentChunk(Block target, ChunkGeneratorContext context)
-        {
-            //context.ChunkTreeBuilder.EndParentChunk();
-        }
-
-        public override void Accept(ParserVisitor visitor, Block block)
-        {
-            visitor.VisitTagHelperBlock(this, block);
-        }
-
-        public override string ToString()
-        {
-            return "TagHelper";
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperParseTreeRewriter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperParseTreeRewriter.cs
index 8e3a7238c0..18b1cf5c4d 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperParseTreeRewriter.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperParseTreeRewriter.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;
@@ -6,194 +6,239 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal class TagHelperParseTreeRewriter
     {
+        public static RazorSyntaxTree Rewrite(RazorSyntaxTree syntaxTree, string tagHelperPrefix, IEnumerable<TagHelperDescriptor> descriptors)
+        {
+            var errorSink = new ErrorSink();
+            syntaxTree = MarkupElementRewriter.AddMarkupElements(syntaxTree);
+
+            var rewriter = new Rewriter(
+                syntaxTree.Source,
+                tagHelperPrefix,
+                descriptors,
+                syntaxTree.Options.FeatureFlags,
+                errorSink);
+
+            var rewritten = rewriter.Visit(syntaxTree.Root);
+
+            var errorList = new List<RazorDiagnostic>();
+            errorList.AddRange(errorSink.Errors);
+            errorList.AddRange(descriptors.SelectMany(d => d.GetAllDiagnostics()));
+
+            var diagnostics = CombineErrors(syntaxTree.Diagnostics, errorList).OrderBy(error => error.Span.AbsoluteIndex);
+
+            var newSyntaxTree = RazorSyntaxTree.Create(rewritten, syntaxTree.Source, diagnostics, syntaxTree.Options);
+            newSyntaxTree = MarkupElementRewriter.RemoveMarkupElements(newSyntaxTree);
+
+            return newSyntaxTree;
+        }
+
+        private static IReadOnlyList<RazorDiagnostic> CombineErrors(IReadOnlyList<RazorDiagnostic> errors1, IReadOnlyList<RazorDiagnostic> errors2)
+        {
+            var combinedErrors = new List<RazorDiagnostic>(errors1.Count + errors2.Count);
+            combinedErrors.AddRange(errors1);
+            combinedErrors.AddRange(errors2);
+
+            return combinedErrors;
+        }
+
         // Internal for testing.
-        // Null characters are invalid markup for HTML attribute values.
-        internal static readonly string InvalidAttributeValueMarker = "\0";
-
-        // From http://dev.w3.org/html5/spec/Overview.html#elements-0
-        private static readonly HashSet<string> VoidElements = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        internal class Rewriter : SyntaxRewriter
         {
-            "area",
-            "base",
-            "br",
-            "col",
-            "command",
-            "embed",
-            "hr",
-            "img",
-            "input",
-            "keygen",
-            "link",
-            "meta",
-            "param",
-            "source",
-            "track",
-            "wbr"
-        };
+            // Internal for testing.
+            // Null characters are invalid markup for HTML attribute values.
+            internal static readonly string InvalidAttributeValueMarker = "\0";
 
-        private readonly string _tagHelperPrefix;
-        private readonly List<KeyValuePair<string, string>> _htmlAttributeTracker;
-        private readonly StringBuilder _attributeValueBuilder;
-        private readonly TagHelperBinder _tagHelperBinder;
-        private readonly Stack<TagBlockTracker> _trackerStack;
-        private readonly Stack<BlockBuilder> _blockStack;
-        private TagHelperBlockTracker _currentTagHelperTracker;
-        private BlockBuilder _currentBlock;
-        private RazorParserFeatureFlags _featureFlags;
+            private readonly RazorSourceDocument _source;
+            private readonly string _tagHelperPrefix;
+            private readonly List<KeyValuePair<string, string>> _htmlAttributeTracker;
+            private readonly StringBuilder _attributeValueBuilder;
+            private readonly TagHelperBinder _tagHelperBinder;
+            private readonly Stack<TagTracker> _trackerStack;
+            private readonly ErrorSink _errorSink;
+            private RazorParserFeatureFlags _featureFlags;
 
-        public TagHelperParseTreeRewriter(
-            string tagHelperPrefix,
-            IEnumerable<TagHelperDescriptor> descriptors,
-            RazorParserFeatureFlags featureFlags)
-        {
-            _tagHelperPrefix = tagHelperPrefix;
-            _tagHelperBinder = new TagHelperBinder(tagHelperPrefix, descriptors);
-            _trackerStack = new Stack<TagBlockTracker>();
-            _blockStack = new Stack<BlockBuilder>();
-            _attributeValueBuilder = new StringBuilder();
-            _htmlAttributeTracker = new List<KeyValuePair<string, string>>();
-            _featureFlags = featureFlags;
-        }
-
-        private TagBlockTracker CurrentTracker => _trackerStack.Count > 0 ? _trackerStack.Peek() : null;
-
-        private string CurrentParentTagName => CurrentTracker?.TagName;
-
-        private bool CurrentParentIsTagHelper => CurrentTracker?.IsTagHelper ?? false;
-
-        public Block Rewrite(Block syntaxTree, ErrorSink errorSink)
-        {
-            RewriteTags(syntaxTree, errorSink, depth: 0);
-
-            var rewritten = _currentBlock.Build();
-
-            return rewritten;
-        }
-
-        private void RewriteTags(Block input, ErrorSink errorSink, int depth)
-        {
-            // We want to start a new block without the children from existing (we rebuild them).
-            TrackBlock(new BlockBuilder
+            public Rewriter(
+                RazorSourceDocument source,
+                string tagHelperPrefix,
+                IEnumerable<TagHelperDescriptor> descriptors,
+                RazorParserFeatureFlags featureFlags,
+                ErrorSink errorSink)
             {
-                Type = input.Type,
-                ChunkGenerator = input.ChunkGenerator
-            });
+                _source = source;
+                _tagHelperPrefix = tagHelperPrefix;
+                _tagHelperBinder = new TagHelperBinder(tagHelperPrefix, descriptors);
+                _trackerStack = new Stack<TagTracker>();
+                _attributeValueBuilder = new StringBuilder();
+                _htmlAttributeTracker = new List<KeyValuePair<string, string>>();
+                _featureFlags = featureFlags;
+                _errorSink = errorSink;
+            }
 
-            var activeTrackers = _trackerStack.Count;
+            private TagTracker CurrentTracker => _trackerStack.Count > 0 ? _trackerStack.Peek() : null;
 
-            foreach (var child in input.Children)
+            private string CurrentParentTagName => CurrentTracker?.TagName;
+
+            private bool CurrentParentIsTagHelper => CurrentTracker?.IsTagHelper ?? false;
+
+            private TagHelperTracker CurrentTagHelperTracker => _trackerStack.FirstOrDefault(t => t.IsTagHelper) as TagHelperTracker;
+
+            public override SyntaxNode VisitMarkupElement(MarkupElementSyntax node)
             {
-                if (child.IsBlock)
+                if (IsPartOfStartTag(node))
                 {
-                    var childBlock = (Block)child;
+                    // If this element is inside a start tag, it is some sort of malformed case like
+                    // <p @do { someattribute=\"btn\"></p>, where the end "p" tag is inside the start "p" tag.
+                    // We don't want to do tag helper parsing for this tag.
+                    return base.VisitMarkupElement(node);
+                }
 
-                    if (childBlock.Type == BlockKindInternal.Tag)
+                MarkupTagHelperStartTagSyntax tagHelperStart = null;
+                MarkupTagHelperEndTagSyntax tagHelperEnd = null;
+                TagHelperInfo tagHelperInfo = null;
+
+                // Visit the start tag.
+                var startTag = (MarkupTagBlockSyntax)Visit(node.StartTag);
+                if (startTag != null)
+                {
+                    var tagName = startTag.GetTagName();
+                    if (TryRewriteTagHelperStart(startTag, out tagHelperStart, out tagHelperInfo))
                     {
-                        if (TryRewriteTagHelper(childBlock, errorSink))
+                        // This is a tag helper.
+                        if (tagHelperInfo.TagMode == TagMode.SelfClosing || tagHelperInfo.TagMode == TagMode.StartTagOnly)
                         {
-                            continue;
+                            var tagHelperElement = SyntaxFactory.MarkupTagHelperElement(tagHelperStart, body: new SyntaxList<RazorSyntaxNode>(), endTag: null);
+                            var rewrittenTagHelper = tagHelperElement.WithTagHelperInfo(tagHelperInfo);
+                            if (node.Body.Count == 0)
+                            {
+                                return rewrittenTagHelper;
+                            }
+
+                            // This tag contains a body which needs to be moved to the parent.
+                            var rewrittenNodes = SyntaxListBuilder<RazorSyntaxNode>.Create();
+                            rewrittenNodes.Add(rewrittenTagHelper);
+                            var rewrittenBody = VisitList(node.Body);
+                            rewrittenNodes.AddRange(rewrittenBody);
+
+                            return SyntaxFactory.MarkupElement(startTag: null, body: rewrittenNodes.ToList(), endTag: null);
+                        }
+                        else if (node.EndTag == null)
+                        {
+                            // Start tag helper with no corresponding end tag.
+                            _errorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_TagHelperFoundMalformedTagHelper(
+                                    new SourceSpan(SourceLocationTracker.Advance(startTag.GetSourceLocation(_source), "<"), tagName.Length),
+                                    tagName));
                         }
                         else
                         {
-                            // Non-TagHelper tag.
-                            ValidateParentAllowsPlainTag(childBlock, errorSink);
-
-                            TrackTagBlock(childBlock, depth);
+                            // Tag helper start tag. Keep track.
+                            var tracker = new TagHelperTracker(_tagHelperPrefix, tagHelperInfo);
+                            _trackerStack.Push(tracker);
                         }
-
-                        // If we get to here it means that we're a normal html tag.  No need to iterate any deeper into
-                        // the children of it because they wont be tag helpers.
                     }
                     else
                     {
-                        // We're not an Html tag so iterate through children recursively.
-                        RewriteTags(childBlock, errorSink, depth + 1);
-                        continue;
+                        // Non-TagHelper tag.
+                        ValidateParentAllowsPlainTag(startTag);
+
+                        if (!startTag.IsSelfClosing() && !startTag.IsVoidElement())
+                        {
+                            var tracker = new TagTracker(tagName, isTagHelper: false);
+                            _trackerStack.Push(tracker);
+                        }
                     }
                 }
-                else
+
+                // Visit body between start and end tags.
+                var body = VisitList(node.Body);
+
+                // Visit end tag.
+                var endTag = (MarkupTagBlockSyntax)Visit(node.EndTag);
+                if (endTag != null)
                 {
-                    ValidateParentAllowsContent((Span)child, errorSink);
+                    var tagName = endTag.GetTagName();
+                    if (TryRewriteTagHelperEnd(endTag, out tagHelperEnd))
+                    {
+                        // This is a tag helper
+                        if (startTag == null)
+                        {
+                            // The end tag helper has no corresponding start tag, create an error.
+                            _errorSink.OnError(
+                                RazorDiagnosticFactory.CreateParsing_TagHelperFoundMalformedTagHelper(
+                                    new SourceSpan(SourceLocationTracker.Advance(endTag.GetSourceLocation(_source), "</"), tagName.Length), tagName));
+                        }
+                    }
+                    else
+                    {
+                        // Non tag helper end tag.
+                        if (startTag == null)
+                        {
+                            // Standalone end tag. We may need to error if it is not supposed to be here.
+                            // If there was a corresponding start tag, we would have already added this error.
+                            ValidateParentAllowsPlainTag(endTag);
+                        }
+                        else if (!endTag.IsVoidElement())
+                        {
+                            // Since a start tag exists, we must already be tracking it.
+                            // Pop the stack as we're done with the end tag.
+                            _trackerStack.Pop();
+                        }
+                    }
                 }
 
-                // At this point the child is a Span or Block with Type BlockType.Tag that doesn't happen to be a
-                // tag helper.
-
-                // Add the child to current block.
-                _currentBlock.Children.Add(child);
-            }
-
-            // We captured the number of active tag helpers at the start of our logic, it should be the same. If not
-            // it means that there are malformed tag helpers at the top of our stack.
-            if (activeTrackers != _trackerStack.Count)
-            {
-                // Malformed tag helpers built here will be tag helpers that do not have end tags in the current block
-                // scope. Block scopes are special cases in Razor such as @<p> would cause an error because there's no
-                // matching end </p> tag in the template block scope and therefore doesn't make sense as a tag helper.
-                BuildMalformedTagHelpers(_trackerStack.Count - activeTrackers, errorSink);
-            }
-
-            BuildCurrentlyTrackedBlock();
-        }
-
-        private void TrackTagBlock(Block childBlock, int depth)
-        {
-            var tagName = GetTagName(childBlock);
-
-            // Don't want to track incomplete tags that have no tag name.
-            if (string.IsNullOrWhiteSpace(tagName))
-            {
-                return;
-            }
-
-            if (IsEndTag(childBlock))
-            {
-                var parentTracker = _trackerStack.Count > 0 ? _trackerStack.Peek() : null;
-                if (parentTracker != null &&
-                    !parentTracker.IsTagHelper &&
-                    depth == parentTracker.Depth &&
-                    string.Equals(parentTracker.TagName, tagName, StringComparison.OrdinalIgnoreCase))
+                if (tagHelperInfo != null)
                 {
-                    PopTrackerStack();
+                    // If we get here it means this element was rewritten as a tag helper.
+                    var tagHelperElement = SyntaxFactory.MarkupTagHelperElement(tagHelperStart, body, tagHelperEnd);
+                    return tagHelperElement.WithTagHelperInfo(tagHelperInfo);
                 }
-            }
-            else if (!VoidElements.Contains(tagName) && !IsSelfClosing(childBlock))
-            {
-                // If it's not a void element and it's not self-closing then we need to create a tag
-                // tracker for it.
-                var tracker = new TagBlockTracker(tagName, isTagHelper: false, depth: depth);
-                PushTrackerStack(tracker);
-            }
-        }
 
-        private bool TryRewriteTagHelper(Block tagBlock, ErrorSink errorSink)
-        {
-            // Get tag name of the current block (doesn't matter if it's an end or start tag)
-            var tagName = GetTagName(tagBlock);
-
-            // Could not determine tag name, it can't be a TagHelper, continue on and track the element.
-            if (tagName == null)
-            {
-                return false;
+                // There was no matching tag helper for this element. Return.
+                return node.Update(startTag, body, endTag);
             }
 
-            TagHelperBinding tagHelperBinding;
-
-            if (!IsPotentialTagHelper(tagName, tagBlock))
+            public override SyntaxNode VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
             {
-                return false;
+                var tagParent = node.FirstAncestorOrSelf<SyntaxNode>(n => n is MarkupTagBlockSyntax);
+                var isPartofTagBlock = tagParent != null;
+                if (!isPartofTagBlock)
+                {
+                    ValidateParentAllowsContent(node);
+                }
+
+                return base.VisitMarkupTextLiteral(node);
             }
 
-            var tracker = _currentTagHelperTracker;
-            var tagNameScope = tracker?.TagName ?? string.Empty;
-
-            if (!IsEndTag(tagBlock))
+            private bool TryRewriteTagHelperStart(MarkupTagBlockSyntax tagBlock, out MarkupTagHelperStartTagSyntax rewritten, out TagHelperInfo tagHelperInfo)
             {
+                rewritten = null;
+                tagHelperInfo = null;
+
+                // Get tag name of the current block
+                var tagName = tagBlock.GetTagName();
+
+                // Could not determine tag name, it can't be a TagHelper, continue on and track the element.
+                if (tagName == null)
+                {
+                    return false;
+                }
+
+                TagHelperBinding tagHelperBinding;
+
+                if (!IsPotentialTagHelper(tagName, tagBlock))
+                {
+                    return false;
+                }
+
+                var tracker = CurrentTagHelperTracker;
+                var tagNameScope = tracker?.TagName ?? string.Empty;
+
                 // We're now in a start tag block, we first need to see if the tag block is a tag helper.
                 var elementAttributes = GetAttributeNameValuePairs(tagBlock);
 
@@ -219,36 +264,45 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     return false;
                 }
 
-                ValidateParentAllowsTagHelper(tagName, tagBlock, errorSink);
-                ValidateBinding(tagHelperBinding, tagName, tagBlock, errorSink);
+                ValidateParentAllowsTagHelper(tagName, tagBlock);
+                ValidateBinding(tagHelperBinding, tagName, tagBlock);
 
                 // We're in a start TagHelper block.
-                var validTagStructure = ValidateTagSyntax(tagName, tagBlock, errorSink);
+                var validTagStructure = ValidateTagSyntax(tagName, tagBlock);
 
-                var builder = TagHelperBlockRewriter.Rewrite(
+                var startTag = TagHelperBlockRewriter.Rewrite(
                     tagName,
                     validTagStructure,
                     _featureFlags,
                     tagBlock,
                     tagHelperBinding,
-                    errorSink);
+                    _errorSink,
+                    _source);
 
-                // Track the original start tag so the editor knows where each piece of the TagHelperBlock lies
-                // for formatting.
-                builder.SourceStartTag = tagBlock;
+                var tagMode = TagHelperBlockRewriter.GetTagMode(tagBlock, tagHelperBinding, _errorSink);
+                tagHelperInfo = new TagHelperInfo(tagName, tagMode, tagHelperBinding);
+                rewritten = startTag;
 
-                // Found a new tag helper block
-                TrackTagHelperBlock(builder);
-
-                // If it's a non-content expecting block then we don't have to worry about nested children within the
-                // tag. Complete it.
-                if (builder.TagMode == TagMode.SelfClosing || builder.TagMode == TagMode.StartTagOnly)
-                {
-                    BuildCurrentlyTrackedTagHelperBlock(endTag: null);
-                }
+                return true;
             }
-            else
+
+            private bool TryRewriteTagHelperEnd(MarkupTagBlockSyntax tagBlock, out MarkupTagHelperEndTagSyntax rewritten)
             {
+                rewritten = null;
+                var tagName = tagBlock.GetTagName();
+                // Could not determine tag name, it can't be a TagHelper, continue on and track the element.
+                if (tagName == null)
+                {
+                    return false;
+                }
+
+                var tracker = CurrentTagHelperTracker;
+                var tagNameScope = tracker?.TagName ?? string.Empty;
+                if (!IsPotentialTagHelper(tagName, tagBlock))
+                {
+                    return false;
+                }
+
                 // Validate that our end tag matches the currently scoped tag, if not we may need to error.
                 if (tagNameScope.Equals(tagName, StringComparison.OrdinalIgnoreCase))
                 {
@@ -261,13 +315,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         return false;
                     }
 
-                    ValidateTagSyntax(tagName, tagBlock, errorSink);
+                    ValidateTagSyntax(tagName, tagBlock);
 
-                    BuildCurrentlyTrackedTagHelperBlock(tagBlock);
+                    _trackerStack.Pop();
                 }
                 else
                 {
-                    tagHelperBinding = _tagHelperBinder.GetBinding(
+                    var tagHelperBinding = _tagHelperBinder.GetBinding(
                         tagName,
                         attributes: Array.Empty<KeyValuePair<string, string>>(),
                         parentTagName: CurrentParentTagName,
@@ -288,9 +342,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                         if (invalidRule != null)
                         {
                             // End tag TagHelper that states it shouldn't have an end tag.
-                            errorSink.OnError(
+                            _errorSink.OnError(
                                 RazorDiagnosticFactory.CreateParsing_TagHelperMustNotHaveAnEndTag(
-                                    new SourceSpan(SourceLocationTracker.Advance(tagBlock.Start, "</"), tagName.Length),
+                                    new SourceSpan(SourceLocationTracker.Advance(tagBlock.GetSourceLocation(_source), "</"), tagName.Length),
                                     tagName,
                                     descriptor.DisplayName,
                                     invalidRule.TagStructure));
@@ -298,626 +352,376 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                             return false;
                         }
                     }
-
-                    // Current tag helper scope does not match the end tag. Attempt to recover the tag
-                    // helper by looking up the previous tag helper scopes for a matching tag. If we
-                    // can't recover it means there was no corresponding tag helper start tag.
-                    if (TryRecoverTagHelper(tagName, tagBlock, errorSink))
-                    {
-                        ValidateParentAllowsTagHelper(tagName, tagBlock, errorSink);
-                        ValidateTagSyntax(tagName, tagBlock, errorSink);
-
-                        // Successfully recovered, move onto the next element.
-                    }
-                    else
-                    {
-                        // Could not recover, the end tag helper has no corresponding start tag, create
-                        // an error based on the current childBlock.
-                        errorSink.OnError(
-                            RazorDiagnosticFactory.CreateParsing_TagHelperFoundMalformedTagHelper(
-                                new SourceSpan(SourceLocationTracker.Advance(tagBlock.Start, "</"), tagName.Length), tagName));
-
-                        return false;
-                    }
                 }
+
+                rewritten = SyntaxFactory.MarkupTagHelperEndTag(tagBlock.Children);
+
+                return true;
             }
 
-            return true;
-        }
-
-        // Internal for testing
-        internal IReadOnlyList<KeyValuePair<string, string>> GetAttributeNameValuePairs(Block tagBlock)
-        {
-            // Need to calculate how many children we should take that represent the attributes.
-            var childrenOffset = IsPartialTag(tagBlock) ? 0 : 1;
-            var childCount = tagBlock.Children.Count - childrenOffset;
-
-            if (childCount <= 1)
+            // Internal for testing
+            internal IReadOnlyList<KeyValuePair<string, string>> GetAttributeNameValuePairs(MarkupTagBlockSyntax tagBlock)
             {
-                return Array.Empty<KeyValuePair<string, string>>();
-            }
+                // Need to calculate how many children we should take that represent the attributes.
+                var childrenOffset = IsPartialTag(tagBlock) ? 0 : 1;
+                var childCount = tagBlock.Children.Count - childrenOffset;
 
-            _htmlAttributeTracker.Clear();
-
-            var attributes = _htmlAttributeTracker;
-
-            for (var i = 1; i < childCount; i++)
-            {
-                var child = tagBlock.Children[i];
-                Span childSpan;
-
-                if (child.IsBlock)
+                if (childCount <= 1)
                 {
-                    var childBlock = (Block)child;
+                    return Array.Empty<KeyValuePair<string, string>>();
+                }
 
-                    if (childBlock.Type != BlockKindInternal.Markup)
+                _htmlAttributeTracker.Clear();
+
+                var attributes = _htmlAttributeTracker;
+
+                for (var i = 1; i < childCount; i++)
+                {
+                    if (tagBlock.Children[i] is CSharpCodeBlockSyntax)
                     {
-                        // Anything other than markup blocks in the attribute area of tags mangles following attributes.
+                        // Code blocks in the attribute area of tags mangles following attributes.
                         // It's also not supported by TagHelpers, bail early to avoid creating bad attribute value pairs.
                         break;
                     }
 
-                    childSpan = childBlock.FindFirstDescendentSpan();
+                    if (tagBlock.Children[i] is MarkupMinimizedAttributeBlockSyntax minimizedAttributeBlock)
+                    {
+                        if (minimizedAttributeBlock.Name == null)
+                        {
+                            _attributeValueBuilder.Append(InvalidAttributeValueMarker);
+                            continue;
+                        }
 
-                    if (childSpan == null)
+                        var minimizedAttribute = new KeyValuePair<string, string>(minimizedAttributeBlock.Name.GetContent(), string.Empty);
+                        attributes.Add(minimizedAttribute);
+                        continue;
+                    }
+
+                    if (!(tagBlock.Children[i] is MarkupAttributeBlockSyntax attributeBlock))
+                    {
+                        // If the parser thought these aren't attributes, we don't care about them. Move on.
+                        continue;
+                    }
+
+                    if (attributeBlock.Name == null)
                     {
                         _attributeValueBuilder.Append(InvalidAttributeValueMarker);
                         continue;
                     }
 
-                    // We can assume the first span will always contain attributename=" and the last span will always
-                    // contain the final quote. Therefore, if the values not quoted there's no ending quote to skip.
-                    var childOffset = 0;
-                    if (childSpan.Tokens.Count > 0)
+                    if (attributeBlock.Value != null)
                     {
-                        var potentialQuote = childSpan.Tokens[childSpan.Tokens.Count - 1] as HtmlToken;
-                        if (potentialQuote != null &&
-                            (potentialQuote.Type == HtmlTokenType.DoubleQuote ||
-                            potentialQuote.Type == HtmlTokenType.SingleQuote))
+                        for (var j = 0; j < attributeBlock.Value.Children.Count; j++)
                         {
-                            childOffset = 1;
-                        }
-                    }
-
-                    for (var j = 1; j < childBlock.Children.Count - childOffset; j++)
-                    {
-                        var valueChild = childBlock.Children[j];
-                        if (valueChild.IsBlock)
-                        {
-                            _attributeValueBuilder.Append(InvalidAttributeValueMarker);
-                        }
-                        else
-                        {
-                            var valueChildSpan = (Span)valueChild;
-                            for (var k = 0; k < valueChildSpan.Tokens.Count; k++)
+                            var child = attributeBlock.Value.Children[j];
+                            if (child is MarkupLiteralAttributeValueSyntax literalValue)
                             {
-                                _attributeValueBuilder.Append(valueChildSpan.Tokens[k].Content);
+                                _attributeValueBuilder.Append(literalValue.GetContent());
+                            }
+                            else
+                            {
+                                _attributeValueBuilder.Append(InvalidAttributeValueMarker);
                             }
                         }
                     }
+
+                    var attributeName = attributeBlock.Name.GetContent();
+                    var attributeValue = _attributeValueBuilder.ToString();
+                    var attribute = new KeyValuePair<string, string>(attributeName, attributeValue);
+                    attributes.Add(attribute);
+
+                    _attributeValueBuilder.Clear();
                 }
-                else
+
+                return attributes;
+            }
+
+            private void ValidateParentAllowsTagHelper(string tagName, MarkupTagBlockSyntax tagBlock)
+            {
+                if (HasAllowedChildren() &&
+                    !CurrentTagHelperTracker.PrefixedAllowedChildren.Contains(tagName, StringComparer.OrdinalIgnoreCase))
                 {
-                    childSpan = (Span)child;
+                    OnAllowedChildrenTagError(CurrentTagHelperTracker, tagName, tagBlock, _errorSink, _source);
+                }
+            }
 
-                    var afterEquals = false;
-                    var atValue = false;
-                    var endValueMarker = childSpan.Tokens.Count;
-
-                    // Entire attribute is a string
-                    for (var j = 0; j < endValueMarker; j++)
+            private void ValidateBinding(
+                TagHelperBinding bindingResult,
+                string tagName,
+                MarkupTagBlockSyntax tagBlock)
+            {
+                // Ensure that all descriptors associated with this tag have appropriate TagStructures. Cannot have
+                // multiple descriptors that expect different TagStructures (other than TagStructure.Unspecified).
+                TagHelperDescriptor baseDescriptor = null;
+                TagStructure? baseStructure = null;
+                foreach (var descriptor in bindingResult.Descriptors)
+                {
+                    var boundRules = bindingResult.GetBoundRules(descriptor);
+                    foreach (var rule in boundRules)
                     {
-                        var htmlToken = (HtmlToken)childSpan.Tokens[j];
-
-                        if (!afterEquals)
+                        if (rule.TagStructure != TagStructure.Unspecified)
                         {
-                            afterEquals = htmlToken.Type == HtmlTokenType.Equals;
-                            continue;
-                        }
-
-                        if (!atValue)
-                        {
-                            atValue = htmlToken.Type != HtmlTokenType.WhiteSpace &&
-                                htmlToken.Type != HtmlTokenType.NewLine;
-
-                            if (atValue)
+                            // Can't have a set of TagHelpers that expect different structures.
+                            if (baseStructure.HasValue && baseStructure != rule.TagStructure)
                             {
-                                if (htmlToken.Type == HtmlTokenType.DoubleQuote ||
-                                    htmlToken.Type == HtmlTokenType.SingleQuote)
-                                {
-                                    endValueMarker--;
-                                }
-                                else
-                                {
-                                    // Current token is considered the value (unquoted). Add its content to the
-                                    // attribute value builder before we move past it.
-                                    _attributeValueBuilder.Append(htmlToken.Content);
-                                }
+                                _errorSink.OnError(
+                                    RazorDiagnosticFactory.CreateTagHelper_InconsistentTagStructure(
+                                        new SourceSpan(tagBlock.GetSourceLocation(_source), tagBlock.FullWidth),
+                                        baseDescriptor.DisplayName,
+                                        descriptor.DisplayName,
+                                        tagName));
                             }
 
-                            continue;
+                            baseDescriptor = descriptor;
+                            baseStructure = rule.TagStructure;
                         }
-
-                        _attributeValueBuilder.Append(htmlToken.Content);
-                    }
-                }
-
-                var start = 0;
-                for (; start < childSpan.Content.Length; start++)
-                {
-                    if (!char.IsWhiteSpace(childSpan.Content[start]))
-                    {
-                        break;
-                    }
-                }
-
-                var end = start;
-                for (; end < childSpan.Content.Length; end++)
-                {
-                    if (childSpan.Content[end] == '=')
-                    {
-                        break;
-                    }
-                }
-
-                var attributeName = childSpan.Content.Substring(start, end - start);
-                var attributeValue = _attributeValueBuilder.ToString();
-                var attribute = new KeyValuePair<string, string>(attributeName, attributeValue);
-                attributes.Add(attribute);
-
-                _attributeValueBuilder.Clear();
-            }
-
-            return attributes;
-        }
-
-        private bool HasAllowedChildren()
-        {
-            var currentTracker = _trackerStack.Count > 0 ? _trackerStack.Peek() : null;
-
-            // If the current tracker is not a TagHelper then there's no AllowedChildren to enforce.
-            if (currentTracker == null || !currentTracker.IsTagHelper)
-            {
-                return false;
-            }
-
-            return _currentTagHelperTracker.AllowedChildren != null && _currentTagHelperTracker.AllowedChildren.Count > 0;
-        }
-
-        private void ValidateParentAllowsContent(Span child, ErrorSink errorSink)
-        {
-            if (HasAllowedChildren())
-            {
-                var isDisallowedContent = true;
-                if (_featureFlags.AllowHtmlCommentsInTagHelpers)
-                {
-                    isDisallowedContent = !IsComment(child) && child.Kind != SpanKindInternal.Transition && child.Kind != SpanKindInternal.Code;
-                }
-
-                if (isDisallowedContent)
-                {
-                    var content = child.Content;
-                    if (!string.IsNullOrWhiteSpace(content))
-                    {
-                        var trimmedStart = content.TrimStart();
-                        var whitespace = content.Substring(0, content.Length - trimmedStart.Length);
-                        var errorStart = SourceLocationTracker.Advance(child.Start, whitespace);
-                        var length = trimmedStart.TrimEnd().Length;
-                        var allowedChildren = _currentTagHelperTracker.AllowedChildren;
-                        var allowedChildrenString = string.Join(", ", allowedChildren);
-                        errorSink.OnError(
-                            RazorDiagnosticFactory.CreateTagHelper_CannotHaveNonTagContent(
-                                new SourceSpan(errorStart, length),
-                                _currentTagHelperTracker.TagName,
-                                allowedChildrenString));
                     }
                 }
             }
-        }
 
-        private void ValidateParentAllowsPlainTag(Block tagBlock, ErrorSink errorSink)
-        {
-            var tagName = GetTagName(tagBlock);
-
-            // Treat partial tags such as '</' which have no tag names as content.
-            if (string.IsNullOrEmpty(tagName))
+            private bool ValidateTagSyntax(string tagName, MarkupTagBlockSyntax tag)
             {
-                Debug.Assert(tagBlock.Children.First() is Span);
-
-                ValidateParentAllowsContent((Span)tagBlock.Children.First(), errorSink);
-                return;
-            }
-
-            if (!HasAllowedChildren())
-            {
-                return;
-            }
-
-            var tagHelperBinding = _tagHelperBinder.GetBinding(
-                tagName,
-                attributes: Array.Empty<KeyValuePair<string, string>>(),
-                parentTagName: CurrentParentTagName,
-                parentIsTagHelper: CurrentParentIsTagHelper);
-
-            // If we found a binding for the current tag, then it is a tag helper. Use the prefixed allowed children to compare.
-            var allowedChildren = tagHelperBinding != null ? _currentTagHelperTracker.PrefixedAllowedChildren : _currentTagHelperTracker.AllowedChildren;
-            if (!allowedChildren.Contains(tagName, StringComparer.OrdinalIgnoreCase))
-            {
-                OnAllowedChildrenTagError(_currentTagHelperTracker, tagName, tagBlock, errorSink);
-            }
-        }
-
-        private void ValidateParentAllowsTagHelper(string tagName, Block tagBlock, ErrorSink errorSink)
-        {
-            if (HasAllowedChildren() &&
-                !_currentTagHelperTracker.PrefixedAllowedChildren.Contains(tagName, StringComparer.OrdinalIgnoreCase))
-            {
-                OnAllowedChildrenTagError(_currentTagHelperTracker, tagName, tagBlock, errorSink);
-            }
-        }
-
-        private static void OnAllowedChildrenTagError(
-            TagHelperBlockTracker tracker,
-            string tagName,
-            Block tagBlock,
-            ErrorSink errorSink)
-        {
-            var allowedChildrenString = string.Join(", ", tracker.AllowedChildren);
-            var errorStart = GetTagDeclarationErrorStart(tagBlock);
-
-            errorSink.OnError(
-                RazorDiagnosticFactory.CreateTagHelper_InvalidNestedTag(
-                    new SourceSpan(errorStart, tagName.Length),
-                    tagName,
-                    tracker.TagName,
-                    allowedChildrenString));
-        }
-
-        private static void ValidateBinding(
-            TagHelperBinding bindingResult,
-            string tagName,
-            Block tagBlock,
-            ErrorSink errorSink)
-        {
-            // Ensure that all descriptors associated with this tag have appropriate TagStructures. Cannot have
-            // multiple descriptors that expect different TagStructures (other than TagStructure.Unspecified).
-            TagHelperDescriptor baseDescriptor = null;
-            TagStructure? baseStructure = null;
-            foreach (var descriptor in bindingResult.Descriptors)
-            {
-                var boundRules = bindingResult.GetBoundRules(descriptor);
-                foreach (var rule in boundRules)
+                // We assume an invalid syntax until we verify that the tag meets all of our "valid syntax" criteria.
+                if (IsPartialTag(tag))
                 {
-                    if (rule.TagStructure != TagStructure.Unspecified)
-                    {
-                        // Can't have a set of TagHelpers that expect different structures.
-                        if (baseStructure.HasValue && baseStructure != rule.TagStructure)
-                        {
-                            errorSink.OnError(
-                                RazorDiagnosticFactory.CreateTagHelper_InconsistentTagStructure(
-                                    new SourceSpan(tagBlock.Start, tagBlock.Length),
-                                    baseDescriptor.DisplayName,
-                                    descriptor.DisplayName,
-                                    tagName));
-                        }
+                    var errorStart = GetTagDeclarationErrorStart(tag);
 
-                        baseDescriptor = descriptor;
-                        baseStructure = rule.TagStructure;
-                    }
-                }
-            }
-        }
+                    _errorSink.OnError(
+                        RazorDiagnosticFactory.CreateParsing_TagHelperMissingCloseAngle(
+                            new SourceSpan(errorStart, tagName.Length), tagName));
 
-        private static bool ValidateTagSyntax(string tagName, Block tag, ErrorSink errorSink)
-        {
-            // We assume an invalid syntax until we verify that the tag meets all of our "valid syntax" criteria.
-            if (IsPartialTag(tag))
-            {
-                var errorStart = GetTagDeclarationErrorStart(tag);
-
-                errorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_TagHelperMissingCloseAngle(
-                        new SourceSpan(errorStart, tagName.Length), tagName));
-
-                return false;
-            }
-
-            return true;
-        }
-
-        private static SourceLocation GetTagDeclarationErrorStart(Block tagBlock)
-        {
-            var advanceBy = IsEndTag(tagBlock) ? "</" : "<";
-
-            return SourceLocationTracker.Advance(tagBlock.Start, advanceBy);
-        }
-
-        private static bool IsPartialTag(Block tagBlock)
-        {
-            // No need to validate the tag end because in order to be a tag block it must start with '<'.
-            var tagEnd = tagBlock.Children[tagBlock.Children.Count - 1] as Span;
-
-            // If our tag end is not a markup span it means it's some sort of code SyntaxTreeNode (not a valid format)
-            if (tagEnd != null && tagEnd.Kind == SpanKindInternal.Markup)
-            {
-                var endToken = tagEnd.Tokens.Count > 0 ?
-                    tagEnd.Tokens[tagEnd.Tokens.Count - 1] as HtmlToken :
-                    null;
-
-                if (endToken != null && endToken.Type == HtmlTokenType.CloseAngle)
-                {
                     return false;
                 }
-            }
 
-            return true;
-        }
-
-        private void BuildCurrentlyTrackedBlock()
-        {
-            // Going to remove the current BlockBuilder from the stack because it's complete.
-            var currentBlock = _blockStack.Pop();
-
-            // If there are block stacks left it means we're not at the root.
-            if (_blockStack.Count > 0)
-            {
-                // Grab the next block in line so we can continue managing its children (it's not done).
-                var previousBlock = _blockStack.Peek();
-
-                // We've finished the currentBlock so build it and add it to its parent.
-                previousBlock.Children.Add(currentBlock.Build());
-
-                // Update the _currentBlock to point at the last tracked block because it's not complete.
-                _currentBlock = previousBlock;
-            }
-            else
-            {
-                _currentBlock = currentBlock;
-            }
-        }
-
-        private void BuildCurrentlyTrackedTagHelperBlock(Block endTag)
-        {
-            Debug.Assert(_trackerStack.Any(tracker => tracker.IsTagHelper));
-
-            // We need to pop all trackers until we reach our TagHelperBlock. We can throw away any non-TagHelper
-            // trackers because they don't need to be well-formed.
-            TagHelperBlockTracker tagHelperTracker;
-            do
-            {
-                tagHelperTracker = PopTrackerStack() as TagHelperBlockTracker;
-            }
-            while (tagHelperTracker == null);
-
-            // Track the original end tag so the editor knows where each piece of the TagHelperBlock lies
-            // for formatting.
-            tagHelperTracker.Builder.SourceEndTag = endTag;
-
-            _currentTagHelperTracker =
-                (TagHelperBlockTracker)_trackerStack.FirstOrDefault(tagBlockTracker => tagBlockTracker.IsTagHelper);
-
-            BuildCurrentlyTrackedBlock();
-        }
-
-        private bool IsPotentialTagHelper(string tagName, Block childBlock)
-        {
-            Debug.Assert(childBlock.Children.Count > 0);
-            var child = childBlock.Children[0];
-
-            var childSpan = (Span)child;
-
-            // text tags that are labeled as transitions should be ignored aka they're not tag helpers.
-            return !string.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase) ||
-                   childSpan.Kind != SpanKindInternal.Transition;
-        }
-
-        private void TrackBlock(BlockBuilder builder)
-        {
-            _currentBlock = builder;
-
-            _blockStack.Push(builder);
-        }
-
-        private void TrackTagHelperBlock(TagHelperBlockBuilder builder)
-        {
-            _currentTagHelperTracker = new TagHelperBlockTracker(_tagHelperPrefix, builder);
-            PushTrackerStack(_currentTagHelperTracker);
-
-            TrackBlock(builder);
-        }
-
-        private bool TryRecoverTagHelper(string tagName, Block endTag, ErrorSink errorSink)
-        {
-            var malformedTagHelperCount = 0;
-
-            foreach (var tracker in _trackerStack)
-            {
-                if (tracker.IsTagHelper && tracker.TagName.Equals(tagName, StringComparison.OrdinalIgnoreCase))
-                {
-                    break;
-                }
-
-                malformedTagHelperCount++;
-            }
-
-            // If the malformedTagHelperCount == _tagStack.Count it means we couldn't find a start tag for the tag
-            // helper, can't recover.
-            if (malformedTagHelperCount != _trackerStack.Count)
-            {
-                BuildMalformedTagHelpers(malformedTagHelperCount, errorSink);
-
-                // One final build, this is the build that completes our target tag helper block which is not malformed.
-                BuildCurrentlyTrackedTagHelperBlock(endTag);
-
-                // We were able to recover
                 return true;
             }
 
-            // Could not recover tag helper. Aka we found a tag helper end tag without a corresponding start tag.
-            return false;
-        }
-
-        private void BuildMalformedTagHelpers(int count, ErrorSink errorSink)
-        {
-            for (var i = 0; i < count; i++)
+            private bool IsPotentialTagHelper(string tagName, MarkupTagBlockSyntax childBlock)
             {
-                var tracker = _trackerStack.Peek();
+                Debug.Assert(childBlock.Children.Count > 0);
+                var child = childBlock.Children[0];
 
-                // Skip all non-TagHelper entries. Non TagHelper trackers do not need to represent well-formed HTML.
-                if (!tracker.IsTagHelper)
+                return !string.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase) ||
+                       child.Kind != SyntaxKind.MarkupTransition;
+            }
+
+            private SourceLocation GetTagDeclarationErrorStart(MarkupTagBlockSyntax tagBlock)
+            {
+                var advanceBy = IsEndTag(tagBlock) ? "</" : "<";
+
+                return SourceLocationTracker.Advance(tagBlock.GetSourceLocation(_source), advanceBy);
+            }
+
+            private static bool IsPartialTag(MarkupTagBlockSyntax tagBlock)
+            {
+                // No need to validate the tag end because in order to be a tag block it must start with '<'.
+                var tagEnd = tagBlock.Children[tagBlock.Children.Count - 1];
+
+                // If our tag end is not a markup span it means it's some sort of code SyntaxTreeNode (not a valid format)
+                if (tagEnd != null && tagEnd is MarkupTextLiteralSyntax tagEndLiteral)
                 {
-                    PopTrackerStack();
-                    continue;
-                }
+                    var endToken = tagEndLiteral.LiteralTokens.Count > 0 ?
+                        tagEndLiteral.LiteralTokens[tagEndLiteral.LiteralTokens.Count - 1] :
+                        null;
 
-                var malformedTagHelper = ((TagHelperBlockTracker)tracker).Builder;
-
-                errorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_TagHelperFoundMalformedTagHelper(
-                        new SourceSpan(SourceLocationTracker.Advance(malformedTagHelper.Start, "<"), malformedTagHelper.TagName.Length),
-                        malformedTagHelper.TagName));
-
-                BuildCurrentlyTrackedTagHelperBlock(endTag: null);
-            }
-        }
-
-        private static string GetTagName(Block tagBlock)
-        {
-            var child = tagBlock.Children[0];
-
-            if (tagBlock.Type != BlockKindInternal.Tag || tagBlock.Children.Count == 0 || !(child is Span))
-            {
-                return null;
-            }
-
-            var childSpan = (Span)child;
-            HtmlToken textToken = null;
-            for (var i = 0; i < childSpan.Tokens.Count; i++)
-            {
-                var token = childSpan.Tokens[i] as HtmlToken;
-
-                if (token != null &&
-                    (token.Type & (HtmlTokenType.WhiteSpace | HtmlTokenType.Text)) == token.Type)
-                {
-                    textToken = token;
-                    break;
-                }
-            }
-
-            if (textToken == null)
-            {
-                return null;
-            }
-
-            return textToken.Type == HtmlTokenType.WhiteSpace ? null : textToken.Content;
-        }
-
-        private static bool IsEndTag(Block tagBlock)
-        {
-            EnsureTagBlock(tagBlock);
-
-            var childSpan = (Span)tagBlock.Children.First();
-
-            // We grab the token that could be forward slash
-            var relevantToken = (HtmlToken)childSpan.Tokens[childSpan.Tokens.Count == 1 ? 0 : 1];
-
-            return relevantToken.Type == HtmlTokenType.ForwardSlash;
-        }
-
-        internal static bool IsComment(Span span)
-        {
-            Block currentBlock = span.Parent;
-            while (currentBlock != null && currentBlock.Type != BlockKindInternal.Comment && currentBlock.Type != BlockKindInternal.HtmlComment)
-            {
-                currentBlock = currentBlock.Parent;
-            }
-
-            return currentBlock != null;
-        }
-
-
-        private static void EnsureTagBlock(Block tagBlock)
-        {
-            Debug.Assert(tagBlock.Type == BlockKindInternal.Tag);
-            Debug.Assert(tagBlock.Children.First() is Span);
-        }
-
-        private static bool IsSelfClosing(Block childBlock)
-        {
-            var childSpan = childBlock.FindLastDescendentSpan();
-
-            return childSpan?.Content.EndsWith("/>", StringComparison.Ordinal) ?? false;
-        }
-
-        private void PushTrackerStack(TagBlockTracker tracker)
-        {
-            _trackerStack.Push(tracker);
-        }
-
-        private TagBlockTracker PopTrackerStack()
-        {
-            var poppedTracker = _trackerStack.Pop();
-
-            return poppedTracker;
-        }
-
-        private class TagBlockTracker
-        {
-            public TagBlockTracker(string tagName, bool isTagHelper, int depth)
-            {
-                TagName = tagName;
-                IsTagHelper = isTagHelper;
-                Depth = depth;
-            }
-
-            public string TagName { get; }
-
-            public bool IsTagHelper { get; }
-
-            public int Depth { get; }
-        }
-
-        private class TagHelperBlockTracker : TagBlockTracker
-        {
-            private IReadOnlyList<string> _prefixedAllowedChildren;
-            private readonly string _tagHelperPrefix;
-
-            public TagHelperBlockTracker(string tagHelperPrefix, TagHelperBlockBuilder builder)
-                : base(builder.TagName, isTagHelper: true, depth: 0)
-            {
-                _tagHelperPrefix = tagHelperPrefix;
-                Builder = builder;
-
-                if (Builder.BindingResult.Descriptors.Any(descriptor => descriptor.AllowedChildTags != null))
-                {
-                    AllowedChildren = Builder.BindingResult.Descriptors
-                        .Where(descriptor => descriptor.AllowedChildTags != null)
-                        .SelectMany(descriptor => descriptor.AllowedChildTags.Select(childTag => childTag.Name))
-                        .Distinct(StringComparer.OrdinalIgnoreCase)
-                        .ToList();
-                }
-            }
-
-            public TagHelperBlockBuilder Builder { get; }
-
-            public uint OpenMatchingTags { get; set; }
-
-            public IReadOnlyList<string> AllowedChildren { get; }
-
-            public IReadOnlyList<string> PrefixedAllowedChildren
-            {
-                get
-                {
-                    if (AllowedChildren != null && _prefixedAllowedChildren == null)
+                    if (endToken != null && endToken.Kind == SyntaxKind.CloseAngle)
                     {
-                        Debug.Assert(Builder.BindingResult.Descriptors.Count() >= 1);
+                        return false;
+                    }
+                }
 
-                        _prefixedAllowedChildren = AllowedChildren.Select(allowedChild => _tagHelperPrefix + allowedChild).ToList();
+                return true;
+            }
+
+            private void ValidateParentAllowsContent(SyntaxNode child)
+            {
+                if (HasAllowedChildren())
+                {
+                    var isDisallowedContent = true;
+                    if (_featureFlags.AllowHtmlCommentsInTagHelpers)
+                    {
+                        isDisallowedContent = !IsComment(child) &&
+                            !child.IsTransitionSpanKind() &&
+                            !child.IsCodeSpanKind();
                     }
 
-                    return _prefixedAllowedChildren;
+                    if (isDisallowedContent)
+                    {
+                        var content = child.GetContent();
+                        if (!string.IsNullOrWhiteSpace(content))
+                        {
+                            var trimmedStart = content.TrimStart();
+                            var whitespace = content.Substring(0, content.Length - trimmedStart.Length);
+                            var errorStart = SourceLocationTracker.Advance(child.GetSourceLocation(_source), whitespace);
+                            var length = trimmedStart.TrimEnd().Length;
+                            var allowedChildren = CurrentTagHelperTracker.AllowedChildren;
+                            var allowedChildrenString = string.Join(", ", allowedChildren);
+                            _errorSink.OnError(
+                                RazorDiagnosticFactory.CreateTagHelper_CannotHaveNonTagContent(
+                                    new SourceSpan(errorStart, length),
+                                    CurrentTagHelperTracker.TagName,
+                                    allowedChildrenString));
+                        }
+                    }
+                }
+            }
+
+            private void ValidateParentAllowsPlainTag(MarkupTagBlockSyntax tagBlock)
+            {
+                var tagName = tagBlock.GetTagName();
+
+                // Treat partial tags such as '</' which have no tag names as content.
+                if (string.IsNullOrEmpty(tagName))
+                {
+                    var firstChild = tagBlock.Children.First();
+                    Debug.Assert(firstChild is MarkupTextLiteralSyntax || firstChild is MarkupTransitionSyntax);
+
+                    ValidateParentAllowsContent(tagBlock.Children.First());
+                    return;
+                }
+
+                if (!HasAllowedChildren())
+                {
+                    return;
+                }
+
+                var tagHelperBinding = _tagHelperBinder.GetBinding(
+                    tagName,
+                    attributes: Array.Empty<KeyValuePair<string, string>>(),
+                    parentTagName: CurrentParentTagName,
+                    parentIsTagHelper: CurrentParentIsTagHelper);
+
+                // If we found a binding for the current tag, then it is a tag helper. Use the prefixed allowed children to compare.
+                var allowedChildren = tagHelperBinding != null ? CurrentTagHelperTracker.PrefixedAllowedChildren : CurrentTagHelperTracker.AllowedChildren;
+                if (!allowedChildren.Contains(tagName, StringComparer.OrdinalIgnoreCase))
+                {
+                    OnAllowedChildrenTagError(CurrentTagHelperTracker, tagName, tagBlock, _errorSink, _source);
+                }
+            }
+
+            private bool HasAllowedChildren()
+            {
+                // TODO: Questionable logic. Need to revisit
+                var currentTracker = _trackerStack.Count > 0 ? _trackerStack.Peek() : null;
+
+                // If the current tracker is not a TagHelper then there's no AllowedChildren to enforce.
+                if (currentTracker == null || !currentTracker.IsTagHelper)
+                {
+                    return false;
+                }
+
+                return CurrentTagHelperTracker.AllowedChildren != null && CurrentTagHelperTracker.AllowedChildren.Count > 0;
+            }
+
+            private bool IsPartOfStartTag(SyntaxNode node)
+            {
+                // Check if an ancestor is a start tag of a MarkupElement.
+                var parent = node.FirstAncestorOrSelf<SyntaxNode>(n =>
+                {
+                    return n.Parent is MarkupElementSyntax element && element.StartTag == n;
+                });
+
+                return parent != null;
+            }
+
+            internal static bool IsComment(SyntaxNode node)
+            {
+                var commentParent = node.FirstAncestorOrSelf<SyntaxNode>(
+                    n => n is RazorCommentBlockSyntax || n is MarkupCommentBlockSyntax);
+
+                return commentParent != null;
+            }
+
+            private static void OnAllowedChildrenTagError(
+                TagHelperTracker tracker,
+                string tagName,
+                MarkupTagBlockSyntax tagBlock,
+                ErrorSink errorSink,
+                RazorSourceDocument source)
+            {
+                var allowedChildrenString = string.Join(", ", tracker.AllowedChildren);
+                var errorStart = GetTagDeclarationErrorStart(tagBlock, source);
+
+                errorSink.OnError(
+                    RazorDiagnosticFactory.CreateTagHelper_InvalidNestedTag(
+                        new SourceSpan(errorStart, tagName.Length),
+                        tagName,
+                        tracker.TagName,
+                        allowedChildrenString));
+            }
+
+            private static SourceLocation GetTagDeclarationErrorStart(MarkupTagBlockSyntax tagBlock, RazorSourceDocument source)
+            {
+                var advanceBy = IsEndTag(tagBlock) ? "</" : "<";
+
+                return SourceLocationTracker.Advance(tagBlock.GetSourceLocation(source), advanceBy);
+            }
+
+            private static bool IsEndTag(MarkupTagBlockSyntax tagBlock)
+            {
+                var childSpan = (MarkupTextLiteralSyntax)tagBlock.Children.First();
+
+                // We grab the token that could be forward slash
+                var relevantToken = childSpan.LiteralTokens[childSpan.LiteralTokens.Count == 1 ? 0 : 1];
+
+                return relevantToken.Kind == SyntaxKind.ForwardSlash;
+            }
+
+            private class TagTracker
+            {
+                public TagTracker(string tagName, bool isTagHelper)
+                {
+                    TagName = tagName;
+                    IsTagHelper = isTagHelper;
+                }
+
+                public string TagName { get; }
+
+                public bool IsTagHelper { get; }
+            }
+
+            private class TagHelperTracker : TagTracker
+            {
+                private IReadOnlyList<string> _prefixedAllowedChildren;
+                private readonly string _tagHelperPrefix;
+
+                public TagHelperTracker(string tagHelperPrefix, TagHelperInfo info)
+                    : base(info.TagName, isTagHelper: true)
+                {
+                    _tagHelperPrefix = tagHelperPrefix;
+                    Info = info;
+
+                    if (Info.BindingResult.Descriptors.Any(descriptor => descriptor.AllowedChildTags != null))
+                    {
+                        AllowedChildren = Info.BindingResult.Descriptors
+                            .Where(descriptor => descriptor.AllowedChildTags != null)
+                            .SelectMany(descriptor => descriptor.AllowedChildTags.Select(childTag => childTag.Name))
+                            .Distinct(StringComparer.OrdinalIgnoreCase)
+                            .ToList();
+                    }
+                }
+
+                public TagHelperInfo Info { get; }
+
+                public uint OpenMatchingTags { get; set; }
+
+                public IReadOnlyList<string> AllowedChildren { get; }
+
+                public IReadOnlyList<string> PrefixedAllowedChildren
+                {
+                    get
+                    {
+                        if (AllowedChildren != null && _prefixedAllowedChildren == null)
+                        {
+                            Debug.Assert(Info.BindingResult.Descriptors.Count() >= 1);
+
+                            _prefixedAllowedChildren = AllowedChildren.Select(allowedChild => _tagHelperPrefix + allowedChild).ToList();
+                        }
+
+                        return _prefixedAllowedChildren;
+                    }
                 }
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperPrefixDirectiveChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperPrefixDirectiveChunkGenerator.cs
index f559ed585c..094ec2e9c9 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperPrefixDirectiveChunkGenerator.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperPrefixDirectiveChunkGenerator.cs
@@ -24,11 +24,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public List<RazorDiagnostic> Diagnostics { get; }
 
-        public override void Accept(ParserVisitor visitor, Span span)
-        {
-            visitor.VisitTagHelperPrefixDirectiveSpan(this, span);
-        }
-
         /// <inheritdoc />
         public override bool Equals(object obj)
         {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TemplateBlockChunkGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TemplateBlockChunkGenerator.cs
deleted file mode 100644
index 02940c1c31..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TemplateBlockChunkGenerator.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// 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.
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class TemplateBlockChunkGenerator : ParentChunkGenerator
-    {
-        public override void Accept(ParserVisitor visitor, Block block)
-        {
-            visitor.VisitTemplateBlock(this, block);
-        }
-
-        public override void GenerateStartParentChunk(Block target, ChunkGeneratorContext context)
-        {
-            //context.ChunkTreeBuilder.StartParentChunk<TemplateChunk>(target);
-        }
-
-        public override void GenerateEndParentChunk(Block target, ChunkGeneratorContext context)
-        {
-            //context.ChunkTreeBuilder.EndParentChunk();
-        }
-
-        public override string ToString()
-        {
-            return "Template";
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenBase.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenBase.cs
deleted file mode 100644
index 562a41f5bc..0000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenBase.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// 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;
-using System.Collections.Generic;
-using System.Globalization;
-using Microsoft.Extensions.Internal;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal abstract class TokenBase<TType> : IToken where TType : struct
-    {
-        protected TokenBase(
-            string content,
-            TType type,
-            IReadOnlyList<RazorDiagnostic> errors)
-        {
-            if (content == null)
-            {
-                throw new ArgumentNullException(nameof(content));
-            }
-
-            Content = content;
-            Type = type;
-            Errors = errors;
-        }
-
-        public Span Parent { get; set; }
-
-        public IReadOnlyList<RazorDiagnostic> Errors { get; }
-
-        public string Content { get; }
-
-        public TType Type { get; }
-
-        public SourceLocation Start
-        {
-            get
-            {
-                if (Parent == null)
-                {
-                    return SourceLocation.Undefined;
-                }
-
-                var tracker = new SourceLocationTracker(Parent.Start);
-                for (var i = 0; i < Parent.Tokens.Count; i++)
-                {
-                    var token = Parent.Tokens[i];
-                    if (object.ReferenceEquals(this, token))
-                    {
-                        break;
-                    }
-
-                    tracker.UpdateLocation(token.Content);
-                }
-
-                return tracker.CurrentLocation;
-            }
-        }
-
-        public override bool Equals(object obj)
-        {
-            var other = obj as TokenBase<TType>;
-            return other != null &&
-                string.Equals(Content, other.Content, StringComparison.Ordinal) &&
-                Type.Equals(other.Type);
-        }
-
-        public override int GetHashCode()
-        {
-            // Hash code should include only immutable properties.
-            var hash = HashCodeCombiner.Start();
-            hash.Add(Content, StringComparer.Ordinal);
-            hash.Add(Type);
-
-            return hash;
-        }
-
-        public override string ToString()
-        {
-            return string.Format(CultureInfo.InvariantCulture, "{0} [{1}]", Type, Content);
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/Tokenizer.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/Tokenizer.cs
index af77d2ddc6..09ad7eb1b6 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/Tokenizer.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/Tokenizer.cs
@@ -5,12 +5,11 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
-    internal abstract partial class Tokenizer<TToken, TTokenType> : ITokenizer
-        where TTokenType : struct
-        where TToken : TokenBase<TTokenType>
+    internal abstract class Tokenizer : ITokenizer
     {
         protected Tokenizer(ITextDocument source)
         {
@@ -31,7 +30,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         protected int? CurrentState { get; set; }
 
-        protected TToken CurrentToken { get; private set; }
+        protected SyntaxToken CurrenSyntaxToken { get; private set; }
 
         public ITextDocument Source { get; private set; }
 
@@ -42,9 +41,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             get { return Source.Peek() == -1; }
         }
 
-        public abstract TTokenType RazorCommentStarType { get; }
-        public abstract TTokenType RazorCommentType { get; }
-        public abstract TTokenType RazorCommentTransitionType { get; }
+        public abstract SyntaxKind RazorCommentStarKind { get; }
+        public abstract SyntaxKind RazorCommentKind { get; }
+        public abstract SyntaxKind RazorCommentTransitionKind { get; }
 
         protected bool HaveContent
         {
@@ -64,16 +63,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public SourceLocation CurrentStart { get; private set; }
 
-        protected abstract TToken CreateToken(string content, TTokenType type, IReadOnlyList<RazorDiagnostic> errors);
+        protected abstract SyntaxToken CreateToken(string content, SyntaxKind type, IReadOnlyList<RazorDiagnostic> errors);
 
         protected abstract StateResult Dispatch();
 
-        IToken ITokenizer.NextToken()
+        SyntaxToken ITokenizer.NextToken()
         {
             return NextToken();
         }
 
-        public virtual TToken NextToken()
+        public virtual SyntaxToken NextToken()
         {
             // Post-Condition: Buffer should be empty at the start of Next()
             Debug.Assert(Buffer.Length == 0);
@@ -95,7 +94,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return token;
         }
 
-        protected virtual TToken Turn()
+        protected virtual SyntaxToken Turn()
         {
             if (CurrentState != null)
             {
@@ -105,19 +104,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     var next = Dispatch();
 
                     CurrentState = next.State;
-                    CurrentToken = next.Result;
+                    CurrenSyntaxToken = next.Result;
                 }
-                while (CurrentState != null && CurrentToken == null);
+                while (CurrentState != null && CurrenSyntaxToken == null);
 
                 if (CurrentState == null)
                 {
-                    return default(TToken); // Terminated
+                    return default(SyntaxToken); // Terminated
                 }
 
-                return CurrentToken;
+                return CurrenSyntaxToken;
             }
 
-            return default(TToken);
+            return default(SyntaxToken);
         }
 
         public void Reset()
@@ -149,7 +148,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         /// Returns a result containing the specified output and indicating that the next call to
         /// <see cref="Turn"/> should invoke the provided state.
         /// </summary>
-        protected StateResult Transition(int state, TToken result)
+        protected StateResult Transition(int state, SyntaxToken result)
         {
             return new StateResult(state, result);
         }
@@ -159,7 +158,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return new StateResult((int)state, result: null);
         }
 
-        protected StateResult Transition(RazorCommentTokenizerState state, TToken result)
+        protected StateResult Transition(RazorCommentTokenizerState state, SyntaxToken result)
         {
             return new StateResult((int)state, result);
         }
@@ -180,12 +179,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         /// Returns a result containing the specified output and indicating that the next call to
         /// <see cref="Turn"/> should re-invoke the current state.
         /// </summary>
-        protected StateResult Stay(TToken result)
+        protected StateResult Stay(SyntaxToken result)
         {
             return new StateResult(CurrentState, result);
         }
 
-        protected TToken Single(TTokenType type)
+        protected SyntaxToken Single(SyntaxKind type)
         {
             TakeCurrent();
             return EndToken(type);
@@ -199,9 +198,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             CurrentStart = CurrentLocation;
         }
 
-        protected TToken EndToken(TTokenType type)
+        protected SyntaxToken EndToken(SyntaxKind type)
         {
-            TToken token = null;
+            SyntaxToken token = null;
             if (HaveContent)
             {
                 // Perf: Don't allocate a new errors array unless necessary.
@@ -222,7 +221,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return token;
         }
 
-        protected virtual string GetTokenContent(TTokenType type)
+        protected virtual string GetTokenContent(SyntaxKind type)
         {
             return Buffer.ToString();
         }
@@ -278,7 +277,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             AssertCurrent('*');
             TakeCurrent();
-            return Transition(1002, EndToken(RazorCommentStarType));
+            return Transition(1002, EndToken(RazorCommentStarKind));
         }
 
         protected StateResult RazorCommentBody()
@@ -292,7 +291,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     {
                         return Transition(
                             RazorCommentTokenizerState.StarAfterRazorCommentBody,
-                            EndToken(RazorCommentType));
+                            EndToken(RazorCommentKind));
                     }
                     else
                     {
@@ -306,7 +305,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 }
             }
 
-            return Transition(StartState, EndToken(RazorCommentType));
+            return Transition(StartState, EndToken(RazorCommentKind));
         }
 
         protected StateResult StarAfterRazorCommentBody()
@@ -315,14 +314,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             TakeCurrent();
             return Transition(
                 RazorCommentTokenizerState.AtTokenAfterRazorCommentBody,
-                EndToken(RazorCommentStarType));
+                EndToken(RazorCommentStarKind));
         }
 
         protected StateResult AtTokenAfterRazorCommentBody()
         {
             AssertCurrent('@');
             TakeCurrent();
-            return Transition(StartState, EndToken(RazorCommentTransitionType));
+            return Transition(StartState, EndToken(RazorCommentTransitionKind));
         }
 
         /// <summary>
@@ -397,7 +396,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         protected struct StateResult
         {
-            public StateResult(int? state, TToken result)
+            public StateResult(int? state, SyntaxToken result)
             {
                 State = state;
                 Result = result;
@@ -405,7 +404,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             public int? State { get; }
 
-            public TToken Result { get; }
+            public SyntaxToken Result { get; }
         }
 
         private static LookaheadToken BeginLookahead(ITextBuffer buffer)
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerBackedParser.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerBackedParser.cs
index af5a08831f..ed4b881939 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerBackedParser.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerBackedParser.cs
@@ -5,38 +5,53 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
-    internal abstract partial class TokenizerBackedParser<TTokenizer, TToken, TTokenType> : ParserBase
-        where TTokenType : struct
-        where TTokenizer : Tokenizer<TToken, TTokenType>
-        where TToken : TokenBase<TTokenType>
+    internal abstract class TokenizerBackedParser<TTokenizer> : ParserBase
+        where TTokenizer : Tokenizer
     {
-        private readonly TokenizerView<TTokenizer, TToken, TTokenType> _tokenizer;
+        private readonly SyntaxListPool _pool = new SyntaxListPool();
+        private readonly TokenizerView<TTokenizer> _tokenizer;
+        private SyntaxListBuilder<SyntaxToken>? _tokenBuilder;
 
-        protected TokenizerBackedParser(LanguageCharacteristics<TTokenizer, TToken, TTokenType> language, ParserContext context)
+        protected TokenizerBackedParser(LanguageCharacteristics<TTokenizer> language, ParserContext context)
             : base(context)
         {
             Language = language;
 
             var languageTokenizer = Language.CreateTokenizer(Context.Source);
-            _tokenizer = new TokenizerView<TTokenizer, TToken, TTokenType>(languageTokenizer);
-            Span = new SpanBuilder(CurrentLocation);
+            _tokenizer = new TokenizerView<TTokenizer>(languageTokenizer);
+            SpanContext = new SpanContextBuilder();
         }
 
-        protected SpanBuilder Span { get; private set; }
+        protected SyntaxListPool Pool => _pool;
 
-        protected Action<SpanBuilder> SpanConfig { get; set; }
+        protected SyntaxListBuilder<SyntaxToken> TokenBuilder
+        {
+            get
+            {
+                if (_tokenBuilder == null)
+                {
+                    var result = _pool.Allocate<SyntaxToken>();
+                    _tokenBuilder = result.Builder;
+                }
 
-        protected TToken CurrentToken
+                return _tokenBuilder.Value;
+            }
+        }
+
+        protected SpanContextBuilder SpanContext { get; private set; }
+
+        protected Action<SpanContextBuilder> SpanContextConfig { get; set; }
+
+        protected SyntaxToken CurrentToken
         {
             get { return _tokenizer.Current; }
         }
 
-        protected TToken PreviousToken { get; private set; }
-
-        protected SourceLocation CurrentLocation => _tokenizer.Tokenizer.CurrentLocation;
+        protected SyntaxToken PreviousToken { get; private set; }
 
         protected SourceLocation CurrentStart => _tokenizer.Tokenizer.CurrentStart;
 
@@ -45,34 +60,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             get { return _tokenizer.EndOfFile; }
         }
 
-        protected LanguageCharacteristics<TTokenizer, TToken, TTokenType> Language { get; }
+        protected LanguageCharacteristics<TTokenizer> Language { get; }
 
-        protected virtual void HandleEmbeddedTransition()
-        {
-        }
-
-        protected virtual bool IsAtEmbeddedTransition(bool allowTemplatesAndComments, bool allowTransitions)
-        {
-            return false;
-        }
-
-        public override void BuildSpan(SpanBuilder span, SourceLocation start, string content)
-        {
-            foreach (IToken sym in Language.TokenizeString(start, content))
-            {
-                span.Accept(sym);
-            }
-        }
-
-        protected void Initialize(SpanBuilder span)
-        {
-            if (SpanConfig != null)
-            {
-                SpanConfig(span);
-            }
-        }
-
-        protected TToken Lookahead(int count)
+        protected SyntaxToken Lookahead(int count)
         {
             if (count < 0)
             {
@@ -84,7 +74,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
 
             // We add 1 in order to store the current token.
-            var tokens = new TToken[count + 1];
+            var tokens = new SyntaxToken[count + 1];
             var currentToken = CurrentToken;
 
             tokens[0] = currentToken;
@@ -115,7 +105,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         /// <param name="condition">A predicate accepting the token being evaluated and the list of tokens which have been looped through.</param>
         /// <returns>true, if the condition was met. false - if the condition wasn't met and the last token has already been processed.</returns>
         /// <remarks>The list of previous tokens is passed in the reverse order. So the last processed element will be the first one in the list.</remarks>
-        protected bool LookaheadUntil(Func<TToken, IEnumerable<TToken>, bool> condition)
+        protected bool LookaheadUntil(Func<SyntaxToken, IEnumerable<SyntaxToken>, bool> condition)
         {
             if (condition == null)
             {
@@ -124,7 +114,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             var matchFound = false;
 
-            var tokens = new List<TToken>();
+            var tokens = new List<SyntaxToken>();
             tokens.Add(CurrentToken);
 
             while (true)
@@ -163,14 +153,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         // Helpers
         [Conditional("DEBUG")]
-        internal void Assert(TTokenType expectedType)
+        internal void Assert(SyntaxKind expectedType)
         {
-            Debug.Assert(!EndOfFile && TokenTypeEquals(CurrentToken.Type, expectedType));
+            Debug.Assert(!EndOfFile && CurrentToken.Kind == expectedType);
         }
 
-        abstract protected bool TokenTypeEquals(TTokenType x, TTokenType y);
-
-        protected internal void PutBack(TToken token)
+        protected internal void PutBack(SyntaxToken token)
         {
             if (token != null)
             {
@@ -180,7 +168,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         /// <summary>
         /// Put the specified tokens back in the input stream. The provided list MUST be in the ORDER THE TOKENS WERE READ. The
-        /// list WILL be reversed and the Putback(TToken) will be called on each item.
+        /// list WILL be reversed and the Putback(SyntaxToken) will be called on each item.
         /// </summary>
         /// <remarks>
         /// If a document contains tokens: a, b, c, d, e, f
@@ -189,9 +177,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         /// that is the correct format for providing to this method. The caller of this method would,
         /// in that case, want to put c, b and a back into the stream, so "a, b, c" is the CORRECT order
         /// </remarks>
-        protected internal void PutBack(IEnumerable<TToken> tokens)
+        protected internal void PutBack(IEnumerable<SyntaxToken> tokens)
         {
-            foreach (TToken token in tokens.Reverse())
+            foreach (var token in tokens.Reverse())
             {
                 PutBack(token);
             }
@@ -205,99 +193,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        protected internal bool Balance(BalancingModes mode)
+        protected internal bool NextIs(SyntaxKind type)
         {
-            var left = CurrentToken.Type;
-            var right = Language.FlipBracket(left);
-            var start = CurrentStart;
-            AcceptAndMoveNext();
-            if (EndOfFile && ((mode & BalancingModes.NoErrorOnFailure) != BalancingModes.NoErrorOnFailure))
-            {
-                Context.ErrorSink.OnError(
-                    RazorDiagnosticFactory.CreateParsing_ExpectedCloseBracketBeforeEOF(
-                        new SourceSpan(start, contentLength: 1 /* { OR } */),
-                        Language.GetSample(left),
-                        Language.GetSample(right)));
-            }
-
-            return Balance(mode, left, right, start);
+            return NextIs(token => token != null && type == token.Kind);
         }
 
-        protected internal bool Balance(BalancingModes mode, TTokenType left, TTokenType right, SourceLocation start)
+        protected internal bool NextIs(params SyntaxKind[] types)
         {
-            var startPosition = CurrentStart.AbsoluteIndex;
-            var nesting = 1;
-            if (!EndOfFile)
-            {
-                var syms = new List<TToken>();
-                do
-                {
-                    if (IsAtEmbeddedTransition(
-                        (mode & BalancingModes.AllowCommentsAndTemplates) == BalancingModes.AllowCommentsAndTemplates,
-                        (mode & BalancingModes.AllowEmbeddedTransitions) == BalancingModes.AllowEmbeddedTransitions))
-                    {
-                        Accept(syms);
-                        syms.Clear();
-                        HandleEmbeddedTransition();
-
-                        // Reset backtracking since we've already outputted some spans.
-                        startPosition = CurrentStart.AbsoluteIndex;
-                    }
-                    if (At(left))
-                    {
-                        nesting++;
-                    }
-                    else if (At(right))
-                    {
-                        nesting--;
-                    }
-                    if (nesting > 0)
-                    {
-                        syms.Add(CurrentToken);
-                    }
-                }
-                while (nesting > 0 && NextToken());
-
-                if (nesting > 0)
-                {
-                    if ((mode & BalancingModes.NoErrorOnFailure) != BalancingModes.NoErrorOnFailure)
-                    {
-                        Context.ErrorSink.OnError(
-                            RazorDiagnosticFactory.CreateParsing_ExpectedCloseBracketBeforeEOF(
-                                new SourceSpan(start, contentLength: 1 /* { OR } */),
-                                Language.GetSample(left),
-                                Language.GetSample(right)));
-                    }
-                    if ((mode & BalancingModes.BacktrackOnFailure) == BalancingModes.BacktrackOnFailure)
-                    {
-                        Context.Source.Position = startPosition;
-                        NextToken();
-                    }
-                    else
-                    {
-                        Accept(syms);
-                    }
-                }
-                else
-                {
-                    // Accept all the tokens we saw
-                    Accept(syms);
-                }
-            }
-            return nesting == 0;
+            return NextIs(token => token != null && types.Any(t => t == token.Kind));
         }
 
-        protected internal bool NextIs(TTokenType type)
-        {
-            return NextIs(sym => sym != null && TokenTypeEquals(type, sym.Type));
-        }
-
-        protected internal bool NextIs(params TTokenType[] types)
-        {
-            return NextIs(sym => sym != null && types.Any(t => TokenTypeEquals(t, sym.Type)));
-        }
-
-        protected internal bool NextIs(Func<TToken, bool> condition)
+        protected internal bool NextIs(Func<SyntaxToken, bool> condition)
         {
             var cur = CurrentToken;
             if (NextToken())
@@ -317,175 +223,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return false;
         }
 
-        protected internal bool Was(TTokenType type)
+        protected internal bool Was(SyntaxKind type)
         {
-            return PreviousToken != null && TokenTypeEquals(PreviousToken.Type, type);
+            return PreviousToken != null && PreviousToken.Kind == type;
         }
 
-        protected internal bool At(TTokenType type)
+        protected internal bool At(SyntaxKind type)
         {
-            return !EndOfFile && CurrentToken != null && TokenTypeEquals(CurrentToken.Type, type);
-        }
-
-        protected internal bool AcceptAndMoveNext()
-        {
-            Accept(CurrentToken);
-            return NextToken();
-        }
-
-        protected TToken AcceptSingleWhiteSpaceCharacter()
-        {
-            if (Language.IsWhiteSpace(CurrentToken))
-            {
-                Tuple<TToken, TToken> pair = Language.SplitToken(CurrentToken, 1, Language.GetKnownTokenType(KnownTokenType.WhiteSpace));
-                Accept(pair.Item1);
-                Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
-                NextToken();
-                return pair.Item2;
-            }
-            return null;
-        }
-
-        protected internal void Accept(IEnumerable<TToken> tokens)
-        {
-            foreach (TToken token in tokens)
-            {
-                Accept(token);
-            }
-        }
-
-        protected internal void Accept(TToken token)
-        {
-            if (token != null)
-            {
-                foreach (var error in token.Errors)
-                {
-                    Context.ErrorSink.OnError(error);
-                }
-
-                Span.Accept(token);
-            }
-        }
-
-        protected internal bool AcceptAll(params TTokenType[] types)
-        {
-            foreach (TTokenType type in types)
-            {
-                if (CurrentToken == null || !TokenTypeEquals(CurrentToken.Type, type))
-                {
-                    return false;
-                }
-                AcceptAndMoveNext();
-            }
-            return true;
-        }
-
-        protected internal void AddMarkerTokenIfNecessary()
-        {
-            if (Span.Tokens.Count == 0 && Context.Builder.LastAcceptedCharacters != AcceptedCharactersInternal.Any)
-            {
-                Accept(Language.CreateMarkerToken());
-            }
-        }
-
-        protected internal void Output(SpanKindInternal kind)
-        {
-            Configure(kind, null);
-            Output();
-        }
-
-        protected internal void Output(SpanKindInternal kind, AcceptedCharactersInternal accepts)
-        {
-            Configure(kind, accepts);
-            Output();
-        }
-
-        protected internal void Output(AcceptedCharactersInternal accepts)
-        {
-            Configure(null, accepts);
-            Output();
-        }
-
-        private void Output()
-        {
-            if (Span.Tokens.Count > 0)
-            {
-                var nextStart = Span.End;
-
-                var builtSpan = Span.Build();
-                Context.Builder.Add(builtSpan);
-                Initialize(Span);
-
-                // Ensure spans are contiguous.
-                //
-                // Note: Using Span.End here to avoid CurrentLocation. CurrentLocation will
-                // vary depending on what tokens have been read. We often read a token and *then*
-                // make a decision about whether to include it in the current span.
-                Span.Start = nextStart;
-            }
-        }
-
-        protected IDisposable PushSpanConfig()
-        {
-            return PushSpanConfig(newConfig: (Action<SpanBuilder, Action<SpanBuilder>>)null);
-        }
-
-        protected IDisposable PushSpanConfig(Action<SpanBuilder> newConfig)
-        {
-            return PushSpanConfig(newConfig == null ? (Action<SpanBuilder, Action<SpanBuilder>>)null : (span, _) => newConfig(span));
-        }
-
-        protected IDisposable PushSpanConfig(Action<SpanBuilder, Action<SpanBuilder>> newConfig)
-        {
-            Action<SpanBuilder> old = SpanConfig;
-            ConfigureSpan(newConfig);
-            return new DisposableAction(() => SpanConfig = old);
-        }
-
-        protected void ConfigureSpan(Action<SpanBuilder> config)
-        {
-            SpanConfig = config;
-            Initialize(Span);
-        }
-
-        protected void ConfigureSpan(Action<SpanBuilder, Action<SpanBuilder>> config)
-        {
-            Action<SpanBuilder> prev = SpanConfig;
-            if (config == null)
-            {
-                SpanConfig = null;
-            }
-            else
-            {
-                SpanConfig = span => config(span, prev);
-            }
-            Initialize(Span);
-        }
-
-        protected internal void Expected(KnownTokenType type)
-        {
-            Expected(Language.GetKnownTokenType(type));
-        }
-
-        protected internal void Expected(params TTokenType[] types)
-        {
-            Debug.Assert(!EndOfFile && CurrentToken != null && types.Contains(CurrentToken.Type));
-            AcceptAndMoveNext();
-        }
-
-        protected internal bool Optional(KnownTokenType type)
-        {
-            return Optional(Language.GetKnownTokenType(type));
-        }
-
-        protected internal bool Optional(TTokenType type)
-        {
-            if (At(type))
-            {
-                AcceptAndMoveNext();
-                return true;
-            }
-            return false;
+            return !EndOfFile && CurrentToken != null && CurrentToken.Kind == type;
         }
 
         protected bool EnsureCurrent()
@@ -498,85 +243,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return true;
         }
 
-        protected internal void AcceptWhile(TTokenType type)
-        {
-            AcceptWhile(sym => TokenTypeEquals(type, sym.Type));
-        }
-
-        // We want to avoid array allocations and enumeration where possible, so we use the same technique as string.Format
-        protected internal void AcceptWhile(TTokenType type1, TTokenType type2)
-        {
-            AcceptWhile(sym => TokenTypeEquals(type1, sym.Type) || TokenTypeEquals(type2, sym.Type));
-        }
-
-        protected internal void AcceptWhile(TTokenType type1, TTokenType type2, TTokenType type3)
-        {
-            AcceptWhile(sym => TokenTypeEquals(type1, sym.Type) || TokenTypeEquals(type2, sym.Type) || TokenTypeEquals(type3, sym.Type));
-        }
-
-        protected internal void AcceptWhile(params TTokenType[] types)
-        {
-            AcceptWhile(sym => types.Any(expected => TokenTypeEquals(expected, sym.Type)));
-        }
-
-        protected internal void AcceptUntil(TTokenType type)
-        {
-            AcceptWhile(sym => !TokenTypeEquals(type, sym.Type));
-        }
-
-        // We want to avoid array allocations and enumeration where possible, so we use the same technique as string.Format
-        protected internal void AcceptUntil(TTokenType type1, TTokenType type2)
-        {
-            AcceptWhile(sym => !TokenTypeEquals(type1, sym.Type) && !TokenTypeEquals(type2, sym.Type));
-        }
-
-        protected internal void AcceptUntil(TTokenType type1, TTokenType type2, TTokenType type3)
-        {
-            AcceptWhile(sym => !TokenTypeEquals(type1, sym.Type) && !TokenTypeEquals(type2, sym.Type) && !TokenTypeEquals(type3, sym.Type));
-        }
-
-        protected internal void AcceptUntil(params TTokenType[] types)
-        {
-            AcceptWhile(sym => types.All(expected => !TokenTypeEquals(expected, sym.Type)));
-        }
-
-        protected internal void AcceptWhile(Func<TToken, bool> condition)
-        {
-            Accept(ReadWhileLazy(condition));
-        }
-
-        protected internal IEnumerable<TToken> ReadWhile(Func<TToken, bool> condition)
+        protected internal IEnumerable<SyntaxToken> ReadWhile(Func<SyntaxToken, bool> condition)
         {
             return ReadWhileLazy(condition).ToList();
         }
 
-        protected TToken AcceptWhiteSpaceInLines()
-        {
-            TToken lastWs = null;
-            while (Language.IsWhiteSpace(CurrentToken) || Language.IsNewLine(CurrentToken))
-            {
-                // Capture the previous whitespace node
-                if (lastWs != null)
-                {
-                    Accept(lastWs);
-                }
-
-                if (Language.IsWhiteSpace(CurrentToken))
-                {
-                    lastWs = CurrentToken;
-                }
-                else if (Language.IsNewLine(CurrentToken))
-                {
-                    // Accept newline and reset last whitespace tracker
-                    Accept(CurrentToken);
-                    lastWs = null;
-                }
-
-                _tokenizer.Next();
-            }
-            return lastWs;
-        }
-
         protected bool AtIdentifier(bool allowKeywords)
         {
             return CurrentToken != null &&
@@ -586,7 +257,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         // Don't open this to sub classes because it's lazy but it looks eager.
         // You have to advance the Enumerable to read the next characters.
-        internal IEnumerable<TToken> ReadWhileLazy(Func<TToken, bool> condition)
+        internal IEnumerable<SyntaxToken> ReadWhileLazy(Func<SyntaxToken, bool> condition)
         {
             while (EnsureCurrent() && condition(CurrentToken))
             {
@@ -595,30 +266,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        private void Configure(SpanKindInternal? kind, AcceptedCharactersInternal? accepts)
-        {
-            if (kind != null)
-            {
-                Span.Kind = kind.Value;
-            }
-            if (accepts != null)
-            {
-                Span.EditHandler.AcceptedCharacters = accepts.Value;
-            }
-        }
-
-        protected virtual void OutputSpanBeforeRazorComment()
-        {
-            throw new InvalidOperationException(Resources.Language_Does_Not_Support_RazorComment);
-        }
-
-        private void CommentSpanConfig(SpanBuilder span)
-        {
-            span.ChunkGenerator = SpanChunkGenerator.Null;
-            span.EditHandler = SpanEditHandler.CreateDefault(Language.TokenizeString);
-        }
-
-        protected void RazorComment()
+        protected RazorCommentBlockSyntax ParseRazorComment()
         {
             if (!Language.KnowsTokenType(KnownTokenType.CommentStart) ||
                 !Language.KnowsTokenType(KnownTokenType.CommentStar) ||
@@ -626,54 +274,321 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             {
                 throw new InvalidOperationException(Resources.Language_Does_Not_Support_RazorComment);
             }
-            OutputSpanBeforeRazorComment();
-            using (PushSpanConfig(CommentSpanConfig))
+
+            RazorCommentBlockSyntax commentBlock;
+            using (PushSpanContextConfig(CommentSpanContextConfig))
             {
-                using (Context.Builder.StartBlock(BlockKindInternal.Comment))
+                EnsureCurrent();
+                var start = CurrentStart;
+                Debug.Assert(At(SyntaxKind.RazorCommentTransition));
+                var startTransition = EatExpectedToken(SyntaxKind.RazorCommentTransition);
+                var startStar = EatExpectedToken(SyntaxKind.RazorCommentStar);
+                var comment = GetOptionalToken(SyntaxKind.RazorCommentLiteral);
+                if (comment == null)
                 {
-                    Context.Builder.CurrentBlock.ChunkGenerator = new RazorCommentChunkGenerator();
-                    var start = CurrentStart;
-
-                    Expected(KnownTokenType.CommentStart);
-                    Output(SpanKindInternal.Transition, AcceptedCharactersInternal.None);
-
-                    Expected(KnownTokenType.CommentStar);
-                    Output(SpanKindInternal.MetaCode, AcceptedCharactersInternal.None);
-
-                    Optional(KnownTokenType.CommentBody);
-                    AddMarkerTokenIfNecessary();
-                    Output(SpanKindInternal.Comment);
-
-                    var errorReported = false;
-                    if (!Optional(KnownTokenType.CommentStar))
+                    comment = SyntaxFactory.MissingToken(SyntaxKind.RazorCommentLiteral);
+                }
+                var endStar = GetOptionalToken(SyntaxKind.RazorCommentStar);
+                if (endStar == null)
+                {
+                    var diagnostic = RazorDiagnosticFactory.CreateParsing_RazorCommentNotTerminated(
+                        new SourceSpan(start, contentLength: 2 /* @* */));
+                    endStar = SyntaxFactory.MissingToken(SyntaxKind.RazorCommentStar, diagnostic);
+                    Context.ErrorSink.OnError(diagnostic);
+                }
+                var endTransition = GetOptionalToken(SyntaxKind.RazorCommentTransition);
+                if (endTransition == null)
+                {
+                    if (!endStar.IsMissing)
                     {
-                        errorReported = true;
-                        Context.ErrorSink.OnError(
-                            RazorDiagnosticFactory.CreateParsing_RazorCommentNotTerminated(
-                                new SourceSpan(start, contentLength: 2 /* @* */)));
-                    }
-                    else
-                    {
-                        Output(SpanKindInternal.MetaCode, AcceptedCharactersInternal.None);
+                        var diagnostic = RazorDiagnosticFactory.CreateParsing_RazorCommentNotTerminated(
+                            new SourceSpan(start, contentLength: 2 /* @* */));
+                        Context.ErrorSink.OnError(diagnostic);
+                        endTransition = SyntaxFactory.MissingToken(SyntaxKind.RazorCommentTransition, diagnostic);
                     }
 
-                    if (!Optional(KnownTokenType.CommentStart))
-                    {
-                        if (!errorReported)
-                        {
-                            errorReported = true;
-                            Context.ErrorSink.OnError(
-                            RazorDiagnosticFactory.CreateParsing_RazorCommentNotTerminated(
-                                new SourceSpan(start, contentLength: 2 /* @* */)));
-                        }
-                    }
-                    else
-                    {
-                        Output(SpanKindInternal.Transition, AcceptedCharactersInternal.None);
-                    }
+                    endTransition = SyntaxFactory.MissingToken(SyntaxKind.RazorCommentTransition);
+                }
+
+                commentBlock = SyntaxFactory.RazorCommentBlock(startTransition, startStar, comment, endStar, endTransition);
+
+                // Make sure we generate a marker symbol after a comment if necessary.
+                if (!comment.IsMissing || !endStar.IsMissing || !endTransition.IsMissing)
+                {
+                    Context.LastAcceptedCharacters = AcceptedCharactersInternal.None;
                 }
             }
-            Initialize(Span);
+
+            InitializeContext(SpanContext);
+
+            return commentBlock;
+        }
+
+        private void CommentSpanContextConfig(SpanContextBuilder spanContext)
+        {
+            spanContext.ChunkGenerator = SpanChunkGenerator.Null;
+            spanContext.EditHandler = SpanEditHandler.CreateDefault(Language.TokenizeString);
+        }
+
+        protected SyntaxToken EatCurrentToken()
+        {
+            Debug.Assert(!EndOfFile && CurrentToken != null);
+            var token = CurrentToken;
+            NextToken();
+            return token;
+        }
+
+        protected SyntaxToken EatExpectedToken(params SyntaxKind[] kinds)
+        {
+            Debug.Assert(!EndOfFile && CurrentToken != null && kinds.Contains(CurrentToken.Kind));
+            var token = CurrentToken;
+            NextToken();
+            return token;
+        }
+
+        protected SyntaxToken GetOptionalToken(SyntaxKind kind)
+        {
+            if (At(kind))
+            {
+                var token = CurrentToken;
+                NextToken();
+                return token;
+            }
+
+            return null;
+        }
+
+        protected internal void AcceptWhile(SyntaxKind type)
+        {
+            AcceptWhile(token => type == token.Kind);
+        }
+
+        // We want to avoid array allocations and enumeration where possible, so we use the same technique as string.Format
+        protected internal void AcceptWhile(SyntaxKind type1, SyntaxKind type2)
+        {
+            AcceptWhile(token => type1 == token.Kind || type2 == token.Kind);
+        }
+
+        protected internal void AcceptWhile(SyntaxKind type1, SyntaxKind type2, SyntaxKind type3)
+        {
+            AcceptWhile(token => type1 == token.Kind || type2 == token.Kind || type3 == token.Kind);
+        }
+
+        protected internal void AcceptWhile(params SyntaxKind[] types)
+        {
+            AcceptWhile(token => types.Any(expected => expected == token.Kind));
+        }
+
+        protected internal void AcceptUntil(SyntaxKind type)
+        {
+            AcceptWhile(token => type != token.Kind);
+        }
+
+        // We want to avoid array allocations and enumeration where possible, so we use the same technique as string.Format
+        protected internal void AcceptUntil(SyntaxKind type1, SyntaxKind type2)
+        {
+            AcceptWhile(token => type1 != token.Kind && type2 != token.Kind);
+        }
+
+        protected internal void AcceptUntil(SyntaxKind type1, SyntaxKind type2, SyntaxKind type3)
+        {
+            AcceptWhile(token => type1 != token.Kind && type2 != token.Kind && type3 != token.Kind);
+        }
+
+        protected internal void AcceptUntil(params SyntaxKind[] types)
+        {
+            AcceptWhile(token => types.All(expected => expected != token.Kind));
+        }
+
+        protected internal void AcceptWhile(Func<SyntaxToken, bool> condition)
+        {
+            Accept(ReadWhileLazy(condition));
+        }
+
+        protected internal void Accept(IEnumerable<SyntaxToken> tokens)
+        {
+            foreach (var token in tokens)
+            {
+                foreach (var error in token.GetDiagnostics())
+                {
+                    Context.ErrorSink.OnError(error);
+                }
+
+                TokenBuilder.Add(token);
+            }
+        }
+
+        protected internal void Accept(SyntaxToken token)
+        {
+            if (token != null)
+            {
+                foreach (var error in token.GetDiagnostics())
+                {
+                    Context.ErrorSink.OnError(error);
+                }
+
+                TokenBuilder.Add(token);
+            }
+        }
+
+        protected internal bool AcceptAll(params SyntaxKind[] kinds)
+        {
+            foreach (var kind in kinds)
+            {
+                if (CurrentToken == null || CurrentToken.Kind != kind)
+                {
+                    return false;
+                }
+                AcceptAndMoveNext();
+            }
+            return true;
+        }
+
+        protected internal bool AcceptAndMoveNext()
+        {
+            Accept(CurrentToken);
+            return NextToken();
+        }
+
+        protected SyntaxList<SyntaxToken> Output()
+        {
+            var list = TokenBuilder.ToList();
+            TokenBuilder.Clear();
+            return list;
+        }
+
+        protected SyntaxToken AcceptWhitespaceInLines()
+        {
+            SyntaxToken lastWs = null;
+            while (Language.IsWhitespace(CurrentToken) || Language.IsNewLine(CurrentToken))
+            {
+                // Capture the previous whitespace node
+                if (lastWs != null)
+                {
+                    Accept(lastWs);
+                }
+
+                if (Language.IsWhitespace(CurrentToken))
+                {
+                    lastWs = CurrentToken;
+                }
+                else if (Language.IsNewLine(CurrentToken))
+                {
+                    // Accept newline and reset last whitespace tracker
+                    Accept(CurrentToken);
+                    lastWs = null;
+                }
+
+                NextToken();
+            }
+
+            return lastWs;
+        }
+
+        protected internal bool TryAccept(SyntaxKind type)
+        {
+            if (At(type))
+            {
+                AcceptAndMoveNext();
+                return true;
+            }
+            return false;
+        }
+
+        protected internal void AcceptMarkerTokenIfNecessary()
+        {
+            if (TokenBuilder.Count == 0 && Context.LastAcceptedCharacters != AcceptedCharactersInternal.Any)
+            {
+                Accept(Language.CreateMarkerToken());
+            }
+        }
+
+        protected MarkupTextLiteralSyntax OutputAsMarkupLiteral()
+        {
+            var tokens = Output();
+            if (tokens.Count == 0)
+            {
+                return null;
+            }
+
+            return GetNodeWithSpanContext(SyntaxFactory.MarkupTextLiteral(tokens));
+        }
+
+        protected MarkupEphemeralTextLiteralSyntax OutputAsMarkupEphemeralLiteral()
+        {
+            var tokens = Output();
+            if (tokens.Count == 0)
+            {
+                return null;
+            }
+
+            return GetNodeWithSpanContext(SyntaxFactory.MarkupEphemeralTextLiteral(tokens));
+        }
+
+        protected RazorMetaCodeSyntax OutputAsMetaCode(SyntaxList<SyntaxToken> tokens, AcceptedCharactersInternal? accepted = null)
+        {
+            if (tokens.Count == 0)
+            {
+                return null;
+            }
+
+            var metacode = SyntaxFactory.RazorMetaCode(tokens);
+            SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
+            SpanContext.EditHandler.AcceptedCharacters = accepted ?? AcceptedCharactersInternal.None;
+
+            return GetNodeWithSpanContext(metacode);
+        }
+
+        protected TNode GetNodeWithSpanContext<TNode>(TNode node) where TNode : Syntax.GreenNode
+        {
+            var spanContext = SpanContext.Build();
+            Context.LastAcceptedCharacters = spanContext.EditHandler.AcceptedCharacters;
+            InitializeContext(SpanContext);
+            var annotation = new Syntax.SyntaxAnnotation(SyntaxConstants.SpanContextKind, spanContext);
+
+            return (TNode)node.SetAnnotations(new[] { annotation });
+        }
+
+        protected IDisposable PushSpanContextConfig()
+        {
+            return PushSpanContextConfig(newConfig: (Action<SpanContextBuilder, Action<SpanContextBuilder>>)null);
+        }
+
+        protected IDisposable PushSpanContextConfig(Action<SpanContextBuilder> newConfig)
+        {
+            return PushSpanContextConfig(newConfig == null ? (Action<SpanContextBuilder, Action<SpanContextBuilder>>)null : (span, _) => newConfig(span));
+        }
+
+        protected IDisposable PushSpanContextConfig(Action<SpanContextBuilder, Action<SpanContextBuilder>> newConfig)
+        {
+            var old = SpanContextConfig;
+            ConfigureSpanContext(newConfig);
+            return new DisposableAction(() => SpanContextConfig = old);
+        }
+
+        protected void ConfigureSpanContext(Action<SpanContextBuilder> config)
+        {
+            SpanContextConfig = config;
+            InitializeContext(SpanContext);
+        }
+
+        protected void ConfigureSpanContext(Action<SpanContextBuilder, Action<SpanContextBuilder>> config)
+        {
+            var prev = SpanContextConfig;
+            if (config == null)
+            {
+                SpanContextConfig = null;
+            }
+            else
+            {
+                SpanContextConfig = span => config(span, prev);
+            }
+            InitializeContext(SpanContext);
+        }
+
+        protected void InitializeContext(SpanContextBuilder spanContext)
+        {
+            SpanContextConfig?.Invoke(spanContext);
         }
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerView.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerView.cs
index 2b290bda5c..ef481af1ac 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerView.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerView.cs
@@ -1,12 +1,12 @@
 // 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
-    internal class TokenizerView<TTokenizer, TToken, TTokenType>
-        where TTokenType : struct
-        where TTokenizer : Tokenizer<TToken, TTokenType>
-        where TToken : TokenBase<TTokenType>
+    internal class TokenizerView<TTokenizer>
+        where TTokenizer : Tokenizer
     {
         public TokenizerView(TTokenizer tokenizer)
         {
@@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         public TTokenizer Tokenizer { get; private set; }
         public bool EndOfFile { get; private set; }
-        public TToken Current { get; private set; }
+        public SyntaxToken Current { get; private set; }
 
         public ITextDocument Source
         {
@@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return !EndOfFile;
         }
 
-        public void PutBack(TToken token)
+        public void PutBack(SyntaxToken token)
         {
             Source.Position -= token.Content.Length;
             Current = null;
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/WhiteSpaceRewriter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/WhiteSpaceRewriter.cs
index cf71b0a024..af20b925f1 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/WhiteSpaceRewriter.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Legacy/WhiteSpaceRewriter.cs
@@ -1,41 +1,70 @@
-// 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.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
-    internal class WhiteSpaceRewriter : MarkupRewriter
+    internal class WhitespaceRewriter : SyntaxRewriter
     {
-        protected override bool CanRewrite(Block block)
+        public override SyntaxNode Visit(SyntaxNode node)
         {
-            return block.Type == BlockKindInternal.Expression && Parent != null;
+            if (node == null)
+            {
+                return base.Visit(node);
+            }
+
+            var children = node.ChildNodes();
+            for (var i = 0; i < children.Count; i++)
+            {
+                var child = children[i];
+                if (child is CSharpCodeBlockSyntax codeBlock &&
+                    TryRewriteWhitespace(codeBlock, out var rewritten, out var whitespaceLiteral))
+                {
+                    // Replace the existing code block with the whitespace literal
+                    // followed by the rewritten code block (with the code whitespace removed).
+                    node = node.ReplaceNode(codeBlock, new SyntaxNode[] { whitespaceLiteral, rewritten });
+
+                    // Since we replaced node, its children are different. Update our collection.
+                    children = node.ChildNodes();
+                }
+            }
+
+            return base.Visit(node);
         }
 
-        protected override SyntaxTreeNode RewriteBlock(BlockBuilder parent, Block block)
+        private bool TryRewriteWhitespace(CSharpCodeBlockSyntax codeBlock, out CSharpCodeBlockSyntax rewritten, out SyntaxNode whitespaceLiteral)
         {
-            var newBlock = new BlockBuilder(block);
-            newBlock.Children.Clear();
-            var ws = block.Children.FirstOrDefault() as Span;
-            IEnumerable<SyntaxTreeNode> newNodes = block.Children;
-            if (ws.Content.All(char.IsWhiteSpace))
-            {
-                // Add this node to the parent
-                var builder = new SpanBuilder(ws);
-                builder.ClearTokens();
-                FillSpan(builder, ws.Start, ws.Content);
-                parent.Children.Add(builder.Build());
+            // Rewrite any whitespace represented as code at the start of a line preceding an expression block.
+            // We want it to be rendered as Markup.
 
-                // Remove the old whitespace node
-                newNodes = block.Children.Skip(1);
+            rewritten = null;
+            whitespaceLiteral = null;
+            var children = codeBlock.ChildNodes();
+            if (children.Count < 2)
+            {
+                return false;
             }
 
-            foreach (SyntaxTreeNode node in newNodes)
+            if (children[0] is CSharpStatementLiteralSyntax literal &&
+                (children[1] is CSharpExplicitExpressionSyntax || children[1] is CSharpImplicitExpressionSyntax))
             {
-                newBlock.Children.Add(node);
+                var containsNonWhitespace = literal.DescendantNodes()
+                    .Where(n => n.IsToken)
+                    .Cast<SyntaxToken>()
+                    .Any(t => !string.IsNullOrWhiteSpace(t.Content));
+
+                if (!containsNonWhitespace)
+                {
+                    // Literal node is all whitespace. Can rewrite.
+                    whitespaceLiteral = SyntaxFactory.MarkupTextLiteral(literal.LiteralTokens);
+                    rewritten = codeBlock.ReplaceNode(literal, newNode: null);
+                    return true;
+                }
             }
-            return newBlock.Build();
+
+            return false;
         }
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj
index 2cb75415c1..1fd7aeebf5 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Microsoft.AspNetCore.Razor.Language.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor parser and code generation infrastructure.</Description>
-    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Properties/AssemblyInfo.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Properties/AssemblyInfo.cs
index 7214d8baca..b749fc7ce3 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Properties/AssemblyInfo.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Properties/AssemblyInfo.cs
@@ -2,24 +2,29 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Runtime.CompilerServices;
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.GenerateTool, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Language.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.TagHelperTool, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Tools.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("rzls, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("rzc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.GenerateTool, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.TagHelperTool, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Remote.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.RazorExtension, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Language.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Tools.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeDocumentExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeDocumentExtensions.cs
index dafc33983f..6b0a9fde9e 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeDocumentExtensions.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeDocumentExtensions.cs
@@ -169,6 +169,26 @@ namespace Microsoft.AspNetCore.Razor.Language
             document.Items[typeof(RazorCodeGenerationOptions)] = codeGenerationOptions;
         }
 
+        public static string GetInputDocumentKind(this RazorCodeDocument document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            return (string)document.Items[typeof(InputDocumentKind)];
+        }
+
+        public static void SetInputDocumentKind(this RazorCodeDocument document, string kind)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            document.Items[typeof(InputDocumentKind)] = kind;
+        }
+
         private class ImportSyntaxTreesHolder
         {
             public ImportSyntaxTreesHolder(IReadOnlyList<RazorSyntaxTree> syntaxTrees)
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptions.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptions.cs
index 60da959c2d..ad0a7bc95a 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptions.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptions.cs
@@ -14,7 +14,8 @@ namespace Microsoft.AspNetCore.Razor.Language
                 indentSize: 4,
                 designTime: false,
                 suppressChecksum: false,
-                supressMetadataAttributes: false);
+                supressMetadataAttributes: false,
+                suppressPrimaryMethodBody: false);
         }
 
         public static RazorCodeGenerationOptions CreateDesignTimeDefault()
@@ -24,7 +25,8 @@ namespace Microsoft.AspNetCore.Razor.Language
                 indentSize: 4,
                 designTime: true,
                 suppressChecksum: false,
-                supressMetadataAttributes: true);
+                supressMetadataAttributes: true,
+                suppressPrimaryMethodBody: false);
         }
 
         public static RazorCodeGenerationOptions Create(Action<RazorCodeGenerationOptionsBuilder> configure)
@@ -93,5 +95,10 @@ namespace Microsoft.AspNetCore.Razor.Language
         /// </para>
         /// </remarks>
         public virtual bool SuppressMetadataAttributes { get; protected set; }
+
+        /// <summary>
+        /// Gets or sets a value that determines if an empty body is generated for the primary method.
+        /// </summary>
+        public virtual bool SuppressPrimaryMethodBody { get; protected set; }
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptionsBuilder.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptionsBuilder.cs
index be4c9dff3d..c1a34e1c33 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptionsBuilder.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorCodeGenerationOptionsBuilder.cs
@@ -42,6 +42,11 @@ namespace Microsoft.AspNetCore.Razor.Language
         /// </remarks>
         public virtual bool SuppressMetadataAttributes { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value that determines if an empty body is generated for the primary method.
+        /// </summary>
+        public virtual bool SuppressPrimaryMethodBody { get; set; }
+
         public abstract RazorCodeGenerationOptions Build();
 
         public virtual void SetDesignTime(bool designTime)
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorLanguageVersion.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorLanguageVersion.cs
index 8a9c70740a..5d34d258f8 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorLanguageVersion.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorLanguageVersion.cs
@@ -17,7 +17,9 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public static readonly RazorLanguageVersion Version_2_1 = new RazorLanguageVersion(2, 1);
 
-        public static readonly RazorLanguageVersion Latest = Version_2_1;
+        public static readonly RazorLanguageVersion Version_3_0 = new RazorLanguageVersion(3, 0);
+
+        public static readonly RazorLanguageVersion Latest = Version_3_0;
 
         public static readonly RazorLanguageVersion Experimental = new RazorLanguageVersion(1337, 1337);
 
@@ -30,7 +32,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             if (string.Equals(languageVersion, "latest", StringComparison.OrdinalIgnoreCase))
             {
-                version = Version_2_1;
+                version = Latest;
                 return true;
             }
             else if (string.Equals(languageVersion, "experimental", StringComparison.OrdinalIgnoreCase))
@@ -38,6 +40,11 @@ namespace Microsoft.AspNetCore.Razor.Language
                 version = Experimental;
                 return true;
             }
+            else if (languageVersion == "3.0")
+            {
+                version = Version_3_0;
+                return true;
+            }
             else if (languageVersion == "2.1")
             {
                 version = Version_2_1;
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorProjectEngine.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorProjectEngine.cs
index a36b80d4b0..d37936dbd6 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorProjectEngine.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorProjectEngine.cs
@@ -3,8 +3,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
 
 namespace Microsoft.AspNetCore.Razor.Language
@@ -176,6 +176,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             features.Add(new DirectiveRemovalOptimizationPass());
             features.Add(new DefaultTagHelperOptimizationPass());
             features.Add(new PreallocatedTagHelperAttributeOptimizationPass());
+            features.Add(new EliminateMethodBodyPass());
 
             // Default Code Target Extensions
             var targetExtensionFeature = new DefaultRazorTargetExtensionFeature();
@@ -217,10 +218,15 @@ namespace Microsoft.AspNetCore.Razor.Language
                 // For now we only handle AssemblyExtension - which is not user-constructable. We're keeping a tight
                 // lid on how things work until we add official support for extensibility everywhere. So, this is
                 // intentionally inflexible for the time being.
-                var extension = extensions[i] as AssemblyExtension;
-                var initializer = extension?.CreateInitializer();
-                initializer?.Initialize(builder);
+                if (extensions[i] is AssemblyExtension extension)
+                {
+                    var initializer = extension.CreateInitializer();
+                    initializer?.Initialize(builder);
+                }
             }
+
+            // Default extensions.
+            ComponentExtensions.Register(builder);
         }
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorSyntaxTree.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorSyntaxTree.cs
index 55a32ba1d3..340129b2aa 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorSyntaxTree.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/RazorSyntaxTree.cs
@@ -4,13 +4,14 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
     public abstract class RazorSyntaxTree
     {
         internal static RazorSyntaxTree Create(
-            Block root,
+            SyntaxNode root,
             RazorSourceDocument source,
             IEnumerable<RazorDiagnostic> diagnostics,
             RazorParserOptions options)
@@ -63,7 +64,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public abstract RazorParserOptions Options { get; }
 
-        internal abstract Block Root { get; }
+        internal abstract SyntaxNode Root { get; }
 
         public abstract RazorSourceDocument Source { get; }
     }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/SourceChange.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/SourceChange.cs
index 75e4b8e44e..bc5d96312f 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/SourceChange.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/SourceChange.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Language
@@ -51,15 +52,15 @@ namespace Microsoft.AspNetCore.Razor.Language
 
         public string NewText { get; }
 
-        internal string GetEditedContent(Span span)
+        internal string GetEditedContent(SyntaxNode node)
         {
-            if (span == null)
+            if (node == null)
             {
-                throw new ArgumentNullException(nameof(span));
+                throw new ArgumentNullException(nameof(node));
             }
 
-            var offset = GetOffset(span);
-            return GetEditedContent(span.Content, offset);
+            var offset = GetOffset(node);
+            return GetEditedContent(node.GetContent(), offset);
         }
 
         internal string GetEditedContent(string text, int offset)
@@ -72,41 +73,41 @@ namespace Microsoft.AspNetCore.Razor.Language
             return text.Remove(offset, Span.Length).Insert(offset, NewText);
         }
 
-        internal int GetOffset(Span span)
+        internal int GetOffset(SyntaxNode node)
         {
-            if (span == null)
+            if (node == null)
             {
-                throw new ArgumentNullException(nameof(span));
+                throw new ArgumentNullException(nameof(node));
             }
 
             var start = Span.AbsoluteIndex;
             var end = Span.AbsoluteIndex + Span.Length;
 
-            if (start < span.Start.AbsoluteIndex ||
-                start > span.Start.AbsoluteIndex + span.Length ||
-                end < span.Start.AbsoluteIndex || 
-                end > span.Start.AbsoluteIndex + span.Length)
+            if (start < node.Position ||
+                start > node.EndPosition ||
+                end < node.Position ||
+                end > node.EndPosition)
             {
-                throw new InvalidOperationException(Resources.FormatInvalidOperation_SpanIsNotChangeOwner(span, this));
+                throw new InvalidOperationException(Resources.FormatInvalidOperation_SpanIsNotChangeOwner(node, this));
             }
 
-            return start - span.Start.AbsoluteIndex;
+            return start - node.Position;
         }
 
-        internal string GetOriginalText(Span span)
+        internal string GetOriginalText(SyntaxNode node)
         {
-            if (span == null)
+            if (node == null)
             {
-                throw new ArgumentNullException(nameof(span));
+                throw new ArgumentNullException(nameof(node));
             }
 
-            if (span.Length == 0)
+            if (node.FullWidth == 0)
             {
                 return string.Empty;
             }
 
-            var offset = GetOffset(span);
-            return span.Content.Substring(offset, Span.Length);
+            var offset = GetOffset(node);
+            return node.GetContent().Substring(offset, Span.Length);
         }
 
         public bool Equals(SourceChange other)
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/ArrayElement.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/ArrayElement.cs
new file mode 100644
index 0000000000..85345e657b
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/ArrayElement.cs
@@ -0,0 +1,58 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal struct ArrayElement<T>
+    {
+        public T Value;
+
+        public static implicit operator T(ArrayElement<T> element)
+        {
+            return element.Value;
+        }
+
+        //NOTE: there is no opposite conversion operator T -> ArrayElement<T>
+        //
+        // that is because it is preferred to update array elements in-place
+        // "elements[i].Value = v" results in much better code than "elements[i] = (ArrayElement<T>)v"
+        //
+        // The reason is that x86 ABI requires that structs must be returned in
+        // a return buffer even if they can fit in a register like this one.
+        // Also since struct contains a reference, the write to the buffer is done with a checked GC barrier
+        // as JIT does not know if the write goes to a stack or a heap location.
+        // Assigning to Value directly easily avoids all this redundancy.
+
+        public static ArrayElement<T>[] MakeElementArray(T[] items)
+        {
+            if (items == null)
+            {
+                return null;
+            }
+
+            var array = new ArrayElement<T>[items.Length];
+            for (var i = 0; i < items.Length; i++)
+            {
+                array[i].Value = items[i];
+            }
+
+            return array;
+        }
+
+        public static T[] MakeArray(ArrayElement<T>[] items)
+        {
+            if (items == null)
+            {
+                return null;
+            }
+
+            var array = new T[items.Length];
+            for (var i = 0; i < items.Length; i++)
+            {
+                array[i] = items[i].Value;
+            }
+
+            return array;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/ChildSyntaxList.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/ChildSyntaxList.cs
new file mode 100644
index 0000000000..5671a5c9f0
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/ChildSyntaxList.cs
@@ -0,0 +1,710 @@
+// 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;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal readonly struct ChildSyntaxList : IEquatable<ChildSyntaxList>, IReadOnlyList<SyntaxNode>
+    {
+        private readonly SyntaxNode _node;
+        private readonly int _count;
+
+        internal ChildSyntaxList(SyntaxNode node)
+        {
+            _node = node;
+            _count = CountNodes(node.Green);
+        }
+
+        /// <summary>
+        /// Gets the number of children contained in the <see cref="ChildSyntaxList"/>.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                return _count;
+            }
+        }
+
+        internal static int CountNodes(GreenNode green)
+        {
+            var n = 0;
+
+            for (int i = 0, s = green.SlotCount; i < s; i++)
+            {
+                var child = green.GetSlot(i);
+                if (child != null)
+                {
+                    if (!child.IsList)
+                    {
+                        n++;
+                    }
+                    else
+                    {
+                        n += child.SlotCount;
+                    }
+                }
+            }
+
+            return n;
+        }
+
+        /// <summary>Gets the child at the specified index.</summary>
+        /// <param name="index">The zero-based index of the child to get.</param>
+        /// <exception cref="System.ArgumentOutOfRangeException">
+        ///   <paramref name="index"/> is less than 0.-or-<paramref name="index" /> is equal to or greater than <see cref="ChildSyntaxList.Count"/>. </exception>
+        public SyntaxNode this[int index]
+        {
+            get
+            {
+                if (unchecked((uint)index < (uint)_count))
+                {
+                    return ItemInternal(_node, index);
+                }
+
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+        }
+
+        internal SyntaxNode Node
+        {
+            get { return _node; }
+        }
+
+        private static int Occupancy(GreenNode green)
+        {
+            return green.IsList ? green.SlotCount : 1;
+        }
+
+        /// <summary>
+        /// internal indexer that does not verify index.
+        /// Used when caller has already ensured that index is within bounds.
+        /// </summary>
+        internal static SyntaxNode ItemInternal(SyntaxNode node, int index)
+        {
+            GreenNode greenChild;
+            var green = node.Green;
+            var idx = index;
+            var slotIndex = 0;
+            var position = node.Position;
+
+            // find a slot that contains the node or its parent list (if node is in a list)
+            // we will be skipping whole slots here so we will not loop for long
+            //
+            // at the end of this loop we will have
+            // 1) slot index - slotIdx
+            // 2) if the slot is a list, node index in the list - idx
+            // 3) slot position - position
+            while (true)
+            {
+                greenChild = green.GetSlot(slotIndex);
+                if (greenChild != null)
+                {
+                    var currentOccupancy = Occupancy(greenChild);
+                    if (idx < currentOccupancy)
+                    {
+                        break;
+                    }
+
+                    idx -= currentOccupancy;
+                    position += greenChild.FullWidth;
+                }
+
+                slotIndex++;
+            }
+
+            // get node that represents this slot
+            var red = node.GetNodeSlot(slotIndex);
+            if (!greenChild.IsList)
+            {
+                // this is a single node
+                // if it is a node, we are done
+                if (red != null)
+                {
+                    return red;
+                }
+            }
+            else if (red != null)
+            {
+                // it is a red list of nodes (separated or not), most common case
+                var redChild = red.GetNodeSlot(idx);
+                if (redChild != null)
+                {
+                    // this is our node
+                    return redChild;
+                }
+            }
+
+            return node;
+        }
+
+        /// <summary>
+        /// Locate the node that is a child of the given <see cref="SyntaxNode"/> and contains the given position.
+        /// </summary>
+        /// <param name="node">The <see cref="SyntaxNode"/> to search.</param>
+        /// <param name="targetPosition">The position.</param>
+        /// <returns>The node that spans the given position.</returns>
+        /// <remarks>
+        /// Assumes that <paramref name="targetPosition"/> is within the span of <paramref name="node"/>.
+        /// </remarks>
+        internal static SyntaxNode ChildThatContainsPosition(SyntaxNode node, int targetPosition)
+        {
+            // The targetPosition must already be within this node
+            Debug.Assert(node.FullSpan.Contains(targetPosition));
+
+            var green = node.Green;
+            var position = node.Position;
+            var index = 0;
+
+            Debug.Assert(!green.IsList);
+
+            // Find the green node that spans the target position.
+            // We will be skipping whole slots here so we will not loop for long
+            int slot;
+            for (slot = 0; ; slot++)
+            {
+                var greenChild = green.GetSlot(slot);
+                if (greenChild != null)
+                {
+                    var endPosition = position + greenChild.FullWidth;
+                    if (targetPosition < endPosition)
+                    {
+                        // Descend into the child element
+                        green = greenChild;
+                        break;
+                    }
+
+                    position = endPosition;
+                    index += Occupancy(greenChild);
+                }
+            }
+
+            // Realize the red node (if any)
+            var red = node.GetNodeSlot(slot);
+            if (!green.IsList)
+            {
+                // This is a single node.
+                // If it is a node, we are done.
+                if (red != null)
+                {
+                    return red;
+                }
+            }
+            else
+            {
+                slot = green.FindSlotIndexContainingOffset(targetPosition - position);
+
+                // Realize the red node (if any)
+                if (red != null)
+                {
+                    // It is a red list of nodes
+                    red = red.GetNodeSlot(slot);
+                    if (red != null)
+                    {
+                        return red;
+                    }
+                }
+
+                // Since we can't have "lists of lists", the Occupancy calculation for
+                // child elements in a list is simple.
+                index += slot;
+            }
+
+            return node;
+        }
+
+        /// <summary>
+        /// internal indexer that does not verify index.
+        /// Used when caller has already ensured that index is within bounds.
+        /// </summary>
+        internal static SyntaxNode ItemInternalAsNode(SyntaxNode node, int index)
+        {
+            GreenNode greenChild;
+            var green = node.Green;
+            var idx = index;
+            var slotIndex = 0;
+
+            // find a slot that contains the node or its parent list (if node is in a list)
+            // we will be skipping whole slots here so we will not loop for long
+            //
+            // at the end of this loop we will have
+            // 1) slot index - slotIdx
+            // 2) if the slot is a list, node index in the list - idx
+            while (true)
+            {
+                greenChild = green.GetSlot(slotIndex);
+                if (greenChild != null)
+                {
+                    var currentOccupancy = Occupancy(greenChild);
+                    if (idx < currentOccupancy)
+                    {
+                        break;
+                    }
+
+                    idx -= currentOccupancy;
+                }
+
+                slotIndex++;
+            }
+
+            // get node that represents this slot
+            var red = node.GetNodeSlot(slotIndex);
+            if (greenChild.IsList && red != null)
+            {
+                // it is a red list of nodes, most common case
+                return red.GetNodeSlot(idx);
+            }
+
+            // this is a single node
+            return red;
+        }
+
+        // for debugging
+        private SyntaxNode[] Nodes
+        {
+            get
+            {
+                return this.ToArray();
+            }
+        }
+
+        public bool Any()
+        {
+            return _count != 0;
+        }
+
+        /// <summary>
+        /// Returns the first child in the list.
+        /// </summary>
+        /// <returns>The first child in the list.</returns>
+        /// <exception cref="System.InvalidOperationException">The list is empty.</exception>    
+        public SyntaxNode First()
+        {
+            if (Any())
+            {
+                return this[0];
+            }
+
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        /// Returns the last child in the list.
+        /// </summary>
+        /// <returns>The last child in the list.</returns>
+        /// <exception cref="System.InvalidOperationException">The list is empty.</exception>    
+        public SyntaxNode Last()
+        {
+            if (Any())
+            {
+                return this[_count - 1];
+            }
+
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        /// Returns a list which contains all children of <see cref="ChildSyntaxList"/> in reversed order.
+        /// </summary>
+        /// <returns><see cref="Reversed"/> which contains all children of <see cref="ChildSyntaxList"/> in reversed order</returns>
+        public Reversed Reverse()
+        {
+            return new Reversed(_node, _count);
+        }
+
+        /// <summary>Returns an enumerator that iterates through the <see cref="ChildSyntaxList"/>.</summary>
+        /// <returns>A <see cref="Enumerator"/> for the <see cref="ChildSyntaxList"/>.</returns>
+        public Enumerator GetEnumerator()
+        {
+            if (_node == null)
+            {
+                return default;
+            }
+
+            return new Enumerator(_node, _count);
+        }
+
+        IEnumerator<SyntaxNode> IEnumerable<SyntaxNode>.GetEnumerator()
+        {
+            if (_node == null)
+            {
+                return EmptyEnumerator<SyntaxNode>.Instance;
+            }
+
+            return new EnumeratorImpl(_node, _count);
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            if (_node == null)
+            {
+                return EmptyEnumerator<SyntaxNode>.Instance;
+            }
+
+            return new EnumeratorImpl(_node, _count);
+        }
+
+        /// <summary>Determines whether the specified object is equal to the current instance.</summary>
+        /// <returns>true if the specified object is a <see cref="ChildSyntaxList" /> structure and is equal to the current instance; otherwise, false.</returns>
+        /// <param name="obj">The object to be compared with the current instance.</param>
+        public override bool Equals(object obj)
+        {
+            return obj is ChildSyntaxList && Equals((ChildSyntaxList)obj);
+        }
+
+        /// <summary>Determines whether the specified <see cref="ChildSyntaxList" /> structure is equal to the current instance.</summary>
+        /// <returns>true if the specified <see cref="ChildSyntaxList" /> structure is equal to the current instance; otherwise, false.</returns>
+        /// <param name="other">The <see cref="ChildSyntaxList" /> structure to be compared with the current instance.</param>
+        public bool Equals(ChildSyntaxList other)
+        {
+            return _node == other._node;
+        }
+
+        /// <summary>Returns the hash code for the current instance.</summary>
+        /// <returns>A 32-bit signed integer hash code.</returns>
+        public override int GetHashCode()
+        {
+            return _node?.GetHashCode() ?? 0;
+        }
+
+        /// <summary>Indicates whether two <see cref="ChildSyntaxList" /> structures are equal.</summary>
+        /// <returns>true if <paramref name="list1" /> is equal to <paramref name="list2" />; otherwise, false.</returns>
+        /// <param name="list1">The <see cref="ChildSyntaxList" /> structure on the left side of the equality operator.</param>
+        /// <param name="list2">The <see cref="ChildSyntaxList" /> structure on the right side of the equality operator.</param>
+        public static bool operator ==(ChildSyntaxList list1, ChildSyntaxList list2)
+        {
+            return list1.Equals(list2);
+        }
+
+        /// <summary>Indicates whether two <see cref="ChildSyntaxList" /> structures are unequal.</summary>
+        /// <returns>true if <paramref name="list1" /> is equal to <paramref name="list2" />; otherwise, false.</returns>
+        /// <param name="list1">The <see cref="ChildSyntaxList" /> structure on the left side of the inequality operator.</param>
+        /// <param name="list2">The <see cref="ChildSyntaxList" /> structure on the right side of the inequality operator.</param>
+        public static bool operator !=(ChildSyntaxList list1, ChildSyntaxList list2)
+        {
+            return !list1.Equals(list2);
+        }
+
+        /// <summary>Enumerates the elements of a <see cref="ChildSyntaxList" />.</summary>
+        public struct Enumerator
+        {
+            private SyntaxNode _node;
+            private int _count;
+            private int _childIndex;
+
+            internal Enumerator(SyntaxNode node, int count)
+            {
+                _node = node;
+                _count = count;
+                _childIndex = -1;
+            }
+
+            // PERF: Initialize an Enumerator directly from a SyntaxNode without going
+            // via ChildNodes. This saves constructing an intermediate ChildSyntaxList
+            internal void InitializeFrom(SyntaxNode node)
+            {
+                _node = node;
+                _count = CountNodes(node.Green);
+                _childIndex = -1;
+            }
+
+            /// <summary>Advances the enumerator to the next element of the <see cref="ChildSyntaxList" />.</summary>
+            /// <returns>true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.</returns>
+            public bool MoveNext()
+            {
+                var newIndex = _childIndex + 1;
+                if (newIndex < _count)
+                {
+                    _childIndex = newIndex;
+                    return true;
+                }
+
+                return false;
+            }
+
+            /// <summary>Gets the element at the current position of the enumerator.</summary>
+            /// <returns>The element in the <see cref="ChildSyntaxList" /> at the current position of the enumerator.</returns>
+            public SyntaxNode Current
+            {
+                get
+                {
+                    return ItemInternal(_node, _childIndex);
+                }
+            }
+
+            /// <summary>Sets the enumerator to its initial position, which is before the first element in the collection.</summary>
+            public void Reset()
+            {
+                _childIndex = -1;
+            }
+
+            internal bool TryMoveNextAndGetCurrent(out SyntaxNode current)
+            {
+                if (!MoveNext())
+                {
+                    current = default;
+                    return false;
+                }
+
+                current = ItemInternal(_node, _childIndex);
+                return true;
+            }
+
+            internal SyntaxNode TryMoveNextAndGetCurrentAsNode()
+            {
+                while (MoveNext())
+                {
+                    var nodeValue = ItemInternalAsNode(_node, _childIndex);
+                    if (nodeValue != null)
+                    {
+                        return nodeValue;
+                    }
+                }
+
+                return null;
+            }
+        }
+
+        private class EnumeratorImpl : IEnumerator<SyntaxNode>
+        {
+            private Enumerator _enumerator;
+
+            internal EnumeratorImpl(SyntaxNode node, int count)
+            {
+                _enumerator = new Enumerator(node, count);
+            }
+
+            /// <summary>
+            /// Gets the element in the collection at the current position of the enumerator.
+            /// </summary>
+            /// <returns>
+            /// The element in the collection at the current position of the enumerator.
+            ///   </returns>
+            public SyntaxNode Current
+            {
+                get { return _enumerator.Current; }
+            }
+
+            /// <summary>
+            /// Gets the element in the collection at the current position of the enumerator.
+            /// </summary>
+            /// <returns>
+            /// The element in the collection at the current position of the enumerator.
+            ///   </returns>
+            object IEnumerator.Current
+            {
+                get { return _enumerator.Current; }
+            }
+
+            /// <summary>
+            /// Advances the enumerator to the next element of the collection.
+            /// </summary>
+            /// <returns>
+            /// true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.
+            /// </returns>
+            public bool MoveNext()
+            {
+                return _enumerator.MoveNext();
+            }
+
+            /// <summary>
+            /// Sets the enumerator to its initial position, which is before the first element in the collection.
+            /// </summary>
+            public void Reset()
+            {
+                _enumerator.Reset();
+            }
+
+            /// <summary>
+            /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+            /// </summary>
+            public void Dispose()
+            { }
+        }
+
+        public readonly partial struct Reversed : IEnumerable<SyntaxNode>, IEquatable<Reversed>
+        {
+            private readonly SyntaxNode _node;
+            private readonly int _count;
+
+            internal Reversed(SyntaxNode node, int count)
+            {
+                _node = node;
+                _count = count;
+            }
+
+            public Enumerator GetEnumerator()
+            {
+                return new Enumerator(_node, _count);
+            }
+
+            IEnumerator<SyntaxNode> IEnumerable<SyntaxNode>.GetEnumerator()
+            {
+                if (_node == null)
+                {
+                    return EmptyEnumerator<SyntaxNode>.Instance;
+                }
+
+                return new EnumeratorImpl(_node, _count);
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                if (_node == null)
+                {
+                    return EmptyEnumerator<SyntaxNode>.Instance;
+                }
+
+                return new EnumeratorImpl(_node, _count);
+            }
+
+            public override int GetHashCode()
+            {
+                if (_node == null)
+                {
+                    return 0;
+                }
+
+                var hash = HashCodeCombiner.Start();
+                hash.Add(_node.GetHashCode());
+                hash.Add(_count);
+                return hash.CombinedHash;
+            }
+
+            public override bool Equals(object obj)
+            {
+                return (obj is Reversed) && Equals((Reversed)obj);
+            }
+
+            public bool Equals(Reversed other)
+            {
+                return _node == other._node
+                    && _count == other._count;
+            }
+
+            public struct Enumerator
+            {
+                private readonly SyntaxNode _node;
+                private readonly int _count;
+                private int _childIndex;
+
+                internal Enumerator(SyntaxNode node, int count)
+                {
+                    _node = node;
+                    _count = count;
+                    _childIndex = count;
+                }
+
+                public bool MoveNext()
+                {
+                    return --_childIndex >= 0;
+                }
+
+                public SyntaxNode Current
+                {
+                    get
+                    {
+                        return ItemInternal(_node, _childIndex);
+                    }
+                }
+
+                public void Reset()
+                {
+                    _childIndex = _count;
+                }
+            }
+
+            private class EnumeratorImpl : IEnumerator<SyntaxNode>
+            {
+                private Enumerator _enumerator;
+
+                internal EnumeratorImpl(SyntaxNode node, int count)
+                {
+                    _enumerator = new Enumerator(node, count);
+                }
+
+                /// <summary>
+                /// Gets the element in the collection at the current position of the enumerator.
+                /// </summary>
+                /// <returns>
+                /// The element in the collection at the current position of the enumerator.
+                ///   </returns>
+                public SyntaxNode Current
+                {
+                    get { return _enumerator.Current; }
+                }
+
+                /// <summary>
+                /// Gets the element in the collection at the current position of the enumerator.
+                /// </summary>
+                /// <returns>
+                /// The element in the collection at the current position of the enumerator.
+                ///   </returns>
+                object IEnumerator.Current
+                {
+                    get { return _enumerator.Current; }
+                }
+
+                /// <summary>
+                /// Advances the enumerator to the next element of the collection.
+                /// </summary>
+                /// <returns>
+                /// true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.
+                /// </returns>
+                /// <exception cref="InvalidOperationException">The collection was modified after the enumerator was created. </exception>
+                public bool MoveNext()
+                {
+                    return _enumerator.MoveNext();
+                }
+
+                /// <summary>
+                /// Sets the enumerator to its initial position, which is before the first element in the collection.
+                /// </summary>
+                /// <exception cref="InvalidOperationException">The collection was modified after the enumerator was created. </exception>
+                public void Reset()
+                {
+                    _enumerator.Reset();
+                }
+
+                /// <summary>
+                /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+                /// </summary>
+                public void Dispose()
+                { }
+            }
+        }
+
+        internal class EmptyEnumerator<T> : IEnumerator<T>
+        {
+            public static readonly IEnumerator<T> Instance = new EmptyEnumerator<T>();
+
+            protected EmptyEnumerator()
+            {
+            }
+
+            public T Current => throw new InvalidOperationException();
+
+            object IEnumerator.Current => throw new NotImplementedException();
+
+            public void Dispose()
+            {
+            }
+
+            public bool MoveNext()
+            {
+                return false;
+            }
+
+            public void Reset()
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/Generated/Syntax.xml.Internal.Generated.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/Generated/Syntax.xml.Internal.Generated.cs
new file mode 100644
index 0000000000..1849a7b410
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/Generated/Syntax.xml.Internal.Generated.cs
@@ -0,0 +1,4264 @@
+// <auto-generated />
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+  internal abstract partial class RazorBlockSyntax : RazorSyntaxNode
+  {
+    internal RazorBlockSyntax(SyntaxKind kind, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+      : base(kind, diagnostics, annotations)
+    {
+    }
+    internal RazorBlockSyntax(SyntaxKind kind)
+      : base(kind)
+    {
+    }
+
+    public abstract SyntaxList<RazorSyntaxNode> Children { get; }
+  }
+
+  internal sealed partial class RazorDocumentSyntax : RazorSyntaxNode
+  {
+    private readonly RazorBlockSyntax _document;
+
+    internal RazorDocumentSyntax(SyntaxKind kind, RazorBlockSyntax document, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        AdjustFlagsAndWidth(document);
+        _document = document;
+    }
+
+
+    internal RazorDocumentSyntax(SyntaxKind kind, RazorBlockSyntax document)
+        : base(kind)
+    {
+        SlotCount = 1;
+        AdjustFlagsAndWidth(document);
+        _document = document;
+    }
+
+    public RazorBlockSyntax Document { get { return _document; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _document;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.RazorDocumentSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorDocument(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorDocument(this);
+    }
+
+    public RazorDocumentSyntax Update(RazorBlockSyntax document)
+    {
+        if (document != Document)
+        {
+            var newNode = SyntaxFactory.RazorDocument(document);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new RazorDocumentSyntax(Kind, _document, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new RazorDocumentSyntax(Kind, _document, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class RazorCommentBlockSyntax : RazorSyntaxNode
+  {
+    private readonly SyntaxToken _startCommentTransition;
+    private readonly SyntaxToken _startCommentStar;
+    private readonly SyntaxToken _comment;
+    private readonly SyntaxToken _endCommentStar;
+    private readonly SyntaxToken _endCommentTransition;
+
+    internal RazorCommentBlockSyntax(SyntaxKind kind, SyntaxToken startCommentTransition, SyntaxToken startCommentStar, SyntaxToken comment, SyntaxToken endCommentStar, SyntaxToken endCommentTransition, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 5;
+        AdjustFlagsAndWidth(startCommentTransition);
+        _startCommentTransition = startCommentTransition;
+        AdjustFlagsAndWidth(startCommentStar);
+        _startCommentStar = startCommentStar;
+        AdjustFlagsAndWidth(comment);
+        _comment = comment;
+        AdjustFlagsAndWidth(endCommentStar);
+        _endCommentStar = endCommentStar;
+        AdjustFlagsAndWidth(endCommentTransition);
+        _endCommentTransition = endCommentTransition;
+    }
+
+
+    internal RazorCommentBlockSyntax(SyntaxKind kind, SyntaxToken startCommentTransition, SyntaxToken startCommentStar, SyntaxToken comment, SyntaxToken endCommentStar, SyntaxToken endCommentTransition)
+        : base(kind)
+    {
+        SlotCount = 5;
+        AdjustFlagsAndWidth(startCommentTransition);
+        _startCommentTransition = startCommentTransition;
+        AdjustFlagsAndWidth(startCommentStar);
+        _startCommentStar = startCommentStar;
+        AdjustFlagsAndWidth(comment);
+        _comment = comment;
+        AdjustFlagsAndWidth(endCommentStar);
+        _endCommentStar = endCommentStar;
+        AdjustFlagsAndWidth(endCommentTransition);
+        _endCommentTransition = endCommentTransition;
+    }
+
+    public SyntaxToken StartCommentTransition { get { return _startCommentTransition; } }
+    public SyntaxToken StartCommentStar { get { return _startCommentStar; } }
+    public SyntaxToken Comment { get { return _comment; } }
+    public SyntaxToken EndCommentStar { get { return _endCommentStar; } }
+    public SyntaxToken EndCommentTransition { get { return _endCommentTransition; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _startCommentTransition;
+            case 1: return _startCommentStar;
+            case 2: return _comment;
+            case 3: return _endCommentStar;
+            case 4: return _endCommentTransition;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.RazorCommentBlockSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorCommentBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorCommentBlock(this);
+    }
+
+    public RazorCommentBlockSyntax Update(SyntaxToken startCommentTransition, SyntaxToken startCommentStar, SyntaxToken comment, SyntaxToken endCommentStar, SyntaxToken endCommentTransition)
+    {
+        if (startCommentTransition != StartCommentTransition || startCommentStar != StartCommentStar || comment != Comment || endCommentStar != EndCommentStar || endCommentTransition != EndCommentTransition)
+        {
+            var newNode = SyntaxFactory.RazorCommentBlock(startCommentTransition, startCommentStar, comment, endCommentStar, endCommentTransition);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new RazorCommentBlockSyntax(Kind, _startCommentTransition, _startCommentStar, _comment, _endCommentStar, _endCommentTransition, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new RazorCommentBlockSyntax(Kind, _startCommentTransition, _startCommentStar, _comment, _endCommentStar, _endCommentTransition, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class RazorMetaCodeSyntax : RazorSyntaxNode
+  {
+    private readonly GreenNode _metaCode;
+
+    internal RazorMetaCodeSyntax(SyntaxKind kind, GreenNode metaCode, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (metaCode != null)
+        {
+            AdjustFlagsAndWidth(metaCode);
+            _metaCode = metaCode;
+        }
+    }
+
+
+    internal RazorMetaCodeSyntax(SyntaxKind kind, GreenNode metaCode)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (metaCode != null)
+        {
+            AdjustFlagsAndWidth(metaCode);
+            _metaCode = metaCode;
+        }
+    }
+
+    public SyntaxList<SyntaxToken> MetaCode { get { return new SyntaxList<SyntaxToken>(_metaCode); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _metaCode;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.RazorMetaCodeSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorMetaCode(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorMetaCode(this);
+    }
+
+    public RazorMetaCodeSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> metaCode)
+    {
+        if (metaCode != MetaCode)
+        {
+            var newNode = SyntaxFactory.RazorMetaCode(metaCode);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new RazorMetaCodeSyntax(Kind, _metaCode, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new RazorMetaCodeSyntax(Kind, _metaCode, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class GenericBlockSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal GenericBlockSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal GenericBlockSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.GenericBlockSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitGenericBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitGenericBlock(this);
+    }
+
+    public GenericBlockSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.GenericBlock(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new GenericBlockSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new GenericBlockSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class UnclassifiedTextLiteralSyntax : RazorSyntaxNode
+  {
+    private readonly GreenNode _literalTokens;
+
+    internal UnclassifiedTextLiteralSyntax(SyntaxKind kind, GreenNode literalTokens, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+
+    internal UnclassifiedTextLiteralSyntax(SyntaxKind kind, GreenNode literalTokens)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens { get { return new SyntaxList<SyntaxToken>(_literalTokens); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.UnclassifiedTextLiteralSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitUnclassifiedTextLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitUnclassifiedTextLiteral(this);
+    }
+
+    public UnclassifiedTextLiteralSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.UnclassifiedTextLiteral(literalTokens);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new UnclassifiedTextLiteralSyntax(Kind, _literalTokens, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new UnclassifiedTextLiteralSyntax(Kind, _literalTokens, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal abstract partial class MarkupSyntaxNode : RazorSyntaxNode
+  {
+    internal MarkupSyntaxNode(SyntaxKind kind, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+      : base(kind, diagnostics, annotations)
+    {
+    }
+    internal MarkupSyntaxNode(SyntaxKind kind)
+      : base(kind)
+    {
+    }
+  }
+
+  internal sealed partial class MarkupBlockSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal MarkupBlockSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal MarkupBlockSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupBlockSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupBlock(this);
+    }
+
+    public MarkupBlockSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupBlock(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupBlockSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupBlockSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupTransitionSyntax : MarkupSyntaxNode
+  {
+    private readonly GreenNode _transitionTokens;
+
+    internal MarkupTransitionSyntax(SyntaxKind kind, GreenNode transitionTokens, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (transitionTokens != null)
+        {
+            AdjustFlagsAndWidth(transitionTokens);
+            _transitionTokens = transitionTokens;
+        }
+    }
+
+
+    internal MarkupTransitionSyntax(SyntaxKind kind, GreenNode transitionTokens)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (transitionTokens != null)
+        {
+            AdjustFlagsAndWidth(transitionTokens);
+            _transitionTokens = transitionTokens;
+        }
+    }
+
+    public SyntaxList<SyntaxToken> TransitionTokens { get { return new SyntaxList<SyntaxToken>(_transitionTokens); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transitionTokens;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupTransitionSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTransition(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTransition(this);
+    }
+
+    public MarkupTransitionSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> transitionTokens)
+    {
+        if (transitionTokens != TransitionTokens)
+        {
+            var newNode = SyntaxFactory.MarkupTransition(transitionTokens);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupTransitionSyntax(Kind, _transitionTokens, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupTransitionSyntax(Kind, _transitionTokens, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupTextLiteralSyntax : MarkupSyntaxNode
+  {
+    private readonly GreenNode _literalTokens;
+
+    internal MarkupTextLiteralSyntax(SyntaxKind kind, GreenNode literalTokens, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+
+    internal MarkupTextLiteralSyntax(SyntaxKind kind, GreenNode literalTokens)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens { get { return new SyntaxList<SyntaxToken>(_literalTokens); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupTextLiteralSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTextLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTextLiteral(this);
+    }
+
+    public MarkupTextLiteralSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.MarkupTextLiteral(literalTokens);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupTextLiteralSyntax(Kind, _literalTokens, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupTextLiteralSyntax(Kind, _literalTokens, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupEphemeralTextLiteralSyntax : MarkupSyntaxNode
+  {
+    private readonly GreenNode _literalTokens;
+
+    internal MarkupEphemeralTextLiteralSyntax(SyntaxKind kind, GreenNode literalTokens, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+
+    internal MarkupEphemeralTextLiteralSyntax(SyntaxKind kind, GreenNode literalTokens)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens { get { return new SyntaxList<SyntaxToken>(_literalTokens); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupEphemeralTextLiteralSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupEphemeralTextLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupEphemeralTextLiteral(this);
+    }
+
+    public MarkupEphemeralTextLiteralSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.MarkupEphemeralTextLiteral(literalTokens);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupEphemeralTextLiteralSyntax(Kind, _literalTokens, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupEphemeralTextLiteralSyntax(Kind, _literalTokens, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupCommentBlockSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal MarkupCommentBlockSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal MarkupCommentBlockSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupCommentBlockSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupCommentBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupCommentBlock(this);
+    }
+
+    public MarkupCommentBlockSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupCommentBlock(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupCommentBlockSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupCommentBlockSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupTagBlockSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal MarkupTagBlockSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal MarkupTagBlockSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupTagBlockSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagBlock(this);
+    }
+
+    public MarkupTagBlockSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupTagBlock(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupTagBlockSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupTagBlockSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupMinimizedAttributeBlockSyntax : MarkupSyntaxNode
+  {
+    private readonly MarkupTextLiteralSyntax _namePrefix;
+    private readonly MarkupTextLiteralSyntax _name;
+
+    internal MarkupMinimizedAttributeBlockSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 2;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+    }
+
+
+    internal MarkupMinimizedAttributeBlockSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+        : base(kind)
+    {
+        SlotCount = 2;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix { get { return _namePrefix; } }
+    public MarkupTextLiteralSyntax Name { get { return _name; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _name;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupMinimizedAttributeBlockSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupMinimizedAttributeBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupMinimizedAttributeBlock(this);
+    }
+
+    public MarkupMinimizedAttributeBlockSyntax Update(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+    {
+        if (namePrefix != NamePrefix || name != Name)
+        {
+            var newNode = SyntaxFactory.MarkupMinimizedAttributeBlock(namePrefix, name);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupMinimizedAttributeBlockSyntax(Kind, _namePrefix, _name, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupMinimizedAttributeBlockSyntax(Kind, _namePrefix, _name, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupAttributeBlockSyntax : MarkupSyntaxNode
+  {
+    private readonly MarkupTextLiteralSyntax _namePrefix;
+    private readonly MarkupTextLiteralSyntax _name;
+    private readonly MarkupTextLiteralSyntax _nameSuffix;
+    private readonly SyntaxToken _equalsToken;
+    private readonly MarkupTextLiteralSyntax _valuePrefix;
+    private readonly RazorBlockSyntax _value;
+    private readonly MarkupTextLiteralSyntax _valueSuffix;
+
+    internal MarkupAttributeBlockSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, RazorBlockSyntax value, MarkupTextLiteralSyntax valueSuffix, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 7;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (nameSuffix != null)
+        {
+            AdjustFlagsAndWidth(nameSuffix);
+            _nameSuffix = nameSuffix;
+        }
+        AdjustFlagsAndWidth(equalsToken);
+        _equalsToken = equalsToken;
+        if (valuePrefix != null)
+        {
+            AdjustFlagsAndWidth(valuePrefix);
+            _valuePrefix = valuePrefix;
+        }
+        if (value != null)
+        {
+            AdjustFlagsAndWidth(value);
+            _value = value;
+        }
+        if (valueSuffix != null)
+        {
+            AdjustFlagsAndWidth(valueSuffix);
+            _valueSuffix = valueSuffix;
+        }
+    }
+
+
+    internal MarkupAttributeBlockSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, RazorBlockSyntax value, MarkupTextLiteralSyntax valueSuffix)
+        : base(kind)
+    {
+        SlotCount = 7;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (nameSuffix != null)
+        {
+            AdjustFlagsAndWidth(nameSuffix);
+            _nameSuffix = nameSuffix;
+        }
+        AdjustFlagsAndWidth(equalsToken);
+        _equalsToken = equalsToken;
+        if (valuePrefix != null)
+        {
+            AdjustFlagsAndWidth(valuePrefix);
+            _valuePrefix = valuePrefix;
+        }
+        if (value != null)
+        {
+            AdjustFlagsAndWidth(value);
+            _value = value;
+        }
+        if (valueSuffix != null)
+        {
+            AdjustFlagsAndWidth(valueSuffix);
+            _valueSuffix = valueSuffix;
+        }
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix { get { return _namePrefix; } }
+    public MarkupTextLiteralSyntax Name { get { return _name; } }
+    public MarkupTextLiteralSyntax NameSuffix { get { return _nameSuffix; } }
+    public SyntaxToken EqualsToken { get { return _equalsToken; } }
+    public MarkupTextLiteralSyntax ValuePrefix { get { return _valuePrefix; } }
+    public RazorBlockSyntax Value { get { return _value; } }
+    public MarkupTextLiteralSyntax ValueSuffix { get { return _valueSuffix; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _name;
+            case 2: return _nameSuffix;
+            case 3: return _equalsToken;
+            case 4: return _valuePrefix;
+            case 5: return _value;
+            case 6: return _valueSuffix;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupAttributeBlockSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupAttributeBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupAttributeBlock(this);
+    }
+
+    public MarkupAttributeBlockSyntax Update(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, RazorBlockSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+        if (namePrefix != NamePrefix || name != Name || nameSuffix != NameSuffix || equalsToken != EqualsToken || valuePrefix != ValuePrefix || value != Value || valueSuffix != ValueSuffix)
+        {
+            var newNode = SyntaxFactory.MarkupAttributeBlock(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupAttributeBlockSyntax(Kind, _namePrefix, _name, _nameSuffix, _equalsToken, _valuePrefix, _value, _valueSuffix, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupAttributeBlockSyntax(Kind, _namePrefix, _name, _nameSuffix, _equalsToken, _valuePrefix, _value, _valueSuffix, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupLiteralAttributeValueSyntax : MarkupSyntaxNode
+  {
+    private readonly MarkupTextLiteralSyntax _prefix;
+    private readonly MarkupTextLiteralSyntax _value;
+
+    internal MarkupLiteralAttributeValueSyntax(SyntaxKind kind, MarkupTextLiteralSyntax prefix, MarkupTextLiteralSyntax value, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 2;
+        if (prefix != null)
+        {
+            AdjustFlagsAndWidth(prefix);
+            _prefix = prefix;
+        }
+        if (value != null)
+        {
+            AdjustFlagsAndWidth(value);
+            _value = value;
+        }
+    }
+
+
+    internal MarkupLiteralAttributeValueSyntax(SyntaxKind kind, MarkupTextLiteralSyntax prefix, MarkupTextLiteralSyntax value)
+        : base(kind)
+    {
+        SlotCount = 2;
+        if (prefix != null)
+        {
+            AdjustFlagsAndWidth(prefix);
+            _prefix = prefix;
+        }
+        if (value != null)
+        {
+            AdjustFlagsAndWidth(value);
+            _value = value;
+        }
+    }
+
+    public MarkupTextLiteralSyntax Prefix { get { return _prefix; } }
+    public MarkupTextLiteralSyntax Value { get { return _value; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _prefix;
+            case 1: return _value;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupLiteralAttributeValueSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupLiteralAttributeValue(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupLiteralAttributeValue(this);
+    }
+
+    public MarkupLiteralAttributeValueSyntax Update(MarkupTextLiteralSyntax prefix, MarkupTextLiteralSyntax value)
+    {
+        if (prefix != Prefix || value != Value)
+        {
+            var newNode = SyntaxFactory.MarkupLiteralAttributeValue(prefix, value);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupLiteralAttributeValueSyntax(Kind, _prefix, _value, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupLiteralAttributeValueSyntax(Kind, _prefix, _value, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupDynamicAttributeValueSyntax : MarkupSyntaxNode
+  {
+    private readonly MarkupTextLiteralSyntax _prefix;
+    private readonly RazorBlockSyntax _value;
+
+    internal MarkupDynamicAttributeValueSyntax(SyntaxKind kind, MarkupTextLiteralSyntax prefix, RazorBlockSyntax value, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 2;
+        if (prefix != null)
+        {
+            AdjustFlagsAndWidth(prefix);
+            _prefix = prefix;
+        }
+        AdjustFlagsAndWidth(value);
+        _value = value;
+    }
+
+
+    internal MarkupDynamicAttributeValueSyntax(SyntaxKind kind, MarkupTextLiteralSyntax prefix, RazorBlockSyntax value)
+        : base(kind)
+    {
+        SlotCount = 2;
+        if (prefix != null)
+        {
+            AdjustFlagsAndWidth(prefix);
+            _prefix = prefix;
+        }
+        AdjustFlagsAndWidth(value);
+        _value = value;
+    }
+
+    public MarkupTextLiteralSyntax Prefix { get { return _prefix; } }
+    public RazorBlockSyntax Value { get { return _value; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _prefix;
+            case 1: return _value;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupDynamicAttributeValueSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupDynamicAttributeValue(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupDynamicAttributeValue(this);
+    }
+
+    public MarkupDynamicAttributeValueSyntax Update(MarkupTextLiteralSyntax prefix, RazorBlockSyntax value)
+    {
+        if (prefix != Prefix || value != Value)
+        {
+            var newNode = SyntaxFactory.MarkupDynamicAttributeValue(prefix, value);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupDynamicAttributeValueSyntax(Kind, _prefix, _value, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupDynamicAttributeValueSyntax(Kind, _prefix, _value, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupElementSyntax : MarkupSyntaxNode
+  {
+    private readonly MarkupTagBlockSyntax _startTag;
+    private readonly GreenNode _body;
+    private readonly MarkupTagBlockSyntax _endTag;
+
+    internal MarkupElementSyntax(SyntaxKind kind, MarkupTagBlockSyntax startTag, GreenNode body, MarkupTagBlockSyntax endTag, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 3;
+        if (startTag != null)
+        {
+            AdjustFlagsAndWidth(startTag);
+            _startTag = startTag;
+        }
+        if (body != null)
+        {
+            AdjustFlagsAndWidth(body);
+            _body = body;
+        }
+        if (endTag != null)
+        {
+            AdjustFlagsAndWidth(endTag);
+            _endTag = endTag;
+        }
+    }
+
+
+    internal MarkupElementSyntax(SyntaxKind kind, MarkupTagBlockSyntax startTag, GreenNode body, MarkupTagBlockSyntax endTag)
+        : base(kind)
+    {
+        SlotCount = 3;
+        if (startTag != null)
+        {
+            AdjustFlagsAndWidth(startTag);
+            _startTag = startTag;
+        }
+        if (body != null)
+        {
+            AdjustFlagsAndWidth(body);
+            _body = body;
+        }
+        if (endTag != null)
+        {
+            AdjustFlagsAndWidth(endTag);
+            _endTag = endTag;
+        }
+    }
+
+    public MarkupTagBlockSyntax StartTag { get { return _startTag; } }
+    public SyntaxList<RazorSyntaxNode> Body { get { return new SyntaxList<RazorSyntaxNode>(_body); } }
+    public MarkupTagBlockSyntax EndTag { get { return _endTag; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _startTag;
+            case 1: return _body;
+            case 2: return _endTag;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupElementSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupElement(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupElement(this);
+    }
+
+    public MarkupElementSyntax Update(MarkupTagBlockSyntax startTag, Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> body, MarkupTagBlockSyntax endTag)
+    {
+        if (startTag != StartTag || body != Body || endTag != EndTag)
+        {
+            var newNode = SyntaxFactory.MarkupElement(startTag, body, endTag);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupElementSyntax(Kind, _startTag, _body, _endTag, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupElementSyntax(Kind, _startTag, _body, _endTag, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperElementSyntax : MarkupSyntaxNode
+  {
+    private readonly MarkupTagHelperStartTagSyntax _startTag;
+    private readonly GreenNode _body;
+    private readonly MarkupTagHelperEndTagSyntax _endTag;
+
+    internal MarkupTagHelperElementSyntax(SyntaxKind kind, MarkupTagHelperStartTagSyntax startTag, GreenNode body, MarkupTagHelperEndTagSyntax endTag, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 3;
+        AdjustFlagsAndWidth(startTag);
+        _startTag = startTag;
+        if (body != null)
+        {
+            AdjustFlagsAndWidth(body);
+            _body = body;
+        }
+        if (endTag != null)
+        {
+            AdjustFlagsAndWidth(endTag);
+            _endTag = endTag;
+        }
+    }
+
+
+    internal MarkupTagHelperElementSyntax(SyntaxKind kind, MarkupTagHelperStartTagSyntax startTag, GreenNode body, MarkupTagHelperEndTagSyntax endTag)
+        : base(kind)
+    {
+        SlotCount = 3;
+        AdjustFlagsAndWidth(startTag);
+        _startTag = startTag;
+        if (body != null)
+        {
+            AdjustFlagsAndWidth(body);
+            _body = body;
+        }
+        if (endTag != null)
+        {
+            AdjustFlagsAndWidth(endTag);
+            _endTag = endTag;
+        }
+    }
+
+    public MarkupTagHelperStartTagSyntax StartTag { get { return _startTag; } }
+    public SyntaxList<RazorSyntaxNode> Body { get { return new SyntaxList<RazorSyntaxNode>(_body); } }
+    public MarkupTagHelperEndTagSyntax EndTag { get { return _endTag; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _startTag;
+            case 1: return _body;
+            case 2: return _endTag;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupTagHelperElementSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperElement(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperElement(this);
+    }
+
+    public MarkupTagHelperElementSyntax Update(MarkupTagHelperStartTagSyntax startTag, Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> body, MarkupTagHelperEndTagSyntax endTag)
+    {
+        if (startTag != StartTag || body != Body || endTag != EndTag)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperElement(startTag, body, endTag);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupTagHelperElementSyntax(Kind, _startTag, _body, _endTag, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupTagHelperElementSyntax(Kind, _startTag, _body, _endTag, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperStartTagSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal MarkupTagHelperStartTagSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal MarkupTagHelperStartTagSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupTagHelperStartTagSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperStartTag(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperStartTag(this);
+    }
+
+    public MarkupTagHelperStartTagSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperStartTag(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupTagHelperStartTagSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupTagHelperStartTagSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperEndTagSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal MarkupTagHelperEndTagSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal MarkupTagHelperEndTagSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupTagHelperEndTagSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperEndTag(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperEndTag(this);
+    }
+
+    public MarkupTagHelperEndTagSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperEndTag(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupTagHelperEndTagSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupTagHelperEndTagSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperAttributeSyntax : MarkupSyntaxNode
+  {
+    private readonly MarkupTextLiteralSyntax _namePrefix;
+    private readonly MarkupTextLiteralSyntax _name;
+    private readonly MarkupTextLiteralSyntax _nameSuffix;
+    private readonly SyntaxToken _equalsToken;
+    private readonly MarkupTextLiteralSyntax _valuePrefix;
+    private readonly MarkupTagHelperAttributeValueSyntax _value;
+    private readonly MarkupTextLiteralSyntax _valueSuffix;
+
+    internal MarkupTagHelperAttributeSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 7;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (nameSuffix != null)
+        {
+            AdjustFlagsAndWidth(nameSuffix);
+            _nameSuffix = nameSuffix;
+        }
+        AdjustFlagsAndWidth(equalsToken);
+        _equalsToken = equalsToken;
+        if (valuePrefix != null)
+        {
+            AdjustFlagsAndWidth(valuePrefix);
+            _valuePrefix = valuePrefix;
+        }
+        AdjustFlagsAndWidth(value);
+        _value = value;
+        if (valueSuffix != null)
+        {
+            AdjustFlagsAndWidth(valueSuffix);
+            _valueSuffix = valueSuffix;
+        }
+    }
+
+
+    internal MarkupTagHelperAttributeSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
+        : base(kind)
+    {
+        SlotCount = 7;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+        if (nameSuffix != null)
+        {
+            AdjustFlagsAndWidth(nameSuffix);
+            _nameSuffix = nameSuffix;
+        }
+        AdjustFlagsAndWidth(equalsToken);
+        _equalsToken = equalsToken;
+        if (valuePrefix != null)
+        {
+            AdjustFlagsAndWidth(valuePrefix);
+            _valuePrefix = valuePrefix;
+        }
+        AdjustFlagsAndWidth(value);
+        _value = value;
+        if (valueSuffix != null)
+        {
+            AdjustFlagsAndWidth(valueSuffix);
+            _valueSuffix = valueSuffix;
+        }
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix { get { return _namePrefix; } }
+    public MarkupTextLiteralSyntax Name { get { return _name; } }
+    public MarkupTextLiteralSyntax NameSuffix { get { return _nameSuffix; } }
+    public SyntaxToken EqualsToken { get { return _equalsToken; } }
+    public MarkupTextLiteralSyntax ValuePrefix { get { return _valuePrefix; } }
+    public MarkupTagHelperAttributeValueSyntax Value { get { return _value; } }
+    public MarkupTextLiteralSyntax ValueSuffix { get { return _valueSuffix; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _name;
+            case 2: return _nameSuffix;
+            case 3: return _equalsToken;
+            case 4: return _valuePrefix;
+            case 5: return _value;
+            case 6: return _valueSuffix;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupTagHelperAttributeSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperAttribute(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperAttribute(this);
+    }
+
+    public MarkupTagHelperAttributeSyntax Update(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+        if (namePrefix != NamePrefix || name != Name || nameSuffix != NameSuffix || equalsToken != EqualsToken || valuePrefix != ValuePrefix || value != Value || valueSuffix != ValueSuffix)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperAttribute(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupTagHelperAttributeSyntax(Kind, _namePrefix, _name, _nameSuffix, _equalsToken, _valuePrefix, _value, _valueSuffix, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupTagHelperAttributeSyntax(Kind, _namePrefix, _name, _nameSuffix, _equalsToken, _valuePrefix, _value, _valueSuffix, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupMinimizedTagHelperAttributeSyntax : MarkupSyntaxNode
+  {
+    private readonly MarkupTextLiteralSyntax _namePrefix;
+    private readonly MarkupTextLiteralSyntax _name;
+
+    internal MarkupMinimizedTagHelperAttributeSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 2;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+    }
+
+
+    internal MarkupMinimizedTagHelperAttributeSyntax(SyntaxKind kind, MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+        : base(kind)
+    {
+        SlotCount = 2;
+        if (namePrefix != null)
+        {
+            AdjustFlagsAndWidth(namePrefix);
+            _namePrefix = namePrefix;
+        }
+        AdjustFlagsAndWidth(name);
+        _name = name;
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix { get { return _namePrefix; } }
+    public MarkupTextLiteralSyntax Name { get { return _name; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _name;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupMinimizedTagHelperAttributeSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupMinimizedTagHelperAttribute(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupMinimizedTagHelperAttribute(this);
+    }
+
+    public MarkupMinimizedTagHelperAttributeSyntax Update(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+    {
+        if (namePrefix != NamePrefix || name != Name)
+        {
+            var newNode = SyntaxFactory.MarkupMinimizedTagHelperAttribute(namePrefix, name);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupMinimizedTagHelperAttributeSyntax(Kind, _namePrefix, _name, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupMinimizedTagHelperAttributeSyntax(Kind, _namePrefix, _name, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperAttributeValueSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal MarkupTagHelperAttributeValueSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal MarkupTagHelperAttributeValueSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.MarkupTagHelperAttributeValueSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperAttributeValue(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperAttributeValue(this);
+    }
+
+    public MarkupTagHelperAttributeValueSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperAttributeValue(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new MarkupTagHelperAttributeValueSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new MarkupTagHelperAttributeValueSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal abstract partial class CSharpSyntaxNode : RazorSyntaxNode
+  {
+    internal CSharpSyntaxNode(SyntaxKind kind, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+      : base(kind, diagnostics, annotations)
+    {
+    }
+    internal CSharpSyntaxNode(SyntaxKind kind)
+      : base(kind)
+    {
+    }
+  }
+
+  internal sealed partial class CSharpCodeBlockSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal CSharpCodeBlockSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal CSharpCodeBlockSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpCodeBlockSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpCodeBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpCodeBlock(this);
+    }
+
+    public CSharpCodeBlockSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.CSharpCodeBlock(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpCodeBlockSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpCodeBlockSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpTransitionSyntax : CSharpSyntaxNode
+  {
+    private readonly SyntaxToken _transition;
+
+    internal CSharpTransitionSyntax(SyntaxKind kind, SyntaxToken transition, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+    }
+
+
+    internal CSharpTransitionSyntax(SyntaxKind kind, SyntaxToken transition)
+        : base(kind)
+    {
+        SlotCount = 1;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+    }
+
+    public SyntaxToken Transition { get { return _transition; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpTransitionSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpTransition(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpTransition(this);
+    }
+
+    public CSharpTransitionSyntax Update(SyntaxToken transition)
+    {
+        if (transition != Transition)
+        {
+            var newNode = SyntaxFactory.CSharpTransition(transition);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpTransitionSyntax(Kind, _transition, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpTransitionSyntax(Kind, _transition, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpStatementLiteralSyntax : CSharpSyntaxNode
+  {
+    private readonly GreenNode _literalTokens;
+
+    internal CSharpStatementLiteralSyntax(SyntaxKind kind, GreenNode literalTokens, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+
+    internal CSharpStatementLiteralSyntax(SyntaxKind kind, GreenNode literalTokens)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens { get { return new SyntaxList<SyntaxToken>(_literalTokens); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpStatementLiteralSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpStatementLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpStatementLiteral(this);
+    }
+
+    public CSharpStatementLiteralSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.CSharpStatementLiteral(literalTokens);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpStatementLiteralSyntax(Kind, _literalTokens, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpStatementLiteralSyntax(Kind, _literalTokens, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpExpressionLiteralSyntax : CSharpSyntaxNode
+  {
+    private readonly GreenNode _literalTokens;
+
+    internal CSharpExpressionLiteralSyntax(SyntaxKind kind, GreenNode literalTokens, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+
+    internal CSharpExpressionLiteralSyntax(SyntaxKind kind, GreenNode literalTokens)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens { get { return new SyntaxList<SyntaxToken>(_literalTokens); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpExpressionLiteralSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpExpressionLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpExpressionLiteral(this);
+    }
+
+    public CSharpExpressionLiteralSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.CSharpExpressionLiteral(literalTokens);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpExpressionLiteralSyntax(Kind, _literalTokens, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpExpressionLiteralSyntax(Kind, _literalTokens, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpEphemeralTextLiteralSyntax : CSharpSyntaxNode
+  {
+    private readonly GreenNode _literalTokens;
+
+    internal CSharpEphemeralTextLiteralSyntax(SyntaxKind kind, GreenNode literalTokens, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+
+    internal CSharpEphemeralTextLiteralSyntax(SyntaxKind kind, GreenNode literalTokens)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (literalTokens != null)
+        {
+            AdjustFlagsAndWidth(literalTokens);
+            _literalTokens = literalTokens;
+        }
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens { get { return new SyntaxList<SyntaxToken>(_literalTokens); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpEphemeralTextLiteralSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpEphemeralTextLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpEphemeralTextLiteral(this);
+    }
+
+    public CSharpEphemeralTextLiteralSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.CSharpEphemeralTextLiteral(literalTokens);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpEphemeralTextLiteralSyntax(Kind, _literalTokens, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpEphemeralTextLiteralSyntax(Kind, _literalTokens, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpTemplateBlockSyntax : RazorBlockSyntax
+  {
+    private readonly GreenNode _children;
+
+    internal CSharpTemplateBlockSyntax(SyntaxKind kind, GreenNode children, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+
+    internal CSharpTemplateBlockSyntax(SyntaxKind kind, GreenNode children)
+        : base(kind)
+    {
+        SlotCount = 1;
+        if (children != null)
+        {
+            AdjustFlagsAndWidth(children);
+            _children = children;
+        }
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children { get { return new SyntaxList<RazorSyntaxNode>(_children); } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpTemplateBlockSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpTemplateBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpTemplateBlock(this);
+    }
+
+    public CSharpTemplateBlockSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.CSharpTemplateBlock(children);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpTemplateBlockSyntax(Kind, _children, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpTemplateBlockSyntax(Kind, _children, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal abstract partial class CSharpRazorBlockSyntax : CSharpSyntaxNode
+  {
+    internal CSharpRazorBlockSyntax(SyntaxKind kind, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+      : base(kind, diagnostics, annotations)
+    {
+    }
+    internal CSharpRazorBlockSyntax(SyntaxKind kind)
+      : base(kind)
+    {
+    }
+
+    public abstract CSharpTransitionSyntax Transition { get; }
+
+    public abstract CSharpSyntaxNode Body { get; }
+  }
+
+  internal sealed partial class CSharpStatementSyntax : CSharpRazorBlockSyntax
+  {
+    private readonly CSharpTransitionSyntax _transition;
+    private readonly CSharpSyntaxNode _body;
+
+    internal CSharpStatementSyntax(SyntaxKind kind, CSharpTransitionSyntax transition, CSharpSyntaxNode body, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(body);
+        _body = body;
+    }
+
+
+    internal CSharpStatementSyntax(SyntaxKind kind, CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+        : base(kind)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(body);
+        _body = body;
+    }
+
+    public override CSharpTransitionSyntax Transition { get { return _transition; } }
+    public override CSharpSyntaxNode Body { get { return _body; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            case 1: return _body;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpStatementSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpStatement(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpStatement(this);
+    }
+
+    public CSharpStatementSyntax Update(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+        if (transition != Transition || body != Body)
+        {
+            var newNode = SyntaxFactory.CSharpStatement(transition, body);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpStatementSyntax(Kind, _transition, _body, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpStatementSyntax(Kind, _transition, _body, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpStatementBodySyntax : CSharpSyntaxNode
+  {
+    private readonly RazorMetaCodeSyntax _openBrace;
+    private readonly CSharpCodeBlockSyntax _cSharpCode;
+    private readonly RazorMetaCodeSyntax _closeBrace;
+
+    internal CSharpStatementBodySyntax(SyntaxKind kind, RazorMetaCodeSyntax openBrace, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeBrace, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 3;
+        AdjustFlagsAndWidth(openBrace);
+        _openBrace = openBrace;
+        AdjustFlagsAndWidth(cSharpCode);
+        _cSharpCode = cSharpCode;
+        AdjustFlagsAndWidth(closeBrace);
+        _closeBrace = closeBrace;
+    }
+
+
+    internal CSharpStatementBodySyntax(SyntaxKind kind, RazorMetaCodeSyntax openBrace, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeBrace)
+        : base(kind)
+    {
+        SlotCount = 3;
+        AdjustFlagsAndWidth(openBrace);
+        _openBrace = openBrace;
+        AdjustFlagsAndWidth(cSharpCode);
+        _cSharpCode = cSharpCode;
+        AdjustFlagsAndWidth(closeBrace);
+        _closeBrace = closeBrace;
+    }
+
+    public RazorMetaCodeSyntax OpenBrace { get { return _openBrace; } }
+    public CSharpCodeBlockSyntax CSharpCode { get { return _cSharpCode; } }
+    public RazorMetaCodeSyntax CloseBrace { get { return _closeBrace; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _openBrace;
+            case 1: return _cSharpCode;
+            case 2: return _closeBrace;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpStatementBodySyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpStatementBody(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpStatementBody(this);
+    }
+
+    public CSharpStatementBodySyntax Update(RazorMetaCodeSyntax openBrace, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeBrace)
+    {
+        if (openBrace != OpenBrace || cSharpCode != CSharpCode || closeBrace != CloseBrace)
+        {
+            var newNode = SyntaxFactory.CSharpStatementBody(openBrace, cSharpCode, closeBrace);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpStatementBodySyntax(Kind, _openBrace, _cSharpCode, _closeBrace, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpStatementBodySyntax(Kind, _openBrace, _cSharpCode, _closeBrace, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpExplicitExpressionSyntax : CSharpRazorBlockSyntax
+  {
+    private readonly CSharpTransitionSyntax _transition;
+    private readonly CSharpSyntaxNode _body;
+
+    internal CSharpExplicitExpressionSyntax(SyntaxKind kind, CSharpTransitionSyntax transition, CSharpSyntaxNode body, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(body);
+        _body = body;
+    }
+
+
+    internal CSharpExplicitExpressionSyntax(SyntaxKind kind, CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+        : base(kind)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(body);
+        _body = body;
+    }
+
+    public override CSharpTransitionSyntax Transition { get { return _transition; } }
+    public override CSharpSyntaxNode Body { get { return _body; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            case 1: return _body;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpExplicitExpressionSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpExplicitExpression(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpExplicitExpression(this);
+    }
+
+    public CSharpExplicitExpressionSyntax Update(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+        if (transition != Transition || body != Body)
+        {
+            var newNode = SyntaxFactory.CSharpExplicitExpression(transition, body);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpExplicitExpressionSyntax(Kind, _transition, _body, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpExplicitExpressionSyntax(Kind, _transition, _body, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpExplicitExpressionBodySyntax : CSharpSyntaxNode
+  {
+    private readonly RazorMetaCodeSyntax _openParen;
+    private readonly CSharpCodeBlockSyntax _cSharpCode;
+    private readonly RazorMetaCodeSyntax _closeParen;
+
+    internal CSharpExplicitExpressionBodySyntax(SyntaxKind kind, RazorMetaCodeSyntax openParen, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeParen, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 3;
+        AdjustFlagsAndWidth(openParen);
+        _openParen = openParen;
+        AdjustFlagsAndWidth(cSharpCode);
+        _cSharpCode = cSharpCode;
+        AdjustFlagsAndWidth(closeParen);
+        _closeParen = closeParen;
+    }
+
+
+    internal CSharpExplicitExpressionBodySyntax(SyntaxKind kind, RazorMetaCodeSyntax openParen, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeParen)
+        : base(kind)
+    {
+        SlotCount = 3;
+        AdjustFlagsAndWidth(openParen);
+        _openParen = openParen;
+        AdjustFlagsAndWidth(cSharpCode);
+        _cSharpCode = cSharpCode;
+        AdjustFlagsAndWidth(closeParen);
+        _closeParen = closeParen;
+    }
+
+    public RazorMetaCodeSyntax OpenParen { get { return _openParen; } }
+    public CSharpCodeBlockSyntax CSharpCode { get { return _cSharpCode; } }
+    public RazorMetaCodeSyntax CloseParen { get { return _closeParen; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _openParen;
+            case 1: return _cSharpCode;
+            case 2: return _closeParen;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpExplicitExpressionBodySyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpExplicitExpressionBody(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpExplicitExpressionBody(this);
+    }
+
+    public CSharpExplicitExpressionBodySyntax Update(RazorMetaCodeSyntax openParen, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeParen)
+    {
+        if (openParen != OpenParen || cSharpCode != CSharpCode || closeParen != CloseParen)
+        {
+            var newNode = SyntaxFactory.CSharpExplicitExpressionBody(openParen, cSharpCode, closeParen);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpExplicitExpressionBodySyntax(Kind, _openParen, _cSharpCode, _closeParen, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpExplicitExpressionBodySyntax(Kind, _openParen, _cSharpCode, _closeParen, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpImplicitExpressionSyntax : CSharpRazorBlockSyntax
+  {
+    private readonly CSharpTransitionSyntax _transition;
+    private readonly CSharpSyntaxNode _body;
+
+    internal CSharpImplicitExpressionSyntax(SyntaxKind kind, CSharpTransitionSyntax transition, CSharpSyntaxNode body, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(body);
+        _body = body;
+    }
+
+
+    internal CSharpImplicitExpressionSyntax(SyntaxKind kind, CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+        : base(kind)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(body);
+        _body = body;
+    }
+
+    public override CSharpTransitionSyntax Transition { get { return _transition; } }
+    public override CSharpSyntaxNode Body { get { return _body; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            case 1: return _body;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpImplicitExpressionSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpImplicitExpression(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpImplicitExpression(this);
+    }
+
+    public CSharpImplicitExpressionSyntax Update(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+        if (transition != Transition || body != Body)
+        {
+            var newNode = SyntaxFactory.CSharpImplicitExpression(transition, body);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpImplicitExpressionSyntax(Kind, _transition, _body, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpImplicitExpressionSyntax(Kind, _transition, _body, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class CSharpImplicitExpressionBodySyntax : CSharpSyntaxNode
+  {
+    private readonly CSharpCodeBlockSyntax _cSharpCode;
+
+    internal CSharpImplicitExpressionBodySyntax(SyntaxKind kind, CSharpCodeBlockSyntax cSharpCode, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 1;
+        AdjustFlagsAndWidth(cSharpCode);
+        _cSharpCode = cSharpCode;
+    }
+
+
+    internal CSharpImplicitExpressionBodySyntax(SyntaxKind kind, CSharpCodeBlockSyntax cSharpCode)
+        : base(kind)
+    {
+        SlotCount = 1;
+        AdjustFlagsAndWidth(cSharpCode);
+        _cSharpCode = cSharpCode;
+    }
+
+    public CSharpCodeBlockSyntax CSharpCode { get { return _cSharpCode; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _cSharpCode;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.CSharpImplicitExpressionBodySyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpImplicitExpressionBody(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpImplicitExpressionBody(this);
+    }
+
+    public CSharpImplicitExpressionBodySyntax Update(CSharpCodeBlockSyntax cSharpCode)
+    {
+        if (cSharpCode != CSharpCode)
+        {
+            var newNode = SyntaxFactory.CSharpImplicitExpressionBody(cSharpCode);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new CSharpImplicitExpressionBodySyntax(Kind, _cSharpCode, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new CSharpImplicitExpressionBodySyntax(Kind, _cSharpCode, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class RazorDirectiveSyntax : CSharpRazorBlockSyntax
+  {
+    private readonly CSharpTransitionSyntax _transition;
+    private readonly CSharpSyntaxNode _body;
+
+    internal RazorDirectiveSyntax(SyntaxKind kind, CSharpTransitionSyntax transition, CSharpSyntaxNode body, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(body);
+        _body = body;
+    }
+
+
+    internal RazorDirectiveSyntax(SyntaxKind kind, CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+        : base(kind)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(transition);
+        _transition = transition;
+        AdjustFlagsAndWidth(body);
+        _body = body;
+    }
+
+    public override CSharpTransitionSyntax Transition { get { return _transition; } }
+    public override CSharpSyntaxNode Body { get { return _body; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            case 1: return _body;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.RazorDirectiveSyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorDirective(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorDirective(this);
+    }
+
+    public RazorDirectiveSyntax Update(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+        if (transition != Transition || body != Body)
+        {
+            var newNode = SyntaxFactory.RazorDirective(transition, body);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new RazorDirectiveSyntax(Kind, _transition, _body, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new RazorDirectiveSyntax(Kind, _transition, _body, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal sealed partial class RazorDirectiveBodySyntax : CSharpSyntaxNode
+  {
+    private readonly RazorSyntaxNode _keyword;
+    private readonly CSharpCodeBlockSyntax _cSharpCode;
+
+    internal RazorDirectiveBodySyntax(SyntaxKind kind, RazorSyntaxNode keyword, CSharpCodeBlockSyntax cSharpCode, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+        : base(kind, diagnostics, annotations)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(keyword);
+        _keyword = keyword;
+        if (cSharpCode != null)
+        {
+            AdjustFlagsAndWidth(cSharpCode);
+            _cSharpCode = cSharpCode;
+        }
+    }
+
+
+    internal RazorDirectiveBodySyntax(SyntaxKind kind, RazorSyntaxNode keyword, CSharpCodeBlockSyntax cSharpCode)
+        : base(kind)
+    {
+        SlotCount = 2;
+        AdjustFlagsAndWidth(keyword);
+        _keyword = keyword;
+        if (cSharpCode != null)
+        {
+            AdjustFlagsAndWidth(cSharpCode);
+            _cSharpCode = cSharpCode;
+        }
+    }
+
+    public RazorSyntaxNode Keyword { get { return _keyword; } }
+    public CSharpCodeBlockSyntax CSharpCode { get { return _cSharpCode; } }
+
+    internal override GreenNode GetSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _keyword;
+            case 1: return _cSharpCode;
+            default: return null;
+        }
+    }
+
+    internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+    {
+      return new Syntax.RazorDirectiveBodySyntax(this, parent, position);
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorDirectiveBody(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorDirectiveBody(this);
+    }
+
+    public RazorDirectiveBodySyntax Update(RazorSyntaxNode keyword, CSharpCodeBlockSyntax cSharpCode)
+    {
+        if (keyword != Keyword || cSharpCode != CSharpCode)
+        {
+            var newNode = SyntaxFactory.RazorDirectiveBody(keyword, cSharpCode);
+            var diags = GetDiagnostics();
+            if (diags != null && diags.Length > 0)
+               newNode = newNode.WithDiagnosticsGreen(diags);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               newNode = newNode.WithAnnotationsGreen(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+    {
+         return new RazorDirectiveBodySyntax(Kind, _keyword, _cSharpCode, diagnostics, GetAnnotations());
+    }
+
+    internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+    {
+         return new RazorDirectiveBodySyntax(Kind, _keyword, _cSharpCode, GetDiagnostics(), annotations);
+    }
+  }
+
+  internal partial class SyntaxVisitor<TResult>
+  {
+    public virtual TResult VisitRazorDocument(RazorDocumentSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitRazorCommentBlock(RazorCommentBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitRazorMetaCode(RazorMetaCodeSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitGenericBlock(GenericBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitUnclassifiedTextLiteral(UnclassifiedTextLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupBlock(MarkupBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupTransition(MarkupTransitionSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupEphemeralTextLiteral(MarkupEphemeralTextLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupCommentBlock(MarkupCommentBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupAttributeBlock(MarkupAttributeBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupElement(MarkupElementSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupTagHelperEndTag(MarkupTagHelperEndTagSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupMinimizedTagHelperAttribute(MarkupMinimizedTagHelperAttributeSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitMarkupTagHelperAttributeValue(MarkupTagHelperAttributeValueSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpTransition(CSharpTransitionSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpEphemeralTextLiteral(CSharpEphemeralTextLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpTemplateBlock(CSharpTemplateBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpStatement(CSharpStatementSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpStatementBody(CSharpStatementBodySyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpExplicitExpressionBody(CSharpExplicitExpressionBodySyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitCSharpImplicitExpressionBody(CSharpImplicitExpressionBodySyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitRazorDirective(RazorDirectiveSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    public virtual TResult VisitRazorDirectiveBody(RazorDirectiveBodySyntax node)
+    {
+      return DefaultVisit(node);
+    }
+  }
+
+
+  internal partial class SyntaxVisitor
+  {
+    public virtual void VisitRazorDocument(RazorDocumentSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitRazorCommentBlock(RazorCommentBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitRazorMetaCode(RazorMetaCodeSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitGenericBlock(GenericBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitUnclassifiedTextLiteral(UnclassifiedTextLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupBlock(MarkupBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupTransition(MarkupTransitionSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupEphemeralTextLiteral(MarkupEphemeralTextLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupCommentBlock(MarkupCommentBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupAttributeBlock(MarkupAttributeBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupElement(MarkupElementSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupTagHelperEndTag(MarkupTagHelperEndTagSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupMinimizedTagHelperAttribute(MarkupMinimizedTagHelperAttributeSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitMarkupTagHelperAttributeValue(MarkupTagHelperAttributeValueSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpTransition(CSharpTransitionSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpEphemeralTextLiteral(CSharpEphemeralTextLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpTemplateBlock(CSharpTemplateBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpStatement(CSharpStatementSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpStatementBody(CSharpStatementBodySyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpExplicitExpressionBody(CSharpExplicitExpressionBodySyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitCSharpImplicitExpressionBody(CSharpImplicitExpressionBodySyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitRazorDirective(RazorDirectiveSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    public virtual void VisitRazorDirectiveBody(RazorDirectiveBodySyntax node)
+    {
+      DefaultVisit(node);
+    }
+  }
+
+  internal partial class SyntaxRewriter : SyntaxVisitor<GreenNode>
+  {
+    public override GreenNode VisitRazorDocument(RazorDocumentSyntax node)
+    {
+      var document = (RazorBlockSyntax)Visit(node.Document);
+      return node.Update(document);
+    }
+
+    public override GreenNode VisitRazorCommentBlock(RazorCommentBlockSyntax node)
+    {
+      var startCommentTransition = (SyntaxToken)Visit(node.StartCommentTransition);
+      var startCommentStar = (SyntaxToken)Visit(node.StartCommentStar);
+      var comment = (SyntaxToken)Visit(node.Comment);
+      var endCommentStar = (SyntaxToken)Visit(node.EndCommentStar);
+      var endCommentTransition = (SyntaxToken)Visit(node.EndCommentTransition);
+      return node.Update(startCommentTransition, startCommentStar, comment, endCommentStar, endCommentTransition);
+    }
+
+    public override GreenNode VisitRazorMetaCode(RazorMetaCodeSyntax node)
+    {
+      var metaCode = VisitList(node.MetaCode);
+      return node.Update(metaCode);
+    }
+
+    public override GreenNode VisitGenericBlock(GenericBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitUnclassifiedTextLiteral(UnclassifiedTextLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override GreenNode VisitMarkupBlock(MarkupBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitMarkupTransition(MarkupTransitionSyntax node)
+    {
+      var transitionTokens = VisitList(node.TransitionTokens);
+      return node.Update(transitionTokens);
+    }
+
+    public override GreenNode VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override GreenNode VisitMarkupEphemeralTextLiteral(MarkupEphemeralTextLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override GreenNode VisitMarkupCommentBlock(MarkupCommentBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      return node.Update(namePrefix, name);
+    }
+
+    public override GreenNode VisitMarkupAttributeBlock(MarkupAttributeBlockSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      var nameSuffix = (MarkupTextLiteralSyntax)Visit(node.NameSuffix);
+      var equalsToken = (SyntaxToken)Visit(node.EqualsToken);
+      var valuePrefix = (MarkupTextLiteralSyntax)Visit(node.ValuePrefix);
+      var value = (RazorBlockSyntax)Visit(node.Value);
+      var valueSuffix = (MarkupTextLiteralSyntax)Visit(node.ValueSuffix);
+      return node.Update(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+    }
+
+    public override GreenNode VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
+    {
+      var prefix = (MarkupTextLiteralSyntax)Visit(node.Prefix);
+      var value = (MarkupTextLiteralSyntax)Visit(node.Value);
+      return node.Update(prefix, value);
+    }
+
+    public override GreenNode VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
+    {
+      var prefix = (MarkupTextLiteralSyntax)Visit(node.Prefix);
+      var value = (RazorBlockSyntax)Visit(node.Value);
+      return node.Update(prefix, value);
+    }
+
+    public override GreenNode VisitMarkupElement(MarkupElementSyntax node)
+    {
+      var startTag = (MarkupTagBlockSyntax)Visit(node.StartTag);
+      var body = VisitList(node.Body);
+      var endTag = (MarkupTagBlockSyntax)Visit(node.EndTag);
+      return node.Update(startTag, body, endTag);
+    }
+
+    public override GreenNode VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+    {
+      var startTag = (MarkupTagHelperStartTagSyntax)Visit(node.StartTag);
+      var body = VisitList(node.Body);
+      var endTag = (MarkupTagHelperEndTagSyntax)Visit(node.EndTag);
+      return node.Update(startTag, body, endTag);
+    }
+
+    public override GreenNode VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitMarkupTagHelperEndTag(MarkupTagHelperEndTagSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      var nameSuffix = (MarkupTextLiteralSyntax)Visit(node.NameSuffix);
+      var equalsToken = (SyntaxToken)Visit(node.EqualsToken);
+      var valuePrefix = (MarkupTextLiteralSyntax)Visit(node.ValuePrefix);
+      var value = (MarkupTagHelperAttributeValueSyntax)Visit(node.Value);
+      var valueSuffix = (MarkupTextLiteralSyntax)Visit(node.ValueSuffix);
+      return node.Update(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+    }
+
+    public override GreenNode VisitMarkupMinimizedTagHelperAttribute(MarkupMinimizedTagHelperAttributeSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      return node.Update(namePrefix, name);
+    }
+
+    public override GreenNode VisitMarkupTagHelperAttributeValue(MarkupTagHelperAttributeValueSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitCSharpTransition(CSharpTransitionSyntax node)
+    {
+      var transition = (SyntaxToken)Visit(node.Transition);
+      return node.Update(transition);
+    }
+
+    public override GreenNode VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override GreenNode VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override GreenNode VisitCSharpEphemeralTextLiteral(CSharpEphemeralTextLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override GreenNode VisitCSharpTemplateBlock(CSharpTemplateBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override GreenNode VisitCSharpStatement(CSharpStatementSyntax node)
+    {
+      var transition = (CSharpTransitionSyntax)Visit(node.Transition);
+      var body = (CSharpSyntaxNode)Visit(node.Body);
+      return node.Update(transition, body);
+    }
+
+    public override GreenNode VisitCSharpStatementBody(CSharpStatementBodySyntax node)
+    {
+      var openBrace = (RazorMetaCodeSyntax)Visit(node.OpenBrace);
+      var cSharpCode = (CSharpCodeBlockSyntax)Visit(node.CSharpCode);
+      var closeBrace = (RazorMetaCodeSyntax)Visit(node.CloseBrace);
+      return node.Update(openBrace, cSharpCode, closeBrace);
+    }
+
+    public override GreenNode VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+    {
+      var transition = (CSharpTransitionSyntax)Visit(node.Transition);
+      var body = (CSharpSyntaxNode)Visit(node.Body);
+      return node.Update(transition, body);
+    }
+
+    public override GreenNode VisitCSharpExplicitExpressionBody(CSharpExplicitExpressionBodySyntax node)
+    {
+      var openParen = (RazorMetaCodeSyntax)Visit(node.OpenParen);
+      var cSharpCode = (CSharpCodeBlockSyntax)Visit(node.CSharpCode);
+      var closeParen = (RazorMetaCodeSyntax)Visit(node.CloseParen);
+      return node.Update(openParen, cSharpCode, closeParen);
+    }
+
+    public override GreenNode VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+    {
+      var transition = (CSharpTransitionSyntax)Visit(node.Transition);
+      var body = (CSharpSyntaxNode)Visit(node.Body);
+      return node.Update(transition, body);
+    }
+
+    public override GreenNode VisitCSharpImplicitExpressionBody(CSharpImplicitExpressionBodySyntax node)
+    {
+      var cSharpCode = (CSharpCodeBlockSyntax)Visit(node.CSharpCode);
+      return node.Update(cSharpCode);
+    }
+
+    public override GreenNode VisitRazorDirective(RazorDirectiveSyntax node)
+    {
+      var transition = (CSharpTransitionSyntax)Visit(node.Transition);
+      var body = (CSharpSyntaxNode)Visit(node.Body);
+      return node.Update(transition, body);
+    }
+
+    public override GreenNode VisitRazorDirectiveBody(RazorDirectiveBodySyntax node)
+    {
+      var keyword = (RazorSyntaxNode)Visit(node.Keyword);
+      var cSharpCode = (CSharpCodeBlockSyntax)Visit(node.CSharpCode);
+      return node.Update(keyword, cSharpCode);
+    }
+  }
+
+  internal static partial class SyntaxFactory
+  {
+    public static RazorDocumentSyntax RazorDocument(RazorBlockSyntax document)
+    {
+      if (document == null)
+        throw new ArgumentNullException(nameof(document));
+
+      var result = new RazorDocumentSyntax(SyntaxKind.RazorDocument, document);
+
+      return result;
+    }
+
+    public static RazorCommentBlockSyntax RazorCommentBlock(SyntaxToken startCommentTransition, SyntaxToken startCommentStar, SyntaxToken comment, SyntaxToken endCommentStar, SyntaxToken endCommentTransition)
+    {
+      if (startCommentTransition == null)
+        throw new ArgumentNullException(nameof(startCommentTransition));
+      switch (startCommentTransition.Kind)
+      {
+        case SyntaxKind.RazorCommentTransition:
+          break;
+        default:
+          throw new ArgumentException("startCommentTransition");
+      }
+      if (startCommentStar == null)
+        throw new ArgumentNullException(nameof(startCommentStar));
+      switch (startCommentStar.Kind)
+      {
+        case SyntaxKind.RazorCommentStar:
+          break;
+        default:
+          throw new ArgumentException("startCommentStar");
+      }
+      if (comment == null)
+        throw new ArgumentNullException(nameof(comment));
+      switch (comment.Kind)
+      {
+        case SyntaxKind.RazorCommentLiteral:
+          break;
+        default:
+          throw new ArgumentException("comment");
+      }
+      if (endCommentStar == null)
+        throw new ArgumentNullException(nameof(endCommentStar));
+      switch (endCommentStar.Kind)
+      {
+        case SyntaxKind.RazorCommentStar:
+          break;
+        default:
+          throw new ArgumentException("endCommentStar");
+      }
+      if (endCommentTransition == null)
+        throw new ArgumentNullException(nameof(endCommentTransition));
+      switch (endCommentTransition.Kind)
+      {
+        case SyntaxKind.RazorCommentTransition:
+          break;
+        default:
+          throw new ArgumentException("endCommentTransition");
+      }
+
+      return new RazorCommentBlockSyntax(SyntaxKind.RazorComment, startCommentTransition, startCommentStar, comment, endCommentStar, endCommentTransition);
+    }
+
+    public static RazorMetaCodeSyntax RazorMetaCode(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> metaCode)
+    {
+      var result = new RazorMetaCodeSyntax(SyntaxKind.RazorMetaCode, metaCode.Node);
+
+      return result;
+    }
+
+    public static GenericBlockSyntax GenericBlock(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new GenericBlockSyntax(SyntaxKind.GenericBlock, children.Node);
+
+      return result;
+    }
+
+    public static UnclassifiedTextLiteralSyntax UnclassifiedTextLiteral(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+      var result = new UnclassifiedTextLiteralSyntax(SyntaxKind.UnclassifiedTextLiteral, literalTokens.Node);
+
+      return result;
+    }
+
+    public static MarkupBlockSyntax MarkupBlock(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new MarkupBlockSyntax(SyntaxKind.MarkupBlock, children.Node);
+
+      return result;
+    }
+
+    public static MarkupTransitionSyntax MarkupTransition(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> transitionTokens)
+    {
+      var result = new MarkupTransitionSyntax(SyntaxKind.MarkupTransition, transitionTokens.Node);
+
+      return result;
+    }
+
+    public static MarkupTextLiteralSyntax MarkupTextLiteral(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+      var result = new MarkupTextLiteralSyntax(SyntaxKind.MarkupTextLiteral, literalTokens.Node);
+
+      return result;
+    }
+
+    public static MarkupEphemeralTextLiteralSyntax MarkupEphemeralTextLiteral(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+      var result = new MarkupEphemeralTextLiteralSyntax(SyntaxKind.MarkupEphemeralTextLiteral, literalTokens.Node);
+
+      return result;
+    }
+
+    public static MarkupCommentBlockSyntax MarkupCommentBlock(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new MarkupCommentBlockSyntax(SyntaxKind.MarkupCommentBlock, children.Node);
+
+      return result;
+    }
+
+    public static MarkupTagBlockSyntax MarkupTagBlock(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new MarkupTagBlockSyntax(SyntaxKind.MarkupTagBlock, children.Node);
+
+      return result;
+    }
+
+    public static MarkupMinimizedAttributeBlockSyntax MarkupMinimizedAttributeBlock(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+    {
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+
+      var result = new MarkupMinimizedAttributeBlockSyntax(SyntaxKind.MarkupMinimizedAttributeBlock, namePrefix, name);
+
+      return result;
+    }
+
+    public static MarkupAttributeBlockSyntax MarkupAttributeBlock(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, RazorBlockSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      if (equalsToken == null)
+        throw new ArgumentNullException(nameof(equalsToken));
+      switch (equalsToken.Kind)
+      {
+        case SyntaxKind.Equals:
+          break;
+        default:
+          throw new ArgumentException("equalsToken");
+      }
+
+      return new MarkupAttributeBlockSyntax(SyntaxKind.MarkupAttributeBlock, namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+    }
+
+    public static MarkupLiteralAttributeValueSyntax MarkupLiteralAttributeValue(MarkupTextLiteralSyntax prefix, MarkupTextLiteralSyntax value)
+    {
+      var result = new MarkupLiteralAttributeValueSyntax(SyntaxKind.MarkupLiteralAttributeValue, prefix, value);
+
+      return result;
+    }
+
+    public static MarkupDynamicAttributeValueSyntax MarkupDynamicAttributeValue(MarkupTextLiteralSyntax prefix, RazorBlockSyntax value)
+    {
+      if (value == null)
+        throw new ArgumentNullException(nameof(value));
+
+      var result = new MarkupDynamicAttributeValueSyntax(SyntaxKind.MarkupDynamicAttributeValue, prefix, value);
+
+      return result;
+    }
+
+    public static MarkupElementSyntax MarkupElement(MarkupTagBlockSyntax startTag, Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> body, MarkupTagBlockSyntax endTag)
+    {
+      var result = new MarkupElementSyntax(SyntaxKind.MarkupElement, startTag, body.Node, endTag);
+
+      return result;
+    }
+
+    public static MarkupTagHelperElementSyntax MarkupTagHelperElement(MarkupTagHelperStartTagSyntax startTag, Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> body, MarkupTagHelperEndTagSyntax endTag)
+    {
+      if (startTag == null)
+        throw new ArgumentNullException(nameof(startTag));
+
+      var result = new MarkupTagHelperElementSyntax(SyntaxKind.MarkupTagHelperElement, startTag, body.Node, endTag);
+
+      return result;
+    }
+
+    public static MarkupTagHelperStartTagSyntax MarkupTagHelperStartTag(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new MarkupTagHelperStartTagSyntax(SyntaxKind.MarkupTagHelperStartTag, children.Node);
+
+      return result;
+    }
+
+    public static MarkupTagHelperEndTagSyntax MarkupTagHelperEndTag(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new MarkupTagHelperEndTagSyntax(SyntaxKind.MarkupTagHelperEndTag, children.Node);
+
+      return result;
+    }
+
+    public static MarkupTagHelperAttributeSyntax MarkupTagHelperAttribute(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      if (equalsToken == null)
+        throw new ArgumentNullException(nameof(equalsToken));
+      switch (equalsToken.Kind)
+      {
+        case SyntaxKind.Equals:
+          break;
+        default:
+          throw new ArgumentException("equalsToken");
+      }
+      if (value == null)
+        throw new ArgumentNullException(nameof(value));
+
+      return new MarkupTagHelperAttributeSyntax(SyntaxKind.MarkupTagHelperAttribute, namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+    }
+
+    public static MarkupMinimizedTagHelperAttributeSyntax MarkupMinimizedTagHelperAttribute(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+    {
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+
+      var result = new MarkupMinimizedTagHelperAttributeSyntax(SyntaxKind.MarkupMinimizedTagHelperAttribute, namePrefix, name);
+
+      return result;
+    }
+
+    public static MarkupTagHelperAttributeValueSyntax MarkupTagHelperAttributeValue(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new MarkupTagHelperAttributeValueSyntax(SyntaxKind.MarkupTagHelperAttributeValue, children.Node);
+
+      return result;
+    }
+
+    public static CSharpCodeBlockSyntax CSharpCodeBlock(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new CSharpCodeBlockSyntax(SyntaxKind.CSharpCodeBlock, children.Node);
+
+      return result;
+    }
+
+    public static CSharpTransitionSyntax CSharpTransition(SyntaxToken transition)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      switch (transition.Kind)
+      {
+        case SyntaxKind.Transition:
+          break;
+        default:
+          throw new ArgumentException("transition");
+      }
+
+      var result = new CSharpTransitionSyntax(SyntaxKind.CSharpTransition, transition);
+
+      return result;
+    }
+
+    public static CSharpStatementLiteralSyntax CSharpStatementLiteral(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+      var result = new CSharpStatementLiteralSyntax(SyntaxKind.CSharpStatementLiteral, literalTokens.Node);
+
+      return result;
+    }
+
+    public static CSharpExpressionLiteralSyntax CSharpExpressionLiteral(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+      var result = new CSharpExpressionLiteralSyntax(SyntaxKind.CSharpExpressionLiteral, literalTokens.Node);
+
+      return result;
+    }
+
+    public static CSharpEphemeralTextLiteralSyntax CSharpEphemeralTextLiteral(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> literalTokens)
+    {
+      var result = new CSharpEphemeralTextLiteralSyntax(SyntaxKind.CSharpEphemeralTextLiteral, literalTokens.Node);
+
+      return result;
+    }
+
+    public static CSharpTemplateBlockSyntax CSharpTemplateBlock(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<RazorSyntaxNode> children)
+    {
+      var result = new CSharpTemplateBlockSyntax(SyntaxKind.CSharpTemplateBlock, children.Node);
+
+      return result;
+    }
+
+    public static CSharpStatementSyntax CSharpStatement(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (body == null)
+        throw new ArgumentNullException(nameof(body));
+
+      var result = new CSharpStatementSyntax(SyntaxKind.CSharpStatement, transition, body);
+
+      return result;
+    }
+
+    public static CSharpStatementBodySyntax CSharpStatementBody(RazorMetaCodeSyntax openBrace, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeBrace)
+    {
+      if (openBrace == null)
+        throw new ArgumentNullException(nameof(openBrace));
+      if (cSharpCode == null)
+        throw new ArgumentNullException(nameof(cSharpCode));
+      if (closeBrace == null)
+        throw new ArgumentNullException(nameof(closeBrace));
+
+      var result = new CSharpStatementBodySyntax(SyntaxKind.CSharpStatementBody, openBrace, cSharpCode, closeBrace);
+
+      return result;
+    }
+
+    public static CSharpExplicitExpressionSyntax CSharpExplicitExpression(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (body == null)
+        throw new ArgumentNullException(nameof(body));
+
+      var result = new CSharpExplicitExpressionSyntax(SyntaxKind.CSharpExplicitExpression, transition, body);
+
+      return result;
+    }
+
+    public static CSharpExplicitExpressionBodySyntax CSharpExplicitExpressionBody(RazorMetaCodeSyntax openParen, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeParen)
+    {
+      if (openParen == null)
+        throw new ArgumentNullException(nameof(openParen));
+      if (cSharpCode == null)
+        throw new ArgumentNullException(nameof(cSharpCode));
+      if (closeParen == null)
+        throw new ArgumentNullException(nameof(closeParen));
+
+      var result = new CSharpExplicitExpressionBodySyntax(SyntaxKind.CSharpExplicitExpressionBody, openParen, cSharpCode, closeParen);
+
+      return result;
+    }
+
+    public static CSharpImplicitExpressionSyntax CSharpImplicitExpression(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (body == null)
+        throw new ArgumentNullException(nameof(body));
+
+      var result = new CSharpImplicitExpressionSyntax(SyntaxKind.CSharpImplicitExpression, transition, body);
+
+      return result;
+    }
+
+    public static CSharpImplicitExpressionBodySyntax CSharpImplicitExpressionBody(CSharpCodeBlockSyntax cSharpCode)
+    {
+      if (cSharpCode == null)
+        throw new ArgumentNullException(nameof(cSharpCode));
+
+      var result = new CSharpImplicitExpressionBodySyntax(SyntaxKind.CSharpImplicitExpressionBody, cSharpCode);
+
+      return result;
+    }
+
+    public static RazorDirectiveSyntax RazorDirective(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (body == null)
+        throw new ArgumentNullException(nameof(body));
+
+      var result = new RazorDirectiveSyntax(SyntaxKind.RazorDirective, transition, body);
+
+      return result;
+    }
+
+    public static RazorDirectiveBodySyntax RazorDirectiveBody(RazorSyntaxNode keyword, CSharpCodeBlockSyntax cSharpCode)
+    {
+      if (keyword == null)
+        throw new ArgumentNullException(nameof(keyword));
+
+      var result = new RazorDirectiveBodySyntax(SyntaxKind.RazorDirectiveBody, keyword, cSharpCode);
+
+      return result;
+    }
+
+    internal static IEnumerable<Type> GetNodeTypes()
+    {
+        return new Type[] {
+           typeof(RazorDocumentSyntax),
+           typeof(RazorCommentBlockSyntax),
+           typeof(RazorMetaCodeSyntax),
+           typeof(GenericBlockSyntax),
+           typeof(UnclassifiedTextLiteralSyntax),
+           typeof(MarkupBlockSyntax),
+           typeof(MarkupTransitionSyntax),
+           typeof(MarkupTextLiteralSyntax),
+           typeof(MarkupEphemeralTextLiteralSyntax),
+           typeof(MarkupCommentBlockSyntax),
+           typeof(MarkupTagBlockSyntax),
+           typeof(MarkupMinimizedAttributeBlockSyntax),
+           typeof(MarkupAttributeBlockSyntax),
+           typeof(MarkupLiteralAttributeValueSyntax),
+           typeof(MarkupDynamicAttributeValueSyntax),
+           typeof(MarkupElementSyntax),
+           typeof(MarkupTagHelperElementSyntax),
+           typeof(MarkupTagHelperStartTagSyntax),
+           typeof(MarkupTagHelperEndTagSyntax),
+           typeof(MarkupTagHelperAttributeSyntax),
+           typeof(MarkupMinimizedTagHelperAttributeSyntax),
+           typeof(MarkupTagHelperAttributeValueSyntax),
+           typeof(CSharpCodeBlockSyntax),
+           typeof(CSharpTransitionSyntax),
+           typeof(CSharpStatementLiteralSyntax),
+           typeof(CSharpExpressionLiteralSyntax),
+           typeof(CSharpEphemeralTextLiteralSyntax),
+           typeof(CSharpTemplateBlockSyntax),
+           typeof(CSharpStatementSyntax),
+           typeof(CSharpStatementBodySyntax),
+           typeof(CSharpExplicitExpressionSyntax),
+           typeof(CSharpExplicitExpressionBodySyntax),
+           typeof(CSharpImplicitExpressionSyntax),
+           typeof(CSharpImplicitExpressionBodySyntax),
+           typeof(RazorDirectiveSyntax),
+           typeof(RazorDirectiveBodySyntax)
+        };
+    }
+  }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/Generated/Syntax.xml.Main.Generated.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/Generated/Syntax.xml.Main.Generated.cs
new file mode 100644
index 0000000000..b3c122bb05
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/Generated/Syntax.xml.Main.Generated.cs
@@ -0,0 +1,1246 @@
+// <auto-generated />
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+  internal partial class SyntaxVisitor<TResult>
+  {
+    /// <summary>Called when the visitor visits a RazorDocumentSyntax node.</summary>
+    public virtual TResult VisitRazorDocument(RazorDocumentSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a RazorCommentBlockSyntax node.</summary>
+    public virtual TResult VisitRazorCommentBlock(RazorCommentBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a RazorMetaCodeSyntax node.</summary>
+    public virtual TResult VisitRazorMetaCode(RazorMetaCodeSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a GenericBlockSyntax node.</summary>
+    public virtual TResult VisitGenericBlock(GenericBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a UnclassifiedTextLiteralSyntax node.</summary>
+    public virtual TResult VisitUnclassifiedTextLiteral(UnclassifiedTextLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupBlockSyntax node.</summary>
+    public virtual TResult VisitMarkupBlock(MarkupBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTransitionSyntax node.</summary>
+    public virtual TResult VisitMarkupTransition(MarkupTransitionSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTextLiteralSyntax node.</summary>
+    public virtual TResult VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupEphemeralTextLiteralSyntax node.</summary>
+    public virtual TResult VisitMarkupEphemeralTextLiteral(MarkupEphemeralTextLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupCommentBlockSyntax node.</summary>
+    public virtual TResult VisitMarkupCommentBlock(MarkupCommentBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagBlockSyntax node.</summary>
+    public virtual TResult VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupMinimizedAttributeBlockSyntax node.</summary>
+    public virtual TResult VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupAttributeBlockSyntax node.</summary>
+    public virtual TResult VisitMarkupAttributeBlock(MarkupAttributeBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupLiteralAttributeValueSyntax node.</summary>
+    public virtual TResult VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupDynamicAttributeValueSyntax node.</summary>
+    public virtual TResult VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupElementSyntax node.</summary>
+    public virtual TResult VisitMarkupElement(MarkupElementSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperElementSyntax node.</summary>
+    public virtual TResult VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperStartTagSyntax node.</summary>
+    public virtual TResult VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperEndTagSyntax node.</summary>
+    public virtual TResult VisitMarkupTagHelperEndTag(MarkupTagHelperEndTagSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperAttributeSyntax node.</summary>
+    public virtual TResult VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupMinimizedTagHelperAttributeSyntax node.</summary>
+    public virtual TResult VisitMarkupMinimizedTagHelperAttribute(MarkupMinimizedTagHelperAttributeSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperAttributeValueSyntax node.</summary>
+    public virtual TResult VisitMarkupTagHelperAttributeValue(MarkupTagHelperAttributeValueSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpCodeBlockSyntax node.</summary>
+    public virtual TResult VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpTransitionSyntax node.</summary>
+    public virtual TResult VisitCSharpTransition(CSharpTransitionSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpStatementLiteralSyntax node.</summary>
+    public virtual TResult VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpExpressionLiteralSyntax node.</summary>
+    public virtual TResult VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpEphemeralTextLiteralSyntax node.</summary>
+    public virtual TResult VisitCSharpEphemeralTextLiteral(CSharpEphemeralTextLiteralSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpTemplateBlockSyntax node.</summary>
+    public virtual TResult VisitCSharpTemplateBlock(CSharpTemplateBlockSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpStatementSyntax node.</summary>
+    public virtual TResult VisitCSharpStatement(CSharpStatementSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpStatementBodySyntax node.</summary>
+    public virtual TResult VisitCSharpStatementBody(CSharpStatementBodySyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpExplicitExpressionSyntax node.</summary>
+    public virtual TResult VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpExplicitExpressionBodySyntax node.</summary>
+    public virtual TResult VisitCSharpExplicitExpressionBody(CSharpExplicitExpressionBodySyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpImplicitExpressionSyntax node.</summary>
+    public virtual TResult VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpImplicitExpressionBodySyntax node.</summary>
+    public virtual TResult VisitCSharpImplicitExpressionBody(CSharpImplicitExpressionBodySyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a RazorDirectiveSyntax node.</summary>
+    public virtual TResult VisitRazorDirective(RazorDirectiveSyntax node)
+    {
+      return DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a RazorDirectiveBodySyntax node.</summary>
+    public virtual TResult VisitRazorDirectiveBody(RazorDirectiveBodySyntax node)
+    {
+      return DefaultVisit(node);
+    }
+  }
+
+  internal partial class SyntaxVisitor
+  {
+    /// <summary>Called when the visitor visits a RazorDocumentSyntax node.</summary>
+    public virtual void VisitRazorDocument(RazorDocumentSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a RazorCommentBlockSyntax node.</summary>
+    public virtual void VisitRazorCommentBlock(RazorCommentBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a RazorMetaCodeSyntax node.</summary>
+    public virtual void VisitRazorMetaCode(RazorMetaCodeSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a GenericBlockSyntax node.</summary>
+    public virtual void VisitGenericBlock(GenericBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a UnclassifiedTextLiteralSyntax node.</summary>
+    public virtual void VisitUnclassifiedTextLiteral(UnclassifiedTextLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupBlockSyntax node.</summary>
+    public virtual void VisitMarkupBlock(MarkupBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTransitionSyntax node.</summary>
+    public virtual void VisitMarkupTransition(MarkupTransitionSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTextLiteralSyntax node.</summary>
+    public virtual void VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupEphemeralTextLiteralSyntax node.</summary>
+    public virtual void VisitMarkupEphemeralTextLiteral(MarkupEphemeralTextLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupCommentBlockSyntax node.</summary>
+    public virtual void VisitMarkupCommentBlock(MarkupCommentBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagBlockSyntax node.</summary>
+    public virtual void VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupMinimizedAttributeBlockSyntax node.</summary>
+    public virtual void VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupAttributeBlockSyntax node.</summary>
+    public virtual void VisitMarkupAttributeBlock(MarkupAttributeBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupLiteralAttributeValueSyntax node.</summary>
+    public virtual void VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupDynamicAttributeValueSyntax node.</summary>
+    public virtual void VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupElementSyntax node.</summary>
+    public virtual void VisitMarkupElement(MarkupElementSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperElementSyntax node.</summary>
+    public virtual void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperStartTagSyntax node.</summary>
+    public virtual void VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperEndTagSyntax node.</summary>
+    public virtual void VisitMarkupTagHelperEndTag(MarkupTagHelperEndTagSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperAttributeSyntax node.</summary>
+    public virtual void VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupMinimizedTagHelperAttributeSyntax node.</summary>
+    public virtual void VisitMarkupMinimizedTagHelperAttribute(MarkupMinimizedTagHelperAttributeSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a MarkupTagHelperAttributeValueSyntax node.</summary>
+    public virtual void VisitMarkupTagHelperAttributeValue(MarkupTagHelperAttributeValueSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpCodeBlockSyntax node.</summary>
+    public virtual void VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpTransitionSyntax node.</summary>
+    public virtual void VisitCSharpTransition(CSharpTransitionSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpStatementLiteralSyntax node.</summary>
+    public virtual void VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpExpressionLiteralSyntax node.</summary>
+    public virtual void VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpEphemeralTextLiteralSyntax node.</summary>
+    public virtual void VisitCSharpEphemeralTextLiteral(CSharpEphemeralTextLiteralSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpTemplateBlockSyntax node.</summary>
+    public virtual void VisitCSharpTemplateBlock(CSharpTemplateBlockSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpStatementSyntax node.</summary>
+    public virtual void VisitCSharpStatement(CSharpStatementSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpStatementBodySyntax node.</summary>
+    public virtual void VisitCSharpStatementBody(CSharpStatementBodySyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpExplicitExpressionSyntax node.</summary>
+    public virtual void VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpExplicitExpressionBodySyntax node.</summary>
+    public virtual void VisitCSharpExplicitExpressionBody(CSharpExplicitExpressionBodySyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpImplicitExpressionSyntax node.</summary>
+    public virtual void VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a CSharpImplicitExpressionBodySyntax node.</summary>
+    public virtual void VisitCSharpImplicitExpressionBody(CSharpImplicitExpressionBodySyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a RazorDirectiveSyntax node.</summary>
+    public virtual void VisitRazorDirective(RazorDirectiveSyntax node)
+    {
+      DefaultVisit(node);
+    }
+
+    /// <summary>Called when the visitor visits a RazorDirectiveBodySyntax node.</summary>
+    public virtual void VisitRazorDirectiveBody(RazorDirectiveBodySyntax node)
+    {
+      DefaultVisit(node);
+    }
+  }
+
+  internal partial class SyntaxRewriter : SyntaxVisitor<SyntaxNode>
+  {
+    public override SyntaxNode VisitRazorDocument(RazorDocumentSyntax node)
+    {
+      var document = (RazorBlockSyntax)Visit(node.Document);
+      return node.Update(document);
+    }
+
+    public override SyntaxNode VisitRazorCommentBlock(RazorCommentBlockSyntax node)
+    {
+      var startCommentTransition = (SyntaxToken)VisitToken(node.StartCommentTransition);
+      var startCommentStar = (SyntaxToken)VisitToken(node.StartCommentStar);
+      var comment = (SyntaxToken)VisitToken(node.Comment);
+      var endCommentStar = (SyntaxToken)VisitToken(node.EndCommentStar);
+      var endCommentTransition = (SyntaxToken)VisitToken(node.EndCommentTransition);
+      return node.Update(startCommentTransition, startCommentStar, comment, endCommentStar, endCommentTransition);
+    }
+
+    public override SyntaxNode VisitRazorMetaCode(RazorMetaCodeSyntax node)
+    {
+      var metaCode = VisitList(node.MetaCode);
+      return node.Update(metaCode);
+    }
+
+    public override SyntaxNode VisitGenericBlock(GenericBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitUnclassifiedTextLiteral(UnclassifiedTextLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override SyntaxNode VisitMarkupBlock(MarkupBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitMarkupTransition(MarkupTransitionSyntax node)
+    {
+      var transitionTokens = VisitList(node.TransitionTokens);
+      return node.Update(transitionTokens);
+    }
+
+    public override SyntaxNode VisitMarkupTextLiteral(MarkupTextLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override SyntaxNode VisitMarkupEphemeralTextLiteral(MarkupEphemeralTextLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override SyntaxNode VisitMarkupCommentBlock(MarkupCommentBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitMarkupMinimizedAttributeBlock(MarkupMinimizedAttributeBlockSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      return node.Update(namePrefix, name);
+    }
+
+    public override SyntaxNode VisitMarkupAttributeBlock(MarkupAttributeBlockSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      var nameSuffix = (MarkupTextLiteralSyntax)Visit(node.NameSuffix);
+      var equalsToken = (SyntaxToken)VisitToken(node.EqualsToken);
+      var valuePrefix = (MarkupTextLiteralSyntax)Visit(node.ValuePrefix);
+      var value = (RazorBlockSyntax)Visit(node.Value);
+      var valueSuffix = (MarkupTextLiteralSyntax)Visit(node.ValueSuffix);
+      return node.Update(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+    }
+
+    public override SyntaxNode VisitMarkupLiteralAttributeValue(MarkupLiteralAttributeValueSyntax node)
+    {
+      var prefix = (MarkupTextLiteralSyntax)Visit(node.Prefix);
+      var value = (MarkupTextLiteralSyntax)Visit(node.Value);
+      return node.Update(prefix, value);
+    }
+
+    public override SyntaxNode VisitMarkupDynamicAttributeValue(MarkupDynamicAttributeValueSyntax node)
+    {
+      var prefix = (MarkupTextLiteralSyntax)Visit(node.Prefix);
+      var value = (RazorBlockSyntax)Visit(node.Value);
+      return node.Update(prefix, value);
+    }
+
+    public override SyntaxNode VisitMarkupElement(MarkupElementSyntax node)
+    {
+      var startTag = (MarkupTagBlockSyntax)Visit(node.StartTag);
+      var body = VisitList(node.Body);
+      var endTag = (MarkupTagBlockSyntax)Visit(node.EndTag);
+      return node.Update(startTag, body, endTag);
+    }
+
+    public override SyntaxNode VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+    {
+      var startTag = (MarkupTagHelperStartTagSyntax)Visit(node.StartTag);
+      var body = VisitList(node.Body);
+      var endTag = (MarkupTagHelperEndTagSyntax)Visit(node.EndTag);
+      return node.Update(startTag, body, endTag);
+    }
+
+    public override SyntaxNode VisitMarkupTagHelperStartTag(MarkupTagHelperStartTagSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitMarkupTagHelperEndTag(MarkupTagHelperEndTagSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitMarkupTagHelperAttribute(MarkupTagHelperAttributeSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      var nameSuffix = (MarkupTextLiteralSyntax)Visit(node.NameSuffix);
+      var equalsToken = (SyntaxToken)VisitToken(node.EqualsToken);
+      var valuePrefix = (MarkupTextLiteralSyntax)Visit(node.ValuePrefix);
+      var value = (MarkupTagHelperAttributeValueSyntax)Visit(node.Value);
+      var valueSuffix = (MarkupTextLiteralSyntax)Visit(node.ValueSuffix);
+      return node.Update(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+    }
+
+    public override SyntaxNode VisitMarkupMinimizedTagHelperAttribute(MarkupMinimizedTagHelperAttributeSyntax node)
+    {
+      var namePrefix = (MarkupTextLiteralSyntax)Visit(node.NamePrefix);
+      var name = (MarkupTextLiteralSyntax)Visit(node.Name);
+      return node.Update(namePrefix, name);
+    }
+
+    public override SyntaxNode VisitMarkupTagHelperAttributeValue(MarkupTagHelperAttributeValueSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitCSharpCodeBlock(CSharpCodeBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitCSharpTransition(CSharpTransitionSyntax node)
+    {
+      var transition = (SyntaxToken)VisitToken(node.Transition);
+      return node.Update(transition);
+    }
+
+    public override SyntaxNode VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override SyntaxNode VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override SyntaxNode VisitCSharpEphemeralTextLiteral(CSharpEphemeralTextLiteralSyntax node)
+    {
+      var literalTokens = VisitList(node.LiteralTokens);
+      return node.Update(literalTokens);
+    }
+
+    public override SyntaxNode VisitCSharpTemplateBlock(CSharpTemplateBlockSyntax node)
+    {
+      var children = VisitList(node.Children);
+      return node.Update(children);
+    }
+
+    public override SyntaxNode VisitCSharpStatement(CSharpStatementSyntax node)
+    {
+      var transition = (CSharpTransitionSyntax)Visit(node.Transition);
+      var body = (CSharpSyntaxNode)Visit(node.Body);
+      return node.Update(transition, body);
+    }
+
+    public override SyntaxNode VisitCSharpStatementBody(CSharpStatementBodySyntax node)
+    {
+      var openBrace = (RazorMetaCodeSyntax)Visit(node.OpenBrace);
+      var cSharpCode = (CSharpCodeBlockSyntax)Visit(node.CSharpCode);
+      var closeBrace = (RazorMetaCodeSyntax)Visit(node.CloseBrace);
+      return node.Update(openBrace, cSharpCode, closeBrace);
+    }
+
+    public override SyntaxNode VisitCSharpExplicitExpression(CSharpExplicitExpressionSyntax node)
+    {
+      var transition = (CSharpTransitionSyntax)Visit(node.Transition);
+      var body = (CSharpSyntaxNode)Visit(node.Body);
+      return node.Update(transition, body);
+    }
+
+    public override SyntaxNode VisitCSharpExplicitExpressionBody(CSharpExplicitExpressionBodySyntax node)
+    {
+      var openParen = (RazorMetaCodeSyntax)Visit(node.OpenParen);
+      var cSharpCode = (CSharpCodeBlockSyntax)Visit(node.CSharpCode);
+      var closeParen = (RazorMetaCodeSyntax)Visit(node.CloseParen);
+      return node.Update(openParen, cSharpCode, closeParen);
+    }
+
+    public override SyntaxNode VisitCSharpImplicitExpression(CSharpImplicitExpressionSyntax node)
+    {
+      var transition = (CSharpTransitionSyntax)Visit(node.Transition);
+      var body = (CSharpSyntaxNode)Visit(node.Body);
+      return node.Update(transition, body);
+    }
+
+    public override SyntaxNode VisitCSharpImplicitExpressionBody(CSharpImplicitExpressionBodySyntax node)
+    {
+      var cSharpCode = (CSharpCodeBlockSyntax)Visit(node.CSharpCode);
+      return node.Update(cSharpCode);
+    }
+
+    public override SyntaxNode VisitRazorDirective(RazorDirectiveSyntax node)
+    {
+      var transition = (CSharpTransitionSyntax)Visit(node.Transition);
+      var body = (CSharpSyntaxNode)Visit(node.Body);
+      return node.Update(transition, body);
+    }
+
+    public override SyntaxNode VisitRazorDirectiveBody(RazorDirectiveBodySyntax node)
+    {
+      var keyword = (RazorSyntaxNode)Visit(node.Keyword);
+      var cSharpCode = (CSharpCodeBlockSyntax)Visit(node.CSharpCode);
+      return node.Update(keyword, cSharpCode);
+    }
+  }
+
+  internal static partial class SyntaxFactory
+  {
+    /// <summary>Creates a new RazorDocumentSyntax instance.</summary>
+    public static RazorDocumentSyntax RazorDocument(RazorBlockSyntax document)
+    {
+      if (document == null)
+        throw new ArgumentNullException(nameof(document));
+      return (RazorDocumentSyntax)InternalSyntax.SyntaxFactory.RazorDocument(document == null ? null : (InternalSyntax.RazorBlockSyntax)document.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new RazorCommentBlockSyntax instance.</summary>
+    public static RazorCommentBlockSyntax RazorCommentBlock(SyntaxToken startCommentTransition, SyntaxToken startCommentStar, SyntaxToken comment, SyntaxToken endCommentStar, SyntaxToken endCommentTransition)
+    {
+      switch (startCommentTransition.Kind)
+      {
+        case SyntaxKind.RazorCommentTransition:
+          break;
+        default:
+          throw new ArgumentException("startCommentTransition");
+      }
+      switch (startCommentStar.Kind)
+      {
+        case SyntaxKind.RazorCommentStar:
+          break;
+        default:
+          throw new ArgumentException("startCommentStar");
+      }
+      switch (comment.Kind)
+      {
+        case SyntaxKind.RazorCommentLiteral:
+          break;
+        default:
+          throw new ArgumentException("comment");
+      }
+      switch (endCommentStar.Kind)
+      {
+        case SyntaxKind.RazorCommentStar:
+          break;
+        default:
+          throw new ArgumentException("endCommentStar");
+      }
+      switch (endCommentTransition.Kind)
+      {
+        case SyntaxKind.RazorCommentTransition:
+          break;
+        default:
+          throw new ArgumentException("endCommentTransition");
+      }
+      return (RazorCommentBlockSyntax)InternalSyntax.SyntaxFactory.RazorCommentBlock((Syntax.InternalSyntax.SyntaxToken)startCommentTransition.Green, (Syntax.InternalSyntax.SyntaxToken)startCommentStar.Green, (Syntax.InternalSyntax.SyntaxToken)comment.Green, (Syntax.InternalSyntax.SyntaxToken)endCommentStar.Green, (Syntax.InternalSyntax.SyntaxToken)endCommentTransition.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new RazorCommentBlockSyntax instance.</summary>
+    public static RazorCommentBlockSyntax RazorCommentBlock()
+    {
+      return SyntaxFactory.RazorCommentBlock(SyntaxFactory.Token(SyntaxKind.RazorCommentTransition), SyntaxFactory.Token(SyntaxKind.RazorCommentStar), SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral), SyntaxFactory.Token(SyntaxKind.RazorCommentStar), SyntaxFactory.Token(SyntaxKind.RazorCommentTransition));
+    }
+
+    /// <summary>Creates a new RazorMetaCodeSyntax instance.</summary>
+    public static RazorMetaCodeSyntax RazorMetaCode(SyntaxList<SyntaxToken> metaCode)
+    {
+      return (RazorMetaCodeSyntax)InternalSyntax.SyntaxFactory.RazorMetaCode(metaCode.Node.ToGreenList<InternalSyntax.SyntaxToken>()).CreateRed();
+    }
+
+    /// <summary>Creates a new RazorMetaCodeSyntax instance.</summary>
+    public static RazorMetaCodeSyntax RazorMetaCode()
+    {
+      return SyntaxFactory.RazorMetaCode(default(SyntaxList<SyntaxToken>));
+    }
+
+    /// <summary>Creates a new GenericBlockSyntax instance.</summary>
+    public static GenericBlockSyntax GenericBlock(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (GenericBlockSyntax)InternalSyntax.SyntaxFactory.GenericBlock(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new GenericBlockSyntax instance.</summary>
+    public static GenericBlockSyntax GenericBlock()
+    {
+      return SyntaxFactory.GenericBlock(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new UnclassifiedTextLiteralSyntax instance.</summary>
+    public static UnclassifiedTextLiteralSyntax UnclassifiedTextLiteral(SyntaxList<SyntaxToken> literalTokens)
+    {
+      return (UnclassifiedTextLiteralSyntax)InternalSyntax.SyntaxFactory.UnclassifiedTextLiteral(literalTokens.Node.ToGreenList<InternalSyntax.SyntaxToken>()).CreateRed();
+    }
+
+    /// <summary>Creates a new UnclassifiedTextLiteralSyntax instance.</summary>
+    public static UnclassifiedTextLiteralSyntax UnclassifiedTextLiteral()
+    {
+      return SyntaxFactory.UnclassifiedTextLiteral(default(SyntaxList<SyntaxToken>));
+    }
+
+    /// <summary>Creates a new MarkupBlockSyntax instance.</summary>
+    public static MarkupBlockSyntax MarkupBlock(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (MarkupBlockSyntax)InternalSyntax.SyntaxFactory.MarkupBlock(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupBlockSyntax instance.</summary>
+    public static MarkupBlockSyntax MarkupBlock()
+    {
+      return SyntaxFactory.MarkupBlock(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new MarkupTransitionSyntax instance.</summary>
+    public static MarkupTransitionSyntax MarkupTransition(SyntaxList<SyntaxToken> transitionTokens)
+    {
+      return (MarkupTransitionSyntax)InternalSyntax.SyntaxFactory.MarkupTransition(transitionTokens.Node.ToGreenList<InternalSyntax.SyntaxToken>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupTransitionSyntax instance.</summary>
+    public static MarkupTransitionSyntax MarkupTransition()
+    {
+      return SyntaxFactory.MarkupTransition(default(SyntaxList<SyntaxToken>));
+    }
+
+    /// <summary>Creates a new MarkupTextLiteralSyntax instance.</summary>
+    public static MarkupTextLiteralSyntax MarkupTextLiteral(SyntaxList<SyntaxToken> literalTokens)
+    {
+      return (MarkupTextLiteralSyntax)InternalSyntax.SyntaxFactory.MarkupTextLiteral(literalTokens.Node.ToGreenList<InternalSyntax.SyntaxToken>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupTextLiteralSyntax instance.</summary>
+    public static MarkupTextLiteralSyntax MarkupTextLiteral()
+    {
+      return SyntaxFactory.MarkupTextLiteral(default(SyntaxList<SyntaxToken>));
+    }
+
+    /// <summary>Creates a new MarkupEphemeralTextLiteralSyntax instance.</summary>
+    public static MarkupEphemeralTextLiteralSyntax MarkupEphemeralTextLiteral(SyntaxList<SyntaxToken> literalTokens)
+    {
+      return (MarkupEphemeralTextLiteralSyntax)InternalSyntax.SyntaxFactory.MarkupEphemeralTextLiteral(literalTokens.Node.ToGreenList<InternalSyntax.SyntaxToken>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupEphemeralTextLiteralSyntax instance.</summary>
+    public static MarkupEphemeralTextLiteralSyntax MarkupEphemeralTextLiteral()
+    {
+      return SyntaxFactory.MarkupEphemeralTextLiteral(default(SyntaxList<SyntaxToken>));
+    }
+
+    /// <summary>Creates a new MarkupCommentBlockSyntax instance.</summary>
+    public static MarkupCommentBlockSyntax MarkupCommentBlock(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (MarkupCommentBlockSyntax)InternalSyntax.SyntaxFactory.MarkupCommentBlock(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupCommentBlockSyntax instance.</summary>
+    public static MarkupCommentBlockSyntax MarkupCommentBlock()
+    {
+      return SyntaxFactory.MarkupCommentBlock(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new MarkupTagBlockSyntax instance.</summary>
+    public static MarkupTagBlockSyntax MarkupTagBlock(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (MarkupTagBlockSyntax)InternalSyntax.SyntaxFactory.MarkupTagBlock(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupTagBlockSyntax instance.</summary>
+    public static MarkupTagBlockSyntax MarkupTagBlock()
+    {
+      return SyntaxFactory.MarkupTagBlock(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new MarkupMinimizedAttributeBlockSyntax instance.</summary>
+    public static MarkupMinimizedAttributeBlockSyntax MarkupMinimizedAttributeBlock(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+    {
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      return (MarkupMinimizedAttributeBlockSyntax)InternalSyntax.SyntaxFactory.MarkupMinimizedAttributeBlock(namePrefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)namePrefix.Green, name == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)name.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupMinimizedAttributeBlockSyntax instance.</summary>
+    public static MarkupMinimizedAttributeBlockSyntax MarkupMinimizedAttributeBlock()
+    {
+      return SyntaxFactory.MarkupMinimizedAttributeBlock(default(MarkupTextLiteralSyntax), SyntaxFactory.MarkupTextLiteral());
+    }
+
+    /// <summary>Creates a new MarkupAttributeBlockSyntax instance.</summary>
+    public static MarkupAttributeBlockSyntax MarkupAttributeBlock(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, RazorBlockSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      switch (equalsToken.Kind)
+      {
+        case SyntaxKind.Equals:
+          break;
+        default:
+          throw new ArgumentException("equalsToken");
+      }
+      return (MarkupAttributeBlockSyntax)InternalSyntax.SyntaxFactory.MarkupAttributeBlock(namePrefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)namePrefix.Green, name == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)name.Green, nameSuffix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)nameSuffix.Green, (Syntax.InternalSyntax.SyntaxToken)equalsToken.Green, valuePrefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)valuePrefix.Green, value == null ? null : (InternalSyntax.RazorBlockSyntax)value.Green, valueSuffix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)valueSuffix.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupAttributeBlockSyntax instance.</summary>
+    public static MarkupAttributeBlockSyntax MarkupAttributeBlock(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, MarkupTextLiteralSyntax valuePrefix, RazorBlockSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+      return SyntaxFactory.MarkupAttributeBlock(namePrefix, name, nameSuffix, SyntaxFactory.Token(SyntaxKind.Equals), valuePrefix, value, valueSuffix);
+    }
+
+    /// <summary>Creates a new MarkupAttributeBlockSyntax instance.</summary>
+    public static MarkupAttributeBlockSyntax MarkupAttributeBlock()
+    {
+      return SyntaxFactory.MarkupAttributeBlock(default(MarkupTextLiteralSyntax), SyntaxFactory.MarkupTextLiteral(), default(MarkupTextLiteralSyntax), SyntaxFactory.Token(SyntaxKind.Equals), default(MarkupTextLiteralSyntax), default(RazorBlockSyntax), default(MarkupTextLiteralSyntax));
+    }
+
+    /// <summary>Creates a new MarkupLiteralAttributeValueSyntax instance.</summary>
+    public static MarkupLiteralAttributeValueSyntax MarkupLiteralAttributeValue(MarkupTextLiteralSyntax prefix, MarkupTextLiteralSyntax value)
+    {
+      return (MarkupLiteralAttributeValueSyntax)InternalSyntax.SyntaxFactory.MarkupLiteralAttributeValue(prefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)prefix.Green, value == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)value.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupLiteralAttributeValueSyntax instance.</summary>
+    public static MarkupLiteralAttributeValueSyntax MarkupLiteralAttributeValue()
+    {
+      return SyntaxFactory.MarkupLiteralAttributeValue(default(MarkupTextLiteralSyntax), default(MarkupTextLiteralSyntax));
+    }
+
+    /// <summary>Creates a new MarkupDynamicAttributeValueSyntax instance.</summary>
+    public static MarkupDynamicAttributeValueSyntax MarkupDynamicAttributeValue(MarkupTextLiteralSyntax prefix, RazorBlockSyntax value)
+    {
+      if (value == null)
+        throw new ArgumentNullException(nameof(value));
+      return (MarkupDynamicAttributeValueSyntax)InternalSyntax.SyntaxFactory.MarkupDynamicAttributeValue(prefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)prefix.Green, value == null ? null : (InternalSyntax.RazorBlockSyntax)value.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupDynamicAttributeValueSyntax instance.</summary>
+    public static MarkupDynamicAttributeValueSyntax MarkupDynamicAttributeValue(RazorBlockSyntax value)
+    {
+      return SyntaxFactory.MarkupDynamicAttributeValue(default(MarkupTextLiteralSyntax), value);
+    }
+
+    /// <summary>Creates a new MarkupElementSyntax instance.</summary>
+    public static MarkupElementSyntax MarkupElement(MarkupTagBlockSyntax startTag, SyntaxList<RazorSyntaxNode> body, MarkupTagBlockSyntax endTag)
+    {
+      return (MarkupElementSyntax)InternalSyntax.SyntaxFactory.MarkupElement(startTag == null ? null : (InternalSyntax.MarkupTagBlockSyntax)startTag.Green, body.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>(), endTag == null ? null : (InternalSyntax.MarkupTagBlockSyntax)endTag.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupElementSyntax instance.</summary>
+    public static MarkupElementSyntax MarkupElement(SyntaxList<RazorSyntaxNode> body = default(SyntaxList<RazorSyntaxNode>))
+    {
+      return SyntaxFactory.MarkupElement(default(MarkupTagBlockSyntax), body, default(MarkupTagBlockSyntax));
+    }
+
+    /// <summary>Creates a new MarkupTagHelperElementSyntax instance.</summary>
+    public static MarkupTagHelperElementSyntax MarkupTagHelperElement(MarkupTagHelperStartTagSyntax startTag, SyntaxList<RazorSyntaxNode> body, MarkupTagHelperEndTagSyntax endTag)
+    {
+      if (startTag == null)
+        throw new ArgumentNullException(nameof(startTag));
+      return (MarkupTagHelperElementSyntax)InternalSyntax.SyntaxFactory.MarkupTagHelperElement(startTag == null ? null : (InternalSyntax.MarkupTagHelperStartTagSyntax)startTag.Green, body.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>(), endTag == null ? null : (InternalSyntax.MarkupTagHelperEndTagSyntax)endTag.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupTagHelperElementSyntax instance.</summary>
+    public static MarkupTagHelperElementSyntax MarkupTagHelperElement(SyntaxList<RazorSyntaxNode> body = default(SyntaxList<RazorSyntaxNode>))
+    {
+      return SyntaxFactory.MarkupTagHelperElement(SyntaxFactory.MarkupTagHelperStartTag(), body, default(MarkupTagHelperEndTagSyntax));
+    }
+
+    /// <summary>Creates a new MarkupTagHelperStartTagSyntax instance.</summary>
+    public static MarkupTagHelperStartTagSyntax MarkupTagHelperStartTag(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (MarkupTagHelperStartTagSyntax)InternalSyntax.SyntaxFactory.MarkupTagHelperStartTag(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupTagHelperStartTagSyntax instance.</summary>
+    public static MarkupTagHelperStartTagSyntax MarkupTagHelperStartTag()
+    {
+      return SyntaxFactory.MarkupTagHelperStartTag(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new MarkupTagHelperEndTagSyntax instance.</summary>
+    public static MarkupTagHelperEndTagSyntax MarkupTagHelperEndTag(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (MarkupTagHelperEndTagSyntax)InternalSyntax.SyntaxFactory.MarkupTagHelperEndTag(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupTagHelperEndTagSyntax instance.</summary>
+    public static MarkupTagHelperEndTagSyntax MarkupTagHelperEndTag()
+    {
+      return SyntaxFactory.MarkupTagHelperEndTag(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new MarkupTagHelperAttributeSyntax instance.</summary>
+    public static MarkupTagHelperAttributeSyntax MarkupTagHelperAttribute(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      switch (equalsToken.Kind)
+      {
+        case SyntaxKind.Equals:
+          break;
+        default:
+          throw new ArgumentException("equalsToken");
+      }
+      if (value == null)
+        throw new ArgumentNullException(nameof(value));
+      return (MarkupTagHelperAttributeSyntax)InternalSyntax.SyntaxFactory.MarkupTagHelperAttribute(namePrefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)namePrefix.Green, name == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)name.Green, nameSuffix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)nameSuffix.Green, (Syntax.InternalSyntax.SyntaxToken)equalsToken.Green, valuePrefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)valuePrefix.Green, value == null ? null : (InternalSyntax.MarkupTagHelperAttributeValueSyntax)value.Green, valueSuffix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)valueSuffix.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupTagHelperAttributeSyntax instance.</summary>
+    public static MarkupTagHelperAttributeSyntax MarkupTagHelperAttribute(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+      return SyntaxFactory.MarkupTagHelperAttribute(namePrefix, name, nameSuffix, SyntaxFactory.Token(SyntaxKind.Equals), valuePrefix, value, valueSuffix);
+    }
+
+    /// <summary>Creates a new MarkupTagHelperAttributeSyntax instance.</summary>
+    public static MarkupTagHelperAttributeSyntax MarkupTagHelperAttribute()
+    {
+      return SyntaxFactory.MarkupTagHelperAttribute(default(MarkupTextLiteralSyntax), SyntaxFactory.MarkupTextLiteral(), default(MarkupTextLiteralSyntax), SyntaxFactory.Token(SyntaxKind.Equals), default(MarkupTextLiteralSyntax), SyntaxFactory.MarkupTagHelperAttributeValue(), default(MarkupTextLiteralSyntax));
+    }
+
+    /// <summary>Creates a new MarkupMinimizedTagHelperAttributeSyntax instance.</summary>
+    public static MarkupMinimizedTagHelperAttributeSyntax MarkupMinimizedTagHelperAttribute(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+    {
+      if (name == null)
+        throw new ArgumentNullException(nameof(name));
+      return (MarkupMinimizedTagHelperAttributeSyntax)InternalSyntax.SyntaxFactory.MarkupMinimizedTagHelperAttribute(namePrefix == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)namePrefix.Green, name == null ? null : (InternalSyntax.MarkupTextLiteralSyntax)name.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupMinimizedTagHelperAttributeSyntax instance.</summary>
+    public static MarkupMinimizedTagHelperAttributeSyntax MarkupMinimizedTagHelperAttribute()
+    {
+      return SyntaxFactory.MarkupMinimizedTagHelperAttribute(default(MarkupTextLiteralSyntax), SyntaxFactory.MarkupTextLiteral());
+    }
+
+    /// <summary>Creates a new MarkupTagHelperAttributeValueSyntax instance.</summary>
+    public static MarkupTagHelperAttributeValueSyntax MarkupTagHelperAttributeValue(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (MarkupTagHelperAttributeValueSyntax)InternalSyntax.SyntaxFactory.MarkupTagHelperAttributeValue(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new MarkupTagHelperAttributeValueSyntax instance.</summary>
+    public static MarkupTagHelperAttributeValueSyntax MarkupTagHelperAttributeValue()
+    {
+      return SyntaxFactory.MarkupTagHelperAttributeValue(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new CSharpCodeBlockSyntax instance.</summary>
+    public static CSharpCodeBlockSyntax CSharpCodeBlock(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (CSharpCodeBlockSyntax)InternalSyntax.SyntaxFactory.CSharpCodeBlock(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpCodeBlockSyntax instance.</summary>
+    public static CSharpCodeBlockSyntax CSharpCodeBlock()
+    {
+      return SyntaxFactory.CSharpCodeBlock(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new CSharpTransitionSyntax instance.</summary>
+    public static CSharpTransitionSyntax CSharpTransition(SyntaxToken transition)
+    {
+      switch (transition.Kind)
+      {
+        case SyntaxKind.Transition:
+          break;
+        default:
+          throw new ArgumentException("transition");
+      }
+      return (CSharpTransitionSyntax)InternalSyntax.SyntaxFactory.CSharpTransition((Syntax.InternalSyntax.SyntaxToken)transition.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpTransitionSyntax instance.</summary>
+    public static CSharpTransitionSyntax CSharpTransition()
+    {
+      return SyntaxFactory.CSharpTransition(SyntaxFactory.Token(SyntaxKind.Transition));
+    }
+
+    /// <summary>Creates a new CSharpStatementLiteralSyntax instance.</summary>
+    public static CSharpStatementLiteralSyntax CSharpStatementLiteral(SyntaxList<SyntaxToken> literalTokens)
+    {
+      return (CSharpStatementLiteralSyntax)InternalSyntax.SyntaxFactory.CSharpStatementLiteral(literalTokens.Node.ToGreenList<InternalSyntax.SyntaxToken>()).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpStatementLiteralSyntax instance.</summary>
+    public static CSharpStatementLiteralSyntax CSharpStatementLiteral()
+    {
+      return SyntaxFactory.CSharpStatementLiteral(default(SyntaxList<SyntaxToken>));
+    }
+
+    /// <summary>Creates a new CSharpExpressionLiteralSyntax instance.</summary>
+    public static CSharpExpressionLiteralSyntax CSharpExpressionLiteral(SyntaxList<SyntaxToken> literalTokens)
+    {
+      return (CSharpExpressionLiteralSyntax)InternalSyntax.SyntaxFactory.CSharpExpressionLiteral(literalTokens.Node.ToGreenList<InternalSyntax.SyntaxToken>()).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpExpressionLiteralSyntax instance.</summary>
+    public static CSharpExpressionLiteralSyntax CSharpExpressionLiteral()
+    {
+      return SyntaxFactory.CSharpExpressionLiteral(default(SyntaxList<SyntaxToken>));
+    }
+
+    /// <summary>Creates a new CSharpEphemeralTextLiteralSyntax instance.</summary>
+    public static CSharpEphemeralTextLiteralSyntax CSharpEphemeralTextLiteral(SyntaxList<SyntaxToken> literalTokens)
+    {
+      return (CSharpEphemeralTextLiteralSyntax)InternalSyntax.SyntaxFactory.CSharpEphemeralTextLiteral(literalTokens.Node.ToGreenList<InternalSyntax.SyntaxToken>()).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpEphemeralTextLiteralSyntax instance.</summary>
+    public static CSharpEphemeralTextLiteralSyntax CSharpEphemeralTextLiteral()
+    {
+      return SyntaxFactory.CSharpEphemeralTextLiteral(default(SyntaxList<SyntaxToken>));
+    }
+
+    /// <summary>Creates a new CSharpTemplateBlockSyntax instance.</summary>
+    public static CSharpTemplateBlockSyntax CSharpTemplateBlock(SyntaxList<RazorSyntaxNode> children)
+    {
+      return (CSharpTemplateBlockSyntax)InternalSyntax.SyntaxFactory.CSharpTemplateBlock(children.Node.ToGreenList<InternalSyntax.RazorSyntaxNode>()).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpTemplateBlockSyntax instance.</summary>
+    public static CSharpTemplateBlockSyntax CSharpTemplateBlock()
+    {
+      return SyntaxFactory.CSharpTemplateBlock(default(SyntaxList<RazorSyntaxNode>));
+    }
+
+    /// <summary>Creates a new CSharpStatementSyntax instance.</summary>
+    public static CSharpStatementSyntax CSharpStatement(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (body == null)
+        throw new ArgumentNullException(nameof(body));
+      return (CSharpStatementSyntax)InternalSyntax.SyntaxFactory.CSharpStatement(transition == null ? null : (InternalSyntax.CSharpTransitionSyntax)transition.Green, body == null ? null : (InternalSyntax.CSharpSyntaxNode)body.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpStatementSyntax instance.</summary>
+    public static CSharpStatementSyntax CSharpStatement(CSharpSyntaxNode body)
+    {
+      return SyntaxFactory.CSharpStatement(SyntaxFactory.CSharpTransition(), body);
+    }
+
+    /// <summary>Creates a new CSharpStatementBodySyntax instance.</summary>
+    public static CSharpStatementBodySyntax CSharpStatementBody(RazorMetaCodeSyntax openBrace, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeBrace)
+    {
+      if (openBrace == null)
+        throw new ArgumentNullException(nameof(openBrace));
+      if (cSharpCode == null)
+        throw new ArgumentNullException(nameof(cSharpCode));
+      if (closeBrace == null)
+        throw new ArgumentNullException(nameof(closeBrace));
+      return (CSharpStatementBodySyntax)InternalSyntax.SyntaxFactory.CSharpStatementBody(openBrace == null ? null : (InternalSyntax.RazorMetaCodeSyntax)openBrace.Green, cSharpCode == null ? null : (InternalSyntax.CSharpCodeBlockSyntax)cSharpCode.Green, closeBrace == null ? null : (InternalSyntax.RazorMetaCodeSyntax)closeBrace.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpStatementBodySyntax instance.</summary>
+    public static CSharpStatementBodySyntax CSharpStatementBody()
+    {
+      return SyntaxFactory.CSharpStatementBody(SyntaxFactory.RazorMetaCode(), SyntaxFactory.CSharpCodeBlock(), SyntaxFactory.RazorMetaCode());
+    }
+
+    /// <summary>Creates a new CSharpExplicitExpressionSyntax instance.</summary>
+    public static CSharpExplicitExpressionSyntax CSharpExplicitExpression(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (body == null)
+        throw new ArgumentNullException(nameof(body));
+      return (CSharpExplicitExpressionSyntax)InternalSyntax.SyntaxFactory.CSharpExplicitExpression(transition == null ? null : (InternalSyntax.CSharpTransitionSyntax)transition.Green, body == null ? null : (InternalSyntax.CSharpSyntaxNode)body.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpExplicitExpressionSyntax instance.</summary>
+    public static CSharpExplicitExpressionSyntax CSharpExplicitExpression(CSharpSyntaxNode body)
+    {
+      return SyntaxFactory.CSharpExplicitExpression(SyntaxFactory.CSharpTransition(), body);
+    }
+
+    /// <summary>Creates a new CSharpExplicitExpressionBodySyntax instance.</summary>
+    public static CSharpExplicitExpressionBodySyntax CSharpExplicitExpressionBody(RazorMetaCodeSyntax openParen, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeParen)
+    {
+      if (openParen == null)
+        throw new ArgumentNullException(nameof(openParen));
+      if (cSharpCode == null)
+        throw new ArgumentNullException(nameof(cSharpCode));
+      if (closeParen == null)
+        throw new ArgumentNullException(nameof(closeParen));
+      return (CSharpExplicitExpressionBodySyntax)InternalSyntax.SyntaxFactory.CSharpExplicitExpressionBody(openParen == null ? null : (InternalSyntax.RazorMetaCodeSyntax)openParen.Green, cSharpCode == null ? null : (InternalSyntax.CSharpCodeBlockSyntax)cSharpCode.Green, closeParen == null ? null : (InternalSyntax.RazorMetaCodeSyntax)closeParen.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpExplicitExpressionBodySyntax instance.</summary>
+    public static CSharpExplicitExpressionBodySyntax CSharpExplicitExpressionBody()
+    {
+      return SyntaxFactory.CSharpExplicitExpressionBody(SyntaxFactory.RazorMetaCode(), SyntaxFactory.CSharpCodeBlock(), SyntaxFactory.RazorMetaCode());
+    }
+
+    /// <summary>Creates a new CSharpImplicitExpressionSyntax instance.</summary>
+    public static CSharpImplicitExpressionSyntax CSharpImplicitExpression(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (body == null)
+        throw new ArgumentNullException(nameof(body));
+      return (CSharpImplicitExpressionSyntax)InternalSyntax.SyntaxFactory.CSharpImplicitExpression(transition == null ? null : (InternalSyntax.CSharpTransitionSyntax)transition.Green, body == null ? null : (InternalSyntax.CSharpSyntaxNode)body.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpImplicitExpressionSyntax instance.</summary>
+    public static CSharpImplicitExpressionSyntax CSharpImplicitExpression(CSharpSyntaxNode body)
+    {
+      return SyntaxFactory.CSharpImplicitExpression(SyntaxFactory.CSharpTransition(), body);
+    }
+
+    /// <summary>Creates a new CSharpImplicitExpressionBodySyntax instance.</summary>
+    public static CSharpImplicitExpressionBodySyntax CSharpImplicitExpressionBody(CSharpCodeBlockSyntax cSharpCode)
+    {
+      if (cSharpCode == null)
+        throw new ArgumentNullException(nameof(cSharpCode));
+      return (CSharpImplicitExpressionBodySyntax)InternalSyntax.SyntaxFactory.CSharpImplicitExpressionBody(cSharpCode == null ? null : (InternalSyntax.CSharpCodeBlockSyntax)cSharpCode.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new CSharpImplicitExpressionBodySyntax instance.</summary>
+    public static CSharpImplicitExpressionBodySyntax CSharpImplicitExpressionBody()
+    {
+      return SyntaxFactory.CSharpImplicitExpressionBody(SyntaxFactory.CSharpCodeBlock());
+    }
+
+    /// <summary>Creates a new RazorDirectiveSyntax instance.</summary>
+    public static RazorDirectiveSyntax RazorDirective(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+      if (transition == null)
+        throw new ArgumentNullException(nameof(transition));
+      if (body == null)
+        throw new ArgumentNullException(nameof(body));
+      return (RazorDirectiveSyntax)InternalSyntax.SyntaxFactory.RazorDirective(transition == null ? null : (InternalSyntax.CSharpTransitionSyntax)transition.Green, body == null ? null : (InternalSyntax.CSharpSyntaxNode)body.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new RazorDirectiveSyntax instance.</summary>
+    public static RazorDirectiveSyntax RazorDirective(CSharpSyntaxNode body)
+    {
+      return SyntaxFactory.RazorDirective(SyntaxFactory.CSharpTransition(), body);
+    }
+
+    /// <summary>Creates a new RazorDirectiveBodySyntax instance.</summary>
+    public static RazorDirectiveBodySyntax RazorDirectiveBody(RazorSyntaxNode keyword, CSharpCodeBlockSyntax cSharpCode)
+    {
+      if (keyword == null)
+        throw new ArgumentNullException(nameof(keyword));
+      return (RazorDirectiveBodySyntax)InternalSyntax.SyntaxFactory.RazorDirectiveBody(keyword == null ? null : (InternalSyntax.RazorSyntaxNode)keyword.Green, cSharpCode == null ? null : (InternalSyntax.CSharpCodeBlockSyntax)cSharpCode.Green).CreateRed();
+    }
+
+    /// <summary>Creates a new RazorDirectiveBodySyntax instance.</summary>
+    public static RazorDirectiveBodySyntax RazorDirectiveBody(RazorSyntaxNode keyword)
+    {
+      return SyntaxFactory.RazorDirectiveBody(keyword, default(CSharpCodeBlockSyntax));
+    }
+  }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/Generated/Syntax.xml.Syntax.Generated.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
new file mode 100644
index 0000000000..8196bdb0ea
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
@@ -0,0 +1,3178 @@
+// <auto-generated />
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+  internal abstract partial class RazorBlockSyntax : RazorSyntaxNode
+  {
+    internal RazorBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+      : base(green, parent, position)
+    {
+    }
+
+    public abstract SyntaxList<RazorSyntaxNode> Children { get; }
+    public RazorBlockSyntax WithChildren(SyntaxList<RazorSyntaxNode> children) => WithChildrenCore(children);
+    internal abstract RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children);
+
+    public RazorBlockSyntax AddChildren(params RazorSyntaxNode[] items) => AddChildrenCore(items);
+    internal abstract RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items);
+  }
+
+  internal sealed partial class RazorDocumentSyntax : RazorSyntaxNode
+  {
+    private RazorBlockSyntax _document;
+
+    internal RazorDocumentSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public RazorBlockSyntax Document 
+    {
+        get
+        {
+            return GetRedAtZero(ref _document);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _document);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _document;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorDocument(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorDocument(this);
+    }
+
+    public RazorDocumentSyntax Update(RazorBlockSyntax document)
+    {
+        if (document != Document)
+        {
+            var newNode = SyntaxFactory.RazorDocument(document);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public RazorDocumentSyntax WithDocument(RazorBlockSyntax document)
+    {
+        return Update(document);
+    }
+  }
+
+  internal sealed partial class RazorCommentBlockSyntax : RazorSyntaxNode
+  {
+    private SyntaxToken _startCommentTransition;
+    private SyntaxToken _startCommentStar;
+    private SyntaxToken _comment;
+    private SyntaxToken _endCommentStar;
+    private SyntaxToken _endCommentTransition;
+
+    internal RazorCommentBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxToken StartCommentTransition 
+    {
+        get
+        {
+            return GetRedAtZero(ref _startCommentTransition);
+        }
+    }
+
+    public SyntaxToken StartCommentStar 
+    {
+        get
+        {
+            return GetRed(ref _startCommentStar, 1);
+        }
+    }
+
+    public SyntaxToken Comment 
+    {
+        get
+        {
+            return GetRed(ref _comment, 2);
+        }
+    }
+
+    public SyntaxToken EndCommentStar 
+    {
+        get
+        {
+            return GetRed(ref _endCommentStar, 3);
+        }
+    }
+
+    public SyntaxToken EndCommentTransition 
+    {
+        get
+        {
+            return GetRed(ref _endCommentTransition, 4);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _startCommentTransition);
+            case 1: return GetRed(ref _startCommentStar, 1);
+            case 2: return GetRed(ref _comment, 2);
+            case 3: return GetRed(ref _endCommentStar, 3);
+            case 4: return GetRed(ref _endCommentTransition, 4);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _startCommentTransition;
+            case 1: return _startCommentStar;
+            case 2: return _comment;
+            case 3: return _endCommentStar;
+            case 4: return _endCommentTransition;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorCommentBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorCommentBlock(this);
+    }
+
+    public RazorCommentBlockSyntax Update(SyntaxToken startCommentTransition, SyntaxToken startCommentStar, SyntaxToken comment, SyntaxToken endCommentStar, SyntaxToken endCommentTransition)
+    {
+        if (startCommentTransition != StartCommentTransition || startCommentStar != StartCommentStar || comment != Comment || endCommentStar != EndCommentStar || endCommentTransition != EndCommentTransition)
+        {
+            var newNode = SyntaxFactory.RazorCommentBlock(startCommentTransition, startCommentStar, comment, endCommentStar, endCommentTransition);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public RazorCommentBlockSyntax WithStartCommentTransition(SyntaxToken startCommentTransition)
+    {
+        return Update(startCommentTransition, StartCommentStar, Comment, EndCommentStar, EndCommentTransition);
+    }
+
+    public RazorCommentBlockSyntax WithStartCommentStar(SyntaxToken startCommentStar)
+    {
+        return Update(StartCommentTransition, startCommentStar, Comment, EndCommentStar, EndCommentTransition);
+    }
+
+    public RazorCommentBlockSyntax WithComment(SyntaxToken comment)
+    {
+        return Update(StartCommentTransition, StartCommentStar, comment, EndCommentStar, EndCommentTransition);
+    }
+
+    public RazorCommentBlockSyntax WithEndCommentStar(SyntaxToken endCommentStar)
+    {
+        return Update(StartCommentTransition, StartCommentStar, Comment, endCommentStar, EndCommentTransition);
+    }
+
+    public RazorCommentBlockSyntax WithEndCommentTransition(SyntaxToken endCommentTransition)
+    {
+        return Update(StartCommentTransition, StartCommentStar, Comment, EndCommentStar, endCommentTransition);
+    }
+  }
+
+  internal sealed partial class RazorMetaCodeSyntax : RazorSyntaxNode
+  {
+    private SyntaxNode _metaCode;
+
+    internal RazorMetaCodeSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxList<SyntaxToken> MetaCode 
+    {
+        get
+        {
+            return new SyntaxList<SyntaxToken>(GetRed(ref _metaCode, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _metaCode);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _metaCode;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorMetaCode(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorMetaCode(this);
+    }
+
+    public RazorMetaCodeSyntax Update(SyntaxList<SyntaxToken> metaCode)
+    {
+        if (metaCode != MetaCode)
+        {
+            var newNode = SyntaxFactory.RazorMetaCode(metaCode);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public RazorMetaCodeSyntax WithMetaCode(SyntaxList<SyntaxToken> metaCode)
+    {
+        return Update(metaCode);
+    }
+
+    public RazorMetaCodeSyntax AddMetaCode(params SyntaxToken[] items)
+    {
+        return WithMetaCode(this.MetaCode.AddRange(items));
+    }
+  }
+
+  internal sealed partial class GenericBlockSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal GenericBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitGenericBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitGenericBlock(this);
+    }
+
+    public GenericBlockSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.GenericBlock(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new GenericBlockSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new GenericBlockSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal sealed partial class UnclassifiedTextLiteralSyntax : RazorSyntaxNode
+  {
+    private SyntaxNode _literalTokens;
+
+    internal UnclassifiedTextLiteralSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens 
+    {
+        get
+        {
+            return new SyntaxList<SyntaxToken>(GetRed(ref _literalTokens, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _literalTokens);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitUnclassifiedTextLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitUnclassifiedTextLiteral(this);
+    }
+
+    public UnclassifiedTextLiteralSyntax Update(SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.UnclassifiedTextLiteral(literalTokens);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public UnclassifiedTextLiteralSyntax WithLiteralTokens(SyntaxList<SyntaxToken> literalTokens)
+    {
+        return Update(literalTokens);
+    }
+
+    public UnclassifiedTextLiteralSyntax AddLiteralTokens(params SyntaxToken[] items)
+    {
+        return WithLiteralTokens(this.LiteralTokens.AddRange(items));
+    }
+  }
+
+  internal abstract partial class MarkupSyntaxNode : RazorSyntaxNode
+  {
+    internal MarkupSyntaxNode(GreenNode green, SyntaxNode parent, int position)
+      : base(green, parent, position)
+    {
+    }
+  }
+
+  internal sealed partial class MarkupBlockSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal MarkupBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupBlock(this);
+    }
+
+    public MarkupBlockSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupBlock(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new MarkupBlockSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new MarkupBlockSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal sealed partial class MarkupTransitionSyntax : MarkupSyntaxNode
+  {
+    private SyntaxNode _transitionTokens;
+
+    internal MarkupTransitionSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxList<SyntaxToken> TransitionTokens 
+    {
+        get
+        {
+            return new SyntaxList<SyntaxToken>(GetRed(ref _transitionTokens, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _transitionTokens);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transitionTokens;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTransition(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTransition(this);
+    }
+
+    public MarkupTransitionSyntax Update(SyntaxList<SyntaxToken> transitionTokens)
+    {
+        if (transitionTokens != TransitionTokens)
+        {
+            var newNode = SyntaxFactory.MarkupTransition(transitionTokens);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupTransitionSyntax WithTransitionTokens(SyntaxList<SyntaxToken> transitionTokens)
+    {
+        return Update(transitionTokens);
+    }
+
+    public MarkupTransitionSyntax AddTransitionTokens(params SyntaxToken[] items)
+    {
+        return WithTransitionTokens(this.TransitionTokens.AddRange(items));
+    }
+  }
+
+  internal sealed partial class MarkupTextLiteralSyntax : MarkupSyntaxNode
+  {
+    private SyntaxNode _literalTokens;
+
+    internal MarkupTextLiteralSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens 
+    {
+        get
+        {
+            return new SyntaxList<SyntaxToken>(GetRed(ref _literalTokens, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _literalTokens);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTextLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTextLiteral(this);
+    }
+
+    public MarkupTextLiteralSyntax Update(SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.MarkupTextLiteral(literalTokens);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupTextLiteralSyntax WithLiteralTokens(SyntaxList<SyntaxToken> literalTokens)
+    {
+        return Update(literalTokens);
+    }
+
+    public MarkupTextLiteralSyntax AddLiteralTokens(params SyntaxToken[] items)
+    {
+        return WithLiteralTokens(this.LiteralTokens.AddRange(items));
+    }
+  }
+
+  internal sealed partial class MarkupEphemeralTextLiteralSyntax : MarkupSyntaxNode
+  {
+    private SyntaxNode _literalTokens;
+
+    internal MarkupEphemeralTextLiteralSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens 
+    {
+        get
+        {
+            return new SyntaxList<SyntaxToken>(GetRed(ref _literalTokens, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _literalTokens);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupEphemeralTextLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupEphemeralTextLiteral(this);
+    }
+
+    public MarkupEphemeralTextLiteralSyntax Update(SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.MarkupEphemeralTextLiteral(literalTokens);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupEphemeralTextLiteralSyntax WithLiteralTokens(SyntaxList<SyntaxToken> literalTokens)
+    {
+        return Update(literalTokens);
+    }
+
+    public MarkupEphemeralTextLiteralSyntax AddLiteralTokens(params SyntaxToken[] items)
+    {
+        return WithLiteralTokens(this.LiteralTokens.AddRange(items));
+    }
+  }
+
+  internal sealed partial class MarkupCommentBlockSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal MarkupCommentBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupCommentBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupCommentBlock(this);
+    }
+
+    public MarkupCommentBlockSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupCommentBlock(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new MarkupCommentBlockSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new MarkupCommentBlockSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal sealed partial class MarkupTagBlockSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal MarkupTagBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagBlock(this);
+    }
+
+    public MarkupTagBlockSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupTagBlock(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new MarkupTagBlockSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new MarkupTagBlockSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal sealed partial class MarkupMinimizedAttributeBlockSyntax : MarkupSyntaxNode
+  {
+    private MarkupTextLiteralSyntax _namePrefix;
+    private MarkupTextLiteralSyntax _name;
+
+    internal MarkupMinimizedAttributeBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix 
+    {
+        get
+        {
+            return GetRedAtZero(ref _namePrefix);
+        }
+    }
+
+    public MarkupTextLiteralSyntax Name 
+    {
+        get
+        {
+            return GetRed(ref _name, 1);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _namePrefix);
+            case 1: return GetRed(ref _name, 1);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _name;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupMinimizedAttributeBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupMinimizedAttributeBlock(this);
+    }
+
+    public MarkupMinimizedAttributeBlockSyntax Update(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+    {
+        if (namePrefix != NamePrefix || name != Name)
+        {
+            var newNode = SyntaxFactory.MarkupMinimizedAttributeBlock(namePrefix, name);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupMinimizedAttributeBlockSyntax WithNamePrefix(MarkupTextLiteralSyntax namePrefix)
+    {
+        return Update(namePrefix, Name);
+    }
+
+    public MarkupMinimizedAttributeBlockSyntax WithName(MarkupTextLiteralSyntax name)
+    {
+        return Update(NamePrefix, name);
+    }
+
+    public MarkupMinimizedAttributeBlockSyntax AddNamePrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _namePrefix = this.NamePrefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithNamePrefix(_namePrefix.WithLiteralTokens(_namePrefix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupMinimizedAttributeBlockSyntax AddNameLiteralTokens(params SyntaxToken[] items)
+    {
+        return this.WithName(this.Name.WithLiteralTokens(this.Name.LiteralTokens.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class MarkupAttributeBlockSyntax : MarkupSyntaxNode
+  {
+    private MarkupTextLiteralSyntax _namePrefix;
+    private MarkupTextLiteralSyntax _name;
+    private MarkupTextLiteralSyntax _nameSuffix;
+    private SyntaxToken _equalsToken;
+    private MarkupTextLiteralSyntax _valuePrefix;
+    private RazorBlockSyntax _value;
+    private MarkupTextLiteralSyntax _valueSuffix;
+
+    internal MarkupAttributeBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix 
+    {
+        get
+        {
+            return GetRedAtZero(ref _namePrefix);
+        }
+    }
+
+    public MarkupTextLiteralSyntax Name 
+    {
+        get
+        {
+            return GetRed(ref _name, 1);
+        }
+    }
+
+    public MarkupTextLiteralSyntax NameSuffix 
+    {
+        get
+        {
+            return GetRed(ref _nameSuffix, 2);
+        }
+    }
+
+    public SyntaxToken EqualsToken 
+    {
+        get
+        {
+            return GetRed(ref _equalsToken, 3);
+        }
+    }
+
+    public MarkupTextLiteralSyntax ValuePrefix 
+    {
+        get
+        {
+            return GetRed(ref _valuePrefix, 4);
+        }
+    }
+
+    public RazorBlockSyntax Value 
+    {
+        get
+        {
+            return GetRed(ref _value, 5);
+        }
+    }
+
+    public MarkupTextLiteralSyntax ValueSuffix 
+    {
+        get
+        {
+            return GetRed(ref _valueSuffix, 6);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _namePrefix);
+            case 1: return GetRed(ref _name, 1);
+            case 2: return GetRed(ref _nameSuffix, 2);
+            case 3: return GetRed(ref _equalsToken, 3);
+            case 4: return GetRed(ref _valuePrefix, 4);
+            case 5: return GetRed(ref _value, 5);
+            case 6: return GetRed(ref _valueSuffix, 6);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _name;
+            case 2: return _nameSuffix;
+            case 3: return _equalsToken;
+            case 4: return _valuePrefix;
+            case 5: return _value;
+            case 6: return _valueSuffix;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupAttributeBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupAttributeBlock(this);
+    }
+
+    public MarkupAttributeBlockSyntax Update(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, RazorBlockSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+        if (namePrefix != NamePrefix || name != Name || nameSuffix != NameSuffix || equalsToken != EqualsToken || valuePrefix != ValuePrefix || value != Value || valueSuffix != ValueSuffix)
+        {
+            var newNode = SyntaxFactory.MarkupAttributeBlock(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupAttributeBlockSyntax WithNamePrefix(MarkupTextLiteralSyntax namePrefix)
+    {
+        return Update(namePrefix, Name, NameSuffix, EqualsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupAttributeBlockSyntax WithName(MarkupTextLiteralSyntax name)
+    {
+        return Update(NamePrefix, name, NameSuffix, EqualsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupAttributeBlockSyntax WithNameSuffix(MarkupTextLiteralSyntax nameSuffix)
+    {
+        return Update(NamePrefix, Name, nameSuffix, EqualsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupAttributeBlockSyntax WithEqualsToken(SyntaxToken equalsToken)
+    {
+        return Update(NamePrefix, Name, NameSuffix, equalsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupAttributeBlockSyntax WithValuePrefix(MarkupTextLiteralSyntax valuePrefix)
+    {
+        return Update(NamePrefix, Name, NameSuffix, EqualsToken, valuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupAttributeBlockSyntax WithValue(RazorBlockSyntax value)
+    {
+        return Update(NamePrefix, Name, NameSuffix, EqualsToken, ValuePrefix, value, ValueSuffix);
+    }
+
+    public MarkupAttributeBlockSyntax WithValueSuffix(MarkupTextLiteralSyntax valueSuffix)
+    {
+        return Update(NamePrefix, Name, NameSuffix, EqualsToken, ValuePrefix, Value, valueSuffix);
+    }
+
+    public MarkupAttributeBlockSyntax AddNamePrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _namePrefix = this.NamePrefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithNamePrefix(_namePrefix.WithLiteralTokens(_namePrefix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupAttributeBlockSyntax AddNameLiteralTokens(params SyntaxToken[] items)
+    {
+        return this.WithName(this.Name.WithLiteralTokens(this.Name.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupAttributeBlockSyntax AddNameSuffixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _nameSuffix = this.NameSuffix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithNameSuffix(_nameSuffix.WithLiteralTokens(_nameSuffix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupAttributeBlockSyntax AddValuePrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _valuePrefix = this.ValuePrefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithValuePrefix(_valuePrefix.WithLiteralTokens(_valuePrefix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupAttributeBlockSyntax AddValueSuffixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _valueSuffix = this.ValueSuffix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithValueSuffix(_valueSuffix.WithLiteralTokens(_valueSuffix.LiteralTokens.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class MarkupLiteralAttributeValueSyntax : MarkupSyntaxNode
+  {
+    private MarkupTextLiteralSyntax _prefix;
+    private MarkupTextLiteralSyntax _value;
+
+    internal MarkupLiteralAttributeValueSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public MarkupTextLiteralSyntax Prefix 
+    {
+        get
+        {
+            return GetRedAtZero(ref _prefix);
+        }
+    }
+
+    public MarkupTextLiteralSyntax Value 
+    {
+        get
+        {
+            return GetRed(ref _value, 1);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _prefix);
+            case 1: return GetRed(ref _value, 1);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _prefix;
+            case 1: return _value;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupLiteralAttributeValue(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupLiteralAttributeValue(this);
+    }
+
+    public MarkupLiteralAttributeValueSyntax Update(MarkupTextLiteralSyntax prefix, MarkupTextLiteralSyntax value)
+    {
+        if (prefix != Prefix || value != Value)
+        {
+            var newNode = SyntaxFactory.MarkupLiteralAttributeValue(prefix, value);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupLiteralAttributeValueSyntax WithPrefix(MarkupTextLiteralSyntax prefix)
+    {
+        return Update(prefix, Value);
+    }
+
+    public MarkupLiteralAttributeValueSyntax WithValue(MarkupTextLiteralSyntax value)
+    {
+        return Update(Prefix, value);
+    }
+
+    public MarkupLiteralAttributeValueSyntax AddPrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _prefix = this.Prefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithPrefix(_prefix.WithLiteralTokens(_prefix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupLiteralAttributeValueSyntax AddValueLiteralTokens(params SyntaxToken[] items)
+    {
+        var _value = this.Value ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithValue(_value.WithLiteralTokens(_value.LiteralTokens.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class MarkupDynamicAttributeValueSyntax : MarkupSyntaxNode
+  {
+    private MarkupTextLiteralSyntax _prefix;
+    private RazorBlockSyntax _value;
+
+    internal MarkupDynamicAttributeValueSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public MarkupTextLiteralSyntax Prefix 
+    {
+        get
+        {
+            return GetRedAtZero(ref _prefix);
+        }
+    }
+
+    public RazorBlockSyntax Value 
+    {
+        get
+        {
+            return GetRed(ref _value, 1);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _prefix);
+            case 1: return GetRed(ref _value, 1);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _prefix;
+            case 1: return _value;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupDynamicAttributeValue(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupDynamicAttributeValue(this);
+    }
+
+    public MarkupDynamicAttributeValueSyntax Update(MarkupTextLiteralSyntax prefix, RazorBlockSyntax value)
+    {
+        if (prefix != Prefix || value != Value)
+        {
+            var newNode = SyntaxFactory.MarkupDynamicAttributeValue(prefix, value);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupDynamicAttributeValueSyntax WithPrefix(MarkupTextLiteralSyntax prefix)
+    {
+        return Update(prefix, Value);
+    }
+
+    public MarkupDynamicAttributeValueSyntax WithValue(RazorBlockSyntax value)
+    {
+        return Update(Prefix, value);
+    }
+
+    public MarkupDynamicAttributeValueSyntax AddPrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _prefix = this.Prefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithPrefix(_prefix.WithLiteralTokens(_prefix.LiteralTokens.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class MarkupElementSyntax : MarkupSyntaxNode
+  {
+    private MarkupTagBlockSyntax _startTag;
+    private SyntaxNode _body;
+    private MarkupTagBlockSyntax _endTag;
+
+    internal MarkupElementSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public MarkupTagBlockSyntax StartTag 
+    {
+        get
+        {
+            return GetRedAtZero(ref _startTag);
+        }
+    }
+
+    public SyntaxList<RazorSyntaxNode> Body 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _body, 1));
+        }
+    }
+
+    public MarkupTagBlockSyntax EndTag 
+    {
+        get
+        {
+            return GetRed(ref _endTag, 2);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _startTag);
+            case 1: return GetRed(ref _body, 1);
+            case 2: return GetRed(ref _endTag, 2);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _startTag;
+            case 1: return _body;
+            case 2: return _endTag;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupElement(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupElement(this);
+    }
+
+    public MarkupElementSyntax Update(MarkupTagBlockSyntax startTag, SyntaxList<RazorSyntaxNode> body, MarkupTagBlockSyntax endTag)
+    {
+        if (startTag != StartTag || body != Body || endTag != EndTag)
+        {
+            var newNode = SyntaxFactory.MarkupElement(startTag, body, endTag);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupElementSyntax WithStartTag(MarkupTagBlockSyntax startTag)
+    {
+        return Update(startTag, Body, EndTag);
+    }
+
+    public MarkupElementSyntax WithBody(SyntaxList<RazorSyntaxNode> body)
+    {
+        return Update(StartTag, body, EndTag);
+    }
+
+    public MarkupElementSyntax WithEndTag(MarkupTagBlockSyntax endTag)
+    {
+        return Update(StartTag, Body, endTag);
+    }
+
+    public MarkupElementSyntax AddStartTagChildren(params RazorSyntaxNode[] items)
+    {
+        var _startTag = this.StartTag ?? SyntaxFactory.MarkupTagBlock();
+        return this.WithStartTag(_startTag.WithChildren(_startTag.Children.AddRange(items)));
+    }
+
+    public MarkupElementSyntax AddBody(params RazorSyntaxNode[] items)
+    {
+        return WithBody(this.Body.AddRange(items));
+    }
+
+    public MarkupElementSyntax AddEndTagChildren(params RazorSyntaxNode[] items)
+    {
+        var _endTag = this.EndTag ?? SyntaxFactory.MarkupTagBlock();
+        return this.WithEndTag(_endTag.WithChildren(_endTag.Children.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperElementSyntax : MarkupSyntaxNode
+  {
+    private MarkupTagHelperStartTagSyntax _startTag;
+    private SyntaxNode _body;
+    private MarkupTagHelperEndTagSyntax _endTag;
+
+    internal MarkupTagHelperElementSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public MarkupTagHelperStartTagSyntax StartTag 
+    {
+        get
+        {
+            return GetRedAtZero(ref _startTag);
+        }
+    }
+
+    public SyntaxList<RazorSyntaxNode> Body 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _body, 1));
+        }
+    }
+
+    public MarkupTagHelperEndTagSyntax EndTag 
+    {
+        get
+        {
+            return GetRed(ref _endTag, 2);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _startTag);
+            case 1: return GetRed(ref _body, 1);
+            case 2: return GetRed(ref _endTag, 2);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _startTag;
+            case 1: return _body;
+            case 2: return _endTag;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperElement(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperElement(this);
+    }
+
+    public MarkupTagHelperElementSyntax Update(MarkupTagHelperStartTagSyntax startTag, SyntaxList<RazorSyntaxNode> body, MarkupTagHelperEndTagSyntax endTag)
+    {
+        if (startTag != StartTag || body != Body || endTag != EndTag)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperElement(startTag, body, endTag);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupTagHelperElementSyntax WithStartTag(MarkupTagHelperStartTagSyntax startTag)
+    {
+        return Update(startTag, Body, EndTag);
+    }
+
+    public MarkupTagHelperElementSyntax WithBody(SyntaxList<RazorSyntaxNode> body)
+    {
+        return Update(StartTag, body, EndTag);
+    }
+
+    public MarkupTagHelperElementSyntax WithEndTag(MarkupTagHelperEndTagSyntax endTag)
+    {
+        return Update(StartTag, Body, endTag);
+    }
+
+    public MarkupTagHelperElementSyntax AddStartTagChildren(params RazorSyntaxNode[] items)
+    {
+        return this.WithStartTag(this.StartTag.WithChildren(this.StartTag.Children.AddRange(items)));
+    }
+
+    public MarkupTagHelperElementSyntax AddBody(params RazorSyntaxNode[] items)
+    {
+        return WithBody(this.Body.AddRange(items));
+    }
+
+    public MarkupTagHelperElementSyntax AddEndTagChildren(params RazorSyntaxNode[] items)
+    {
+        var _endTag = this.EndTag ?? SyntaxFactory.MarkupTagHelperEndTag();
+        return this.WithEndTag(_endTag.WithChildren(_endTag.Children.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperStartTagSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal MarkupTagHelperStartTagSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperStartTag(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperStartTag(this);
+    }
+
+    public MarkupTagHelperStartTagSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperStartTag(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new MarkupTagHelperStartTagSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new MarkupTagHelperStartTagSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperEndTagSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal MarkupTagHelperEndTagSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperEndTag(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperEndTag(this);
+    }
+
+    public MarkupTagHelperEndTagSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperEndTag(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new MarkupTagHelperEndTagSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new MarkupTagHelperEndTagSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperAttributeSyntax : MarkupSyntaxNode
+  {
+    private MarkupTextLiteralSyntax _namePrefix;
+    private MarkupTextLiteralSyntax _name;
+    private MarkupTextLiteralSyntax _nameSuffix;
+    private SyntaxToken _equalsToken;
+    private MarkupTextLiteralSyntax _valuePrefix;
+    private MarkupTagHelperAttributeValueSyntax _value;
+    private MarkupTextLiteralSyntax _valueSuffix;
+
+    internal MarkupTagHelperAttributeSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix 
+    {
+        get
+        {
+            return GetRedAtZero(ref _namePrefix);
+        }
+    }
+
+    public MarkupTextLiteralSyntax Name 
+    {
+        get
+        {
+            return GetRed(ref _name, 1);
+        }
+    }
+
+    public MarkupTextLiteralSyntax NameSuffix 
+    {
+        get
+        {
+            return GetRed(ref _nameSuffix, 2);
+        }
+    }
+
+    public SyntaxToken EqualsToken 
+    {
+        get
+        {
+            return GetRed(ref _equalsToken, 3);
+        }
+    }
+
+    public MarkupTextLiteralSyntax ValuePrefix 
+    {
+        get
+        {
+            return GetRed(ref _valuePrefix, 4);
+        }
+    }
+
+    public MarkupTagHelperAttributeValueSyntax Value 
+    {
+        get
+        {
+            return GetRed(ref _value, 5);
+        }
+    }
+
+    public MarkupTextLiteralSyntax ValueSuffix 
+    {
+        get
+        {
+            return GetRed(ref _valueSuffix, 6);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _namePrefix);
+            case 1: return GetRed(ref _name, 1);
+            case 2: return GetRed(ref _nameSuffix, 2);
+            case 3: return GetRed(ref _equalsToken, 3);
+            case 4: return GetRed(ref _valuePrefix, 4);
+            case 5: return GetRed(ref _value, 5);
+            case 6: return GetRed(ref _valueSuffix, 6);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _name;
+            case 2: return _nameSuffix;
+            case 3: return _equalsToken;
+            case 4: return _valuePrefix;
+            case 5: return _value;
+            case 6: return _valueSuffix;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperAttribute(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperAttribute(this);
+    }
+
+    public MarkupTagHelperAttributeSyntax Update(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name, MarkupTextLiteralSyntax nameSuffix, SyntaxToken equalsToken, MarkupTextLiteralSyntax valuePrefix, MarkupTagHelperAttributeValueSyntax value, MarkupTextLiteralSyntax valueSuffix)
+    {
+        if (namePrefix != NamePrefix || name != Name || nameSuffix != NameSuffix || equalsToken != EqualsToken || valuePrefix != ValuePrefix || value != Value || valueSuffix != ValueSuffix)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperAttribute(namePrefix, name, nameSuffix, equalsToken, valuePrefix, value, valueSuffix);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupTagHelperAttributeSyntax WithNamePrefix(MarkupTextLiteralSyntax namePrefix)
+    {
+        return Update(namePrefix, Name, NameSuffix, EqualsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupTagHelperAttributeSyntax WithName(MarkupTextLiteralSyntax name)
+    {
+        return Update(NamePrefix, name, NameSuffix, EqualsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupTagHelperAttributeSyntax WithNameSuffix(MarkupTextLiteralSyntax nameSuffix)
+    {
+        return Update(NamePrefix, Name, nameSuffix, EqualsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupTagHelperAttributeSyntax WithEqualsToken(SyntaxToken equalsToken)
+    {
+        return Update(NamePrefix, Name, NameSuffix, equalsToken, ValuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupTagHelperAttributeSyntax WithValuePrefix(MarkupTextLiteralSyntax valuePrefix)
+    {
+        return Update(NamePrefix, Name, NameSuffix, EqualsToken, valuePrefix, Value, ValueSuffix);
+    }
+
+    public MarkupTagHelperAttributeSyntax WithValue(MarkupTagHelperAttributeValueSyntax value)
+    {
+        return Update(NamePrefix, Name, NameSuffix, EqualsToken, ValuePrefix, value, ValueSuffix);
+    }
+
+    public MarkupTagHelperAttributeSyntax WithValueSuffix(MarkupTextLiteralSyntax valueSuffix)
+    {
+        return Update(NamePrefix, Name, NameSuffix, EqualsToken, ValuePrefix, Value, valueSuffix);
+    }
+
+    public MarkupTagHelperAttributeSyntax AddNamePrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _namePrefix = this.NamePrefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithNamePrefix(_namePrefix.WithLiteralTokens(_namePrefix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupTagHelperAttributeSyntax AddNameLiteralTokens(params SyntaxToken[] items)
+    {
+        return this.WithName(this.Name.WithLiteralTokens(this.Name.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupTagHelperAttributeSyntax AddNameSuffixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _nameSuffix = this.NameSuffix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithNameSuffix(_nameSuffix.WithLiteralTokens(_nameSuffix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupTagHelperAttributeSyntax AddValuePrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _valuePrefix = this.ValuePrefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithValuePrefix(_valuePrefix.WithLiteralTokens(_valuePrefix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupTagHelperAttributeSyntax AddValueChildren(params RazorSyntaxNode[] items)
+    {
+        return this.WithValue(this.Value.WithChildren(this.Value.Children.AddRange(items)));
+    }
+
+    public MarkupTagHelperAttributeSyntax AddValueSuffixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _valueSuffix = this.ValueSuffix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithValueSuffix(_valueSuffix.WithLiteralTokens(_valueSuffix.LiteralTokens.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class MarkupMinimizedTagHelperAttributeSyntax : MarkupSyntaxNode
+  {
+    private MarkupTextLiteralSyntax _namePrefix;
+    private MarkupTextLiteralSyntax _name;
+
+    internal MarkupMinimizedTagHelperAttributeSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public MarkupTextLiteralSyntax NamePrefix 
+    {
+        get
+        {
+            return GetRedAtZero(ref _namePrefix);
+        }
+    }
+
+    public MarkupTextLiteralSyntax Name 
+    {
+        get
+        {
+            return GetRed(ref _name, 1);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _namePrefix);
+            case 1: return GetRed(ref _name, 1);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _namePrefix;
+            case 1: return _name;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupMinimizedTagHelperAttribute(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupMinimizedTagHelperAttribute(this);
+    }
+
+    public MarkupMinimizedTagHelperAttributeSyntax Update(MarkupTextLiteralSyntax namePrefix, MarkupTextLiteralSyntax name)
+    {
+        if (namePrefix != NamePrefix || name != Name)
+        {
+            var newNode = SyntaxFactory.MarkupMinimizedTagHelperAttribute(namePrefix, name);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public MarkupMinimizedTagHelperAttributeSyntax WithNamePrefix(MarkupTextLiteralSyntax namePrefix)
+    {
+        return Update(namePrefix, Name);
+    }
+
+    public MarkupMinimizedTagHelperAttributeSyntax WithName(MarkupTextLiteralSyntax name)
+    {
+        return Update(NamePrefix, name);
+    }
+
+    public MarkupMinimizedTagHelperAttributeSyntax AddNamePrefixLiteralTokens(params SyntaxToken[] items)
+    {
+        var _namePrefix = this.NamePrefix ?? SyntaxFactory.MarkupTextLiteral();
+        return this.WithNamePrefix(_namePrefix.WithLiteralTokens(_namePrefix.LiteralTokens.AddRange(items)));
+    }
+
+    public MarkupMinimizedTagHelperAttributeSyntax AddNameLiteralTokens(params SyntaxToken[] items)
+    {
+        return this.WithName(this.Name.WithLiteralTokens(this.Name.LiteralTokens.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class MarkupTagHelperAttributeValueSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal MarkupTagHelperAttributeValueSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitMarkupTagHelperAttributeValue(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitMarkupTagHelperAttributeValue(this);
+    }
+
+    public MarkupTagHelperAttributeValueSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.MarkupTagHelperAttributeValue(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new MarkupTagHelperAttributeValueSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new MarkupTagHelperAttributeValueSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal abstract partial class CSharpSyntaxNode : RazorSyntaxNode
+  {
+    internal CSharpSyntaxNode(GreenNode green, SyntaxNode parent, int position)
+      : base(green, parent, position)
+    {
+    }
+  }
+
+  internal sealed partial class CSharpCodeBlockSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal CSharpCodeBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpCodeBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpCodeBlock(this);
+    }
+
+    public CSharpCodeBlockSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.CSharpCodeBlock(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new CSharpCodeBlockSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new CSharpCodeBlockSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal sealed partial class CSharpTransitionSyntax : CSharpSyntaxNode
+  {
+    private SyntaxToken _transition;
+
+    internal CSharpTransitionSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxToken Transition 
+    {
+        get
+        {
+            return GetRedAtZero(ref _transition);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _transition);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpTransition(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpTransition(this);
+    }
+
+    public CSharpTransitionSyntax Update(SyntaxToken transition)
+    {
+        if (transition != Transition)
+        {
+            var newNode = SyntaxFactory.CSharpTransition(transition);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public CSharpTransitionSyntax WithTransition(SyntaxToken transition)
+    {
+        return Update(transition);
+    }
+  }
+
+  internal sealed partial class CSharpStatementLiteralSyntax : CSharpSyntaxNode
+  {
+    private SyntaxNode _literalTokens;
+
+    internal CSharpStatementLiteralSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens 
+    {
+        get
+        {
+            return new SyntaxList<SyntaxToken>(GetRed(ref _literalTokens, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _literalTokens);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpStatementLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpStatementLiteral(this);
+    }
+
+    public CSharpStatementLiteralSyntax Update(SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.CSharpStatementLiteral(literalTokens);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public CSharpStatementLiteralSyntax WithLiteralTokens(SyntaxList<SyntaxToken> literalTokens)
+    {
+        return Update(literalTokens);
+    }
+
+    public CSharpStatementLiteralSyntax AddLiteralTokens(params SyntaxToken[] items)
+    {
+        return WithLiteralTokens(this.LiteralTokens.AddRange(items));
+    }
+  }
+
+  internal sealed partial class CSharpExpressionLiteralSyntax : CSharpSyntaxNode
+  {
+    private SyntaxNode _literalTokens;
+
+    internal CSharpExpressionLiteralSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens 
+    {
+        get
+        {
+            return new SyntaxList<SyntaxToken>(GetRed(ref _literalTokens, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _literalTokens);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpExpressionLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpExpressionLiteral(this);
+    }
+
+    public CSharpExpressionLiteralSyntax Update(SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.CSharpExpressionLiteral(literalTokens);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public CSharpExpressionLiteralSyntax WithLiteralTokens(SyntaxList<SyntaxToken> literalTokens)
+    {
+        return Update(literalTokens);
+    }
+
+    public CSharpExpressionLiteralSyntax AddLiteralTokens(params SyntaxToken[] items)
+    {
+        return WithLiteralTokens(this.LiteralTokens.AddRange(items));
+    }
+  }
+
+  internal sealed partial class CSharpEphemeralTextLiteralSyntax : CSharpSyntaxNode
+  {
+    private SyntaxNode _literalTokens;
+
+    internal CSharpEphemeralTextLiteralSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public SyntaxList<SyntaxToken> LiteralTokens 
+    {
+        get
+        {
+            return new SyntaxList<SyntaxToken>(GetRed(ref _literalTokens, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _literalTokens);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _literalTokens;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpEphemeralTextLiteral(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpEphemeralTextLiteral(this);
+    }
+
+    public CSharpEphemeralTextLiteralSyntax Update(SyntaxList<SyntaxToken> literalTokens)
+    {
+        if (literalTokens != LiteralTokens)
+        {
+            var newNode = SyntaxFactory.CSharpEphemeralTextLiteral(literalTokens);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public CSharpEphemeralTextLiteralSyntax WithLiteralTokens(SyntaxList<SyntaxToken> literalTokens)
+    {
+        return Update(literalTokens);
+    }
+
+    public CSharpEphemeralTextLiteralSyntax AddLiteralTokens(params SyntaxToken[] items)
+    {
+        return WithLiteralTokens(this.LiteralTokens.AddRange(items));
+    }
+  }
+
+  internal sealed partial class CSharpTemplateBlockSyntax : RazorBlockSyntax
+  {
+    private SyntaxNode _children;
+
+    internal CSharpTemplateBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override SyntaxList<RazorSyntaxNode> Children 
+    {
+        get
+        {
+            return new SyntaxList<RazorSyntaxNode>(GetRed(ref _children, 0));
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _children);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _children;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpTemplateBlock(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpTemplateBlock(this);
+    }
+
+    public CSharpTemplateBlockSyntax Update(SyntaxList<RazorSyntaxNode> children)
+    {
+        if (children != Children)
+        {
+            var newNode = SyntaxFactory.CSharpTemplateBlock(children);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override RazorBlockSyntax WithChildrenCore(SyntaxList<RazorSyntaxNode> children) => WithChildren(children);
+    public new CSharpTemplateBlockSyntax WithChildren(SyntaxList<RazorSyntaxNode> children)
+    {
+        return Update(children);
+    }
+    internal override RazorBlockSyntax AddChildrenCore(params RazorSyntaxNode[] items) => AddChildren(items);
+
+    public new CSharpTemplateBlockSyntax AddChildren(params RazorSyntaxNode[] items)
+    {
+        return WithChildren(this.Children.AddRange(items));
+    }
+  }
+
+  internal abstract partial class CSharpRazorBlockSyntax : CSharpSyntaxNode
+  {
+    internal CSharpRazorBlockSyntax(GreenNode green, SyntaxNode parent, int position)
+      : base(green, parent, position)
+    {
+    }
+
+    public abstract CSharpTransitionSyntax Transition { get; }
+    public CSharpRazorBlockSyntax WithTransition(CSharpTransitionSyntax transition) => WithTransitionCore(transition);
+    internal abstract CSharpRazorBlockSyntax WithTransitionCore(CSharpTransitionSyntax transition);
+
+    public abstract CSharpSyntaxNode Body { get; }
+    public CSharpRazorBlockSyntax WithBody(CSharpSyntaxNode body) => WithBodyCore(body);
+    internal abstract CSharpRazorBlockSyntax WithBodyCore(CSharpSyntaxNode body);
+  }
+
+  internal sealed partial class CSharpStatementSyntax : CSharpRazorBlockSyntax
+  {
+    private CSharpTransitionSyntax _transition;
+    private CSharpSyntaxNode _body;
+
+    internal CSharpStatementSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override CSharpTransitionSyntax Transition 
+    {
+        get
+        {
+            return GetRedAtZero(ref _transition);
+        }
+    }
+
+    public override CSharpSyntaxNode Body 
+    {
+        get
+        {
+            return GetRed(ref _body, 1);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _transition);
+            case 1: return GetRed(ref _body, 1);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            case 1: return _body;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpStatement(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpStatement(this);
+    }
+
+    public CSharpStatementSyntax Update(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+        if (transition != Transition || body != Body)
+        {
+            var newNode = SyntaxFactory.CSharpStatement(transition, body);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override CSharpRazorBlockSyntax WithTransitionCore(CSharpTransitionSyntax transition) => WithTransition(transition);
+    public new CSharpStatementSyntax WithTransition(CSharpTransitionSyntax transition)
+    {
+        return Update(transition, Body);
+    }
+
+    internal override CSharpRazorBlockSyntax WithBodyCore(CSharpSyntaxNode body) => WithBody(body);
+    public new CSharpStatementSyntax WithBody(CSharpSyntaxNode body)
+    {
+        return Update(Transition, body);
+    }
+  }
+
+  internal sealed partial class CSharpStatementBodySyntax : CSharpSyntaxNode
+  {
+    private RazorMetaCodeSyntax _openBrace;
+    private CSharpCodeBlockSyntax _cSharpCode;
+    private RazorMetaCodeSyntax _closeBrace;
+
+    internal CSharpStatementBodySyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public RazorMetaCodeSyntax OpenBrace 
+    {
+        get
+        {
+            return GetRedAtZero(ref _openBrace);
+        }
+    }
+
+    public CSharpCodeBlockSyntax CSharpCode 
+    {
+        get
+        {
+            return GetRed(ref _cSharpCode, 1);
+        }
+    }
+
+    public RazorMetaCodeSyntax CloseBrace 
+    {
+        get
+        {
+            return GetRed(ref _closeBrace, 2);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _openBrace);
+            case 1: return GetRed(ref _cSharpCode, 1);
+            case 2: return GetRed(ref _closeBrace, 2);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _openBrace;
+            case 1: return _cSharpCode;
+            case 2: return _closeBrace;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpStatementBody(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpStatementBody(this);
+    }
+
+    public CSharpStatementBodySyntax Update(RazorMetaCodeSyntax openBrace, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeBrace)
+    {
+        if (openBrace != OpenBrace || cSharpCode != CSharpCode || closeBrace != CloseBrace)
+        {
+            var newNode = SyntaxFactory.CSharpStatementBody(openBrace, cSharpCode, closeBrace);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public CSharpStatementBodySyntax WithOpenBrace(RazorMetaCodeSyntax openBrace)
+    {
+        return Update(openBrace, CSharpCode, CloseBrace);
+    }
+
+    public CSharpStatementBodySyntax WithCSharpCode(CSharpCodeBlockSyntax cSharpCode)
+    {
+        return Update(OpenBrace, cSharpCode, CloseBrace);
+    }
+
+    public CSharpStatementBodySyntax WithCloseBrace(RazorMetaCodeSyntax closeBrace)
+    {
+        return Update(OpenBrace, CSharpCode, closeBrace);
+    }
+
+    public CSharpStatementBodySyntax AddOpenBraceMetaCode(params SyntaxToken[] items)
+    {
+        return this.WithOpenBrace(this.OpenBrace.WithMetaCode(this.OpenBrace.MetaCode.AddRange(items)));
+    }
+
+    public CSharpStatementBodySyntax AddCSharpCodeChildren(params RazorSyntaxNode[] items)
+    {
+        return this.WithCSharpCode(this.CSharpCode.WithChildren(this.CSharpCode.Children.AddRange(items)));
+    }
+
+    public CSharpStatementBodySyntax AddCloseBraceMetaCode(params SyntaxToken[] items)
+    {
+        return this.WithCloseBrace(this.CloseBrace.WithMetaCode(this.CloseBrace.MetaCode.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class CSharpExplicitExpressionSyntax : CSharpRazorBlockSyntax
+  {
+    private CSharpTransitionSyntax _transition;
+    private CSharpSyntaxNode _body;
+
+    internal CSharpExplicitExpressionSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override CSharpTransitionSyntax Transition 
+    {
+        get
+        {
+            return GetRedAtZero(ref _transition);
+        }
+    }
+
+    public override CSharpSyntaxNode Body 
+    {
+        get
+        {
+            return GetRed(ref _body, 1);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _transition);
+            case 1: return GetRed(ref _body, 1);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            case 1: return _body;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpExplicitExpression(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpExplicitExpression(this);
+    }
+
+    public CSharpExplicitExpressionSyntax Update(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+        if (transition != Transition || body != Body)
+        {
+            var newNode = SyntaxFactory.CSharpExplicitExpression(transition, body);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override CSharpRazorBlockSyntax WithTransitionCore(CSharpTransitionSyntax transition) => WithTransition(transition);
+    public new CSharpExplicitExpressionSyntax WithTransition(CSharpTransitionSyntax transition)
+    {
+        return Update(transition, Body);
+    }
+
+    internal override CSharpRazorBlockSyntax WithBodyCore(CSharpSyntaxNode body) => WithBody(body);
+    public new CSharpExplicitExpressionSyntax WithBody(CSharpSyntaxNode body)
+    {
+        return Update(Transition, body);
+    }
+  }
+
+  internal sealed partial class CSharpExplicitExpressionBodySyntax : CSharpSyntaxNode
+  {
+    private RazorMetaCodeSyntax _openParen;
+    private CSharpCodeBlockSyntax _cSharpCode;
+    private RazorMetaCodeSyntax _closeParen;
+
+    internal CSharpExplicitExpressionBodySyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public RazorMetaCodeSyntax OpenParen 
+    {
+        get
+        {
+            return GetRedAtZero(ref _openParen);
+        }
+    }
+
+    public CSharpCodeBlockSyntax CSharpCode 
+    {
+        get
+        {
+            return GetRed(ref _cSharpCode, 1);
+        }
+    }
+
+    public RazorMetaCodeSyntax CloseParen 
+    {
+        get
+        {
+            return GetRed(ref _closeParen, 2);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _openParen);
+            case 1: return GetRed(ref _cSharpCode, 1);
+            case 2: return GetRed(ref _closeParen, 2);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _openParen;
+            case 1: return _cSharpCode;
+            case 2: return _closeParen;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpExplicitExpressionBody(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpExplicitExpressionBody(this);
+    }
+
+    public CSharpExplicitExpressionBodySyntax Update(RazorMetaCodeSyntax openParen, CSharpCodeBlockSyntax cSharpCode, RazorMetaCodeSyntax closeParen)
+    {
+        if (openParen != OpenParen || cSharpCode != CSharpCode || closeParen != CloseParen)
+        {
+            var newNode = SyntaxFactory.CSharpExplicitExpressionBody(openParen, cSharpCode, closeParen);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public CSharpExplicitExpressionBodySyntax WithOpenParen(RazorMetaCodeSyntax openParen)
+    {
+        return Update(openParen, CSharpCode, CloseParen);
+    }
+
+    public CSharpExplicitExpressionBodySyntax WithCSharpCode(CSharpCodeBlockSyntax cSharpCode)
+    {
+        return Update(OpenParen, cSharpCode, CloseParen);
+    }
+
+    public CSharpExplicitExpressionBodySyntax WithCloseParen(RazorMetaCodeSyntax closeParen)
+    {
+        return Update(OpenParen, CSharpCode, closeParen);
+    }
+
+    public CSharpExplicitExpressionBodySyntax AddOpenParenMetaCode(params SyntaxToken[] items)
+    {
+        return this.WithOpenParen(this.OpenParen.WithMetaCode(this.OpenParen.MetaCode.AddRange(items)));
+    }
+
+    public CSharpExplicitExpressionBodySyntax AddCSharpCodeChildren(params RazorSyntaxNode[] items)
+    {
+        return this.WithCSharpCode(this.CSharpCode.WithChildren(this.CSharpCode.Children.AddRange(items)));
+    }
+
+    public CSharpExplicitExpressionBodySyntax AddCloseParenMetaCode(params SyntaxToken[] items)
+    {
+        return this.WithCloseParen(this.CloseParen.WithMetaCode(this.CloseParen.MetaCode.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class CSharpImplicitExpressionSyntax : CSharpRazorBlockSyntax
+  {
+    private CSharpTransitionSyntax _transition;
+    private CSharpSyntaxNode _body;
+
+    internal CSharpImplicitExpressionSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override CSharpTransitionSyntax Transition 
+    {
+        get
+        {
+            return GetRedAtZero(ref _transition);
+        }
+    }
+
+    public override CSharpSyntaxNode Body 
+    {
+        get
+        {
+            return GetRed(ref _body, 1);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _transition);
+            case 1: return GetRed(ref _body, 1);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            case 1: return _body;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpImplicitExpression(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpImplicitExpression(this);
+    }
+
+    public CSharpImplicitExpressionSyntax Update(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+        if (transition != Transition || body != Body)
+        {
+            var newNode = SyntaxFactory.CSharpImplicitExpression(transition, body);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override CSharpRazorBlockSyntax WithTransitionCore(CSharpTransitionSyntax transition) => WithTransition(transition);
+    public new CSharpImplicitExpressionSyntax WithTransition(CSharpTransitionSyntax transition)
+    {
+        return Update(transition, Body);
+    }
+
+    internal override CSharpRazorBlockSyntax WithBodyCore(CSharpSyntaxNode body) => WithBody(body);
+    public new CSharpImplicitExpressionSyntax WithBody(CSharpSyntaxNode body)
+    {
+        return Update(Transition, body);
+    }
+  }
+
+  internal sealed partial class CSharpImplicitExpressionBodySyntax : CSharpSyntaxNode
+  {
+    private CSharpCodeBlockSyntax _cSharpCode;
+
+    internal CSharpImplicitExpressionBodySyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public CSharpCodeBlockSyntax CSharpCode 
+    {
+        get
+        {
+            return GetRedAtZero(ref _cSharpCode);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _cSharpCode);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _cSharpCode;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitCSharpImplicitExpressionBody(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitCSharpImplicitExpressionBody(this);
+    }
+
+    public CSharpImplicitExpressionBodySyntax Update(CSharpCodeBlockSyntax cSharpCode)
+    {
+        if (cSharpCode != CSharpCode)
+        {
+            var newNode = SyntaxFactory.CSharpImplicitExpressionBody(cSharpCode);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public CSharpImplicitExpressionBodySyntax WithCSharpCode(CSharpCodeBlockSyntax cSharpCode)
+    {
+        return Update(cSharpCode);
+    }
+
+    public CSharpImplicitExpressionBodySyntax AddCSharpCodeChildren(params RazorSyntaxNode[] items)
+    {
+        return this.WithCSharpCode(this.CSharpCode.WithChildren(this.CSharpCode.Children.AddRange(items)));
+    }
+  }
+
+  internal sealed partial class RazorDirectiveSyntax : CSharpRazorBlockSyntax
+  {
+    private CSharpTransitionSyntax _transition;
+    private CSharpSyntaxNode _body;
+
+    internal RazorDirectiveSyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public override CSharpTransitionSyntax Transition 
+    {
+        get
+        {
+            return GetRedAtZero(ref _transition);
+        }
+    }
+
+    public override CSharpSyntaxNode Body 
+    {
+        get
+        {
+            return GetRed(ref _body, 1);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _transition);
+            case 1: return GetRed(ref _body, 1);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _transition;
+            case 1: return _body;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorDirective(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorDirective(this);
+    }
+
+    public RazorDirectiveSyntax Update(CSharpTransitionSyntax transition, CSharpSyntaxNode body)
+    {
+        if (transition != Transition || body != Body)
+        {
+            var newNode = SyntaxFactory.RazorDirective(transition, body);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    internal override CSharpRazorBlockSyntax WithTransitionCore(CSharpTransitionSyntax transition) => WithTransition(transition);
+    public new RazorDirectiveSyntax WithTransition(CSharpTransitionSyntax transition)
+    {
+        return Update(transition, Body);
+    }
+
+    internal override CSharpRazorBlockSyntax WithBodyCore(CSharpSyntaxNode body) => WithBody(body);
+    public new RazorDirectiveSyntax WithBody(CSharpSyntaxNode body)
+    {
+        return Update(Transition, body);
+    }
+  }
+
+  internal sealed partial class RazorDirectiveBodySyntax : CSharpSyntaxNode
+  {
+    private RazorSyntaxNode _keyword;
+    private CSharpCodeBlockSyntax _cSharpCode;
+
+    internal RazorDirectiveBodySyntax(GreenNode green, SyntaxNode parent, int position)
+        : base(green, parent, position)
+    {
+    }
+
+    public RazorSyntaxNode Keyword 
+    {
+        get
+        {
+            return GetRedAtZero(ref _keyword);
+        }
+    }
+
+    public CSharpCodeBlockSyntax CSharpCode 
+    {
+        get
+        {
+            return GetRed(ref _cSharpCode, 1);
+        }
+    }
+
+    internal override SyntaxNode GetNodeSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return GetRedAtZero(ref _keyword);
+            case 1: return GetRed(ref _cSharpCode, 1);
+            default: return null;
+        }
+    }
+    internal override SyntaxNode GetCachedSlot(int index)
+    {
+        switch (index)
+        {
+            case 0: return _keyword;
+            case 1: return _cSharpCode;
+            default: return null;
+        }
+    }
+
+    public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+    {
+        return visitor.VisitRazorDirectiveBody(this);
+    }
+
+    public override void Accept(SyntaxVisitor visitor)
+    {
+        visitor.VisitRazorDirectiveBody(this);
+    }
+
+    public RazorDirectiveBodySyntax Update(RazorSyntaxNode keyword, CSharpCodeBlockSyntax cSharpCode)
+    {
+        if (keyword != Keyword || cSharpCode != CSharpCode)
+        {
+            var newNode = SyntaxFactory.RazorDirectiveBody(keyword, cSharpCode);
+            var annotations = GetAnnotations();
+            if (annotations != null && annotations.Length > 0)
+               return newNode.WithAnnotations(annotations);
+            return newNode;
+        }
+
+        return this;
+    }
+
+    public RazorDirectiveBodySyntax WithKeyword(RazorSyntaxNode keyword)
+    {
+        return Update(keyword, CSharpCode);
+    }
+
+    public RazorDirectiveBodySyntax WithCSharpCode(CSharpCodeBlockSyntax cSharpCode)
+    {
+        return Update(Keyword, cSharpCode);
+    }
+
+    public RazorDirectiveBodySyntax AddCSharpCodeChildren(params RazorSyntaxNode[] items)
+    {
+        var _cSharpCode = this.CSharpCode ?? SyntaxFactory.CSharpCodeBlock();
+        return this.WithCSharpCode(_cSharpCode.WithChildren(_cSharpCode.Children.AddRange(items)));
+    }
+  }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/GreenNode.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/GreenNode.cs
new file mode 100644
index 0000000000..3f03464510
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/GreenNode.cs
@@ -0,0 +1,583 @@
+// 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;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal abstract class GreenNode
+    {
+        private static readonly RazorDiagnostic[] EmptyDiagnostics = Array.Empty<RazorDiagnostic>();
+        private static readonly SyntaxAnnotation[] EmptyAnnotations = Array.Empty<SyntaxAnnotation>();
+        private static readonly ConditionalWeakTable<GreenNode, RazorDiagnostic[]> DiagnosticsTable =
+            new ConditionalWeakTable<GreenNode, RazorDiagnostic[]>();
+        private static readonly ConditionalWeakTable<GreenNode, SyntaxAnnotation[]> AnnotationsTable =
+            new ConditionalWeakTable<GreenNode, SyntaxAnnotation[]>();
+        private byte _slotCount;
+
+        protected GreenNode(SyntaxKind kind)
+        {
+            Kind = kind;
+        }
+
+        protected GreenNode(SyntaxKind kind, int fullWidth)
+            : this(kind)
+        {
+            FullWidth = fullWidth;
+        }
+
+        protected GreenNode(SyntaxKind kind, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+            : this(kind, 0, diagnostics, annotations)
+        {
+        }
+
+        protected GreenNode(SyntaxKind kind, int fullWidth, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+            : this(kind, fullWidth)
+        {
+            if (diagnostics?.Length > 0)
+            {
+                Flags |= NodeFlags.ContainsDiagnostics;
+                DiagnosticsTable.Add(this, diagnostics);
+            }
+
+            if (annotations?.Length > 0)
+            {
+                foreach (var annotation in annotations)
+                {
+                    if (annotation == null)
+                    {
+                        throw new ArgumentException(nameof(annotations), "Annotation cannot be null");
+                    }
+                }
+
+                Flags |= NodeFlags.ContainsAnnotations;
+                AnnotationsTable.Add(this, annotations);
+            }
+        }
+
+        protected void AdjustFlagsAndWidth(GreenNode node)
+        {
+            if (node == null)
+            {
+                return;
+            }
+
+            Flags |= (node.Flags & NodeFlags.InheritMask);
+            FullWidth += node.FullWidth;
+        }
+
+        #region Kind
+        internal SyntaxKind Kind { get; }
+
+        internal virtual bool IsList => false;
+
+        internal virtual bool IsToken => false;
+
+        internal virtual bool IsTrivia => false;
+        #endregion
+
+        #region Slots
+        public int SlotCount
+        {
+            get
+            {
+                int count = _slotCount;
+                if (count == byte.MaxValue)
+                {
+                    count = GetSlotCount();
+                }
+
+                return count;
+            }
+
+            protected set
+            {
+                _slotCount = (byte)value;
+            }
+        }
+
+        internal abstract GreenNode GetSlot(int index);
+
+        // for slot counts >= byte.MaxValue
+        protected virtual int GetSlotCount()
+        {
+            return _slotCount;
+        }
+
+        public virtual int GetSlotOffset(int index)
+        {
+            var offset = 0;
+            for (var i = 0; i < index; i++)
+            {
+                var child = GetSlot(i);
+                if (child != null)
+                    offset += child.FullWidth;
+            }
+
+            return offset;
+        }
+
+        public virtual int FindSlotIndexContainingOffset(int offset)
+        {
+            Debug.Assert(0 <= offset && offset < FullWidth);
+
+            int i;
+            var accumulatedWidth = 0;
+            for (i = 0; ; i++)
+            {
+                Debug.Assert(i < SlotCount);
+                var child = GetSlot(i);
+                if (child != null)
+                {
+                    accumulatedWidth += child.FullWidth;
+                    if (offset < accumulatedWidth)
+                    {
+                        break;
+                    }
+                }
+            }
+
+            return i;
+        }
+        #endregion
+
+        #region Flags
+        public NodeFlags Flags { get; protected set; }
+
+        internal void SetFlags(NodeFlags flags)
+        {
+            Flags |= flags;
+        }
+
+        internal void ClearFlags(NodeFlags flags)
+        {
+            Flags &= ~flags;
+        }
+
+        internal virtual bool IsMissing => (Flags & NodeFlags.IsMissing) != 0;
+
+        public bool ContainsDiagnostics
+        {
+            get
+            {
+                return (Flags & NodeFlags.ContainsDiagnostics) != 0;
+            }
+        }
+
+        public bool ContainsAnnotations
+        {
+            get
+            {
+                return (Flags & NodeFlags.ContainsAnnotations) != 0;
+            }
+        }
+        #endregion
+
+        #region Spans
+        internal int FullWidth { get; private set; }
+
+        public virtual int Width
+        {
+            get
+            {
+                return FullWidth - GetLeadingTriviaWidth() - GetTrailingTriviaWidth();
+            }
+        }
+
+        public virtual int GetLeadingTriviaWidth()
+        {
+            return FullWidth != 0 ? GetFirstTerminal().GetLeadingTriviaWidth() : 0;
+        }
+
+        public virtual int GetTrailingTriviaWidth()
+        {
+            return FullWidth != 0 ? GetLastTerminal().GetTrailingTriviaWidth() : 0;
+        }
+
+        public bool HasLeadingTrivia
+        {
+            get
+            {
+                return GetLeadingTriviaWidth() != 0;
+            }
+        }
+
+        public bool HasTrailingTrivia
+        {
+            get
+            {
+                return GetTrailingTriviaWidth() != 0;
+            }
+        }
+        #endregion
+
+        #region Diagnostics
+        internal abstract GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics);
+
+        internal RazorDiagnostic[] GetDiagnostics()
+        {
+            if (ContainsDiagnostics)
+            {
+                if (DiagnosticsTable.TryGetValue(this, out var diagnostics))
+                {
+                    return diagnostics;
+                }
+            }
+
+            return EmptyDiagnostics;
+        }
+        #endregion
+
+        #region Annotations
+        internal abstract GreenNode SetAnnotations(SyntaxAnnotation[] annotations);
+
+        internal SyntaxAnnotation[] GetAnnotations()
+        {
+            if (ContainsAnnotations)
+            {
+                if (AnnotationsTable.TryGetValue(this, out var annotations))
+                {
+                    Debug.Assert(annotations.Length != 0, "There cannot be an empty annotation entry.");
+                    return annotations;
+                }
+            }
+
+            return EmptyAnnotations;
+        }
+        #endregion
+
+        #region Text
+        public override string ToString()
+        {
+            var builder = new StringBuilder();
+            builder.AppendFormat("{0}<{1}>", GetType().Name, Kind);
+
+            return builder.ToString();
+        }
+
+        public virtual string ToFullString()
+        {
+            var builder = new StringBuilder();
+            var writer = new StringWriter(builder, System.Globalization.CultureInfo.InvariantCulture);
+            WriteTo(writer);
+            return builder.ToString();
+        }
+
+        public virtual void WriteTo(TextWriter writer)
+        {
+            WriteTo(writer, leading: true, trailing: true);
+        }
+
+        protected internal void WriteTo(TextWriter writer, bool leading, bool trailing)
+        {
+            // Use an actual Stack so we can write out deeply recursive structures without overflowing.
+            var stack = new Stack<StackEntry>();
+            stack.Push(new StackEntry(this, leading, trailing));
+
+            // Separated out stack processing logic so that it does not unintentionally refer to 
+            // "this", "leading" or "trailing.
+            ProcessStack(writer, stack);
+        }
+
+        protected virtual void WriteTriviaTo(TextWriter writer)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected virtual void WriteTokenTo(TextWriter writer, bool leading, bool trailing)
+        {
+            throw new NotImplementedException();
+        }
+        #endregion
+
+        #region Tokens 
+
+        public virtual object GetValue()
+        {
+            return null;
+        }
+
+        public virtual string GetValueText()
+        {
+            return string.Empty;
+        }
+
+        public virtual GreenNode GetLeadingTrivia()
+        {
+            return null;
+        }
+
+        public virtual GreenNode GetTrailingTrivia()
+        {
+            return null;
+        }
+
+        public virtual GreenNode WithLeadingTrivia(GreenNode trivia)
+        {
+            return this;
+        }
+
+        public virtual GreenNode WithTrailingTrivia(GreenNode trivia)
+        {
+            return this;
+        }
+
+        public InternalSyntax.SyntaxToken GetFirstToken()
+        {
+            return (InternalSyntax.SyntaxToken)GetFirstTerminal();
+        }
+
+        public InternalSyntax.SyntaxToken GetLastToken()
+        {
+            return (InternalSyntax.SyntaxToken)GetLastTerminal();
+        }
+
+        internal GreenNode GetFirstTerminal()
+        {
+            var node = this;
+
+            do
+            {
+                GreenNode firstChild = null;
+                for (int i = 0, n = node.SlotCount; i < n; i++)
+                {
+                    var child = node.GetSlot(i);
+                    if (child != null && child.FullWidth > 0)
+                    {
+                        firstChild = child;
+                        break;
+                    }
+                }
+                node = firstChild;
+            } while (node?._slotCount > 0);
+
+            return node;
+        }
+
+        internal GreenNode GetLastTerminal()
+        {
+            var node = this;
+
+            do
+            {
+                GreenNode lastChild = null;
+                for (var i = node.SlotCount - 1; i >= 0; i--)
+                {
+                    var child = node.GetSlot(i);
+                    if (child != null && child.FullWidth > 0)
+                    {
+                        lastChild = child;
+                        break;
+                    }
+                }
+                node = lastChild;
+            } while (node?._slotCount > 0);
+
+            return node;
+        }
+        #endregion
+
+        #region Equivalence 
+        public virtual bool IsEquivalentTo(GreenNode other)
+        {
+            if (this == other)
+            {
+                return true;
+            }
+
+            if (other == null)
+            {
+                return false;
+            }
+
+            return EquivalentToInternal(this, other);
+        }
+
+        private static bool EquivalentToInternal(GreenNode node1, GreenNode node2)
+        {
+            if (node1.Kind != node2.Kind)
+            {
+                // A single-element list is usually represented as just a single node,
+                // but can be represented as a List node with one child. Move to that
+                // child if necessary.
+                if (node1.IsList && node1.SlotCount == 1)
+                {
+                    node1 = node1.GetSlot(0);
+                }
+
+                if (node2.IsList && node2.SlotCount == 1)
+                {
+                    node2 = node2.GetSlot(0);
+                }
+
+                if (node1.Kind != node2.Kind)
+                {
+                    return false;
+                }
+            }
+
+            if (node1.FullWidth != node2.FullWidth)
+            {
+                return false;
+            }
+
+            var n = node1.SlotCount;
+            if (n != node2.SlotCount)
+            {
+                return false;
+            }
+
+            for (var i = 0; i < n; i++)
+            {
+                var node1Child = node1.GetSlot(i);
+                var node2Child = node2.GetSlot(i);
+                if (node1Child != null && node2Child != null && !node1Child.IsEquivalentTo(node2Child))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+        #endregion
+
+        #region Factories
+        public virtual GreenNode CreateList(IEnumerable<GreenNode> nodes, bool alwaysCreateListNode = false)
+        {
+            if (nodes == null)
+            {
+                return null;
+            }
+
+            var list = nodes.ToArray();
+
+            switch (list.Length)
+            {
+                case 0:
+                    return null;
+                case 1:
+                    if (alwaysCreateListNode)
+                    {
+                        goto default;
+                    }
+                    else
+                    {
+                        return list[0];
+                    }
+                case 2:
+                    return InternalSyntax.SyntaxList.List(list[0], list[1]);
+                case 3:
+                    return InternalSyntax.SyntaxList.List(list[0], list[1], list[2]);
+                default:
+                    return InternalSyntax.SyntaxList.List(list);
+            }
+        }
+
+        public SyntaxNode CreateRed()
+        {
+            return CreateRed(null, 0);
+        }
+
+        internal abstract SyntaxNode CreateRed(SyntaxNode parent, int position);
+        #endregion
+
+        public abstract TResult Accept<TResult>(InternalSyntax.SyntaxVisitor<TResult> visitor);
+
+        public abstract void Accept(InternalSyntax.SyntaxVisitor visitor);
+
+        #region StaticMethods
+
+        private static void ProcessStack(TextWriter writer,
+            Stack<StackEntry> stack)
+        {
+            while (stack.Count > 0)
+            {
+                var current = stack.Pop();
+                var currentNode = current.Node;
+                var currentLeading = current.Leading;
+                var currentTrailing = current.Trailing;
+
+                if (currentNode.IsToken)
+                {
+                    currentNode.WriteTokenTo(writer, currentLeading, currentTrailing);
+                    continue;
+                }
+
+                if (currentNode.IsTrivia)
+                {
+                    currentNode.WriteTriviaTo(writer);
+                    continue;
+                }
+
+                var firstIndex = GetFirstNonNullChildIndex(currentNode);
+                var lastIndex = GetLastNonNullChildIndex(currentNode);
+
+                for (var i = lastIndex; i >= firstIndex; i--)
+                {
+                    var child = currentNode.GetSlot(i);
+                    if (child != null)
+                    {
+                        var first = i == firstIndex;
+                        var last = i == lastIndex;
+                        stack.Push(new StackEntry(child, currentLeading | !first, currentTrailing | !last));
+                    }
+                }
+            }
+        }
+
+        private static int GetFirstNonNullChildIndex(GreenNode node)
+        {
+            int n = node.SlotCount;
+            int firstIndex = 0;
+            for (; firstIndex < n; firstIndex++)
+            {
+                var child = node.GetSlot(firstIndex);
+                if (child != null)
+                {
+                    break;
+                }
+            }
+
+            return firstIndex;
+        }
+
+        private static int GetLastNonNullChildIndex(GreenNode node)
+        {
+            int n = node.SlotCount;
+            int lastIndex = n - 1;
+            for (; lastIndex >= 0; lastIndex--)
+            {
+                var child = node.GetSlot(lastIndex);
+                if (child != null)
+                {
+                    break;
+                }
+            }
+
+            return lastIndex;
+        }
+
+        private struct StackEntry
+        {
+            public StackEntry(GreenNode node, bool leading, bool trailing)
+            {
+                Node = node;
+                Leading = leading;
+                Trailing = trailing;
+            }
+
+            public GreenNode Node { get; }
+
+            public bool Leading { get; }
+
+            public bool Trailing { get; }
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/GreenNodeExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/GreenNodeExtensions.cs
new file mode 100644
index 0000000000..03cb22a20b
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/GreenNodeExtensions.cs
@@ -0,0 +1,58 @@
+// 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;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal static class GreenNodeExtensions
+    {
+        internal static InternalSyntax.SyntaxList<T> ToGreenList<T>(this SyntaxNode node) where T : GreenNode
+        {
+            return node != null ?
+                ToGreenList<T>(node.Green) :
+                default(InternalSyntax.SyntaxList<T>);
+        }
+
+        internal static InternalSyntax.SyntaxList<T> ToGreenList<T>(this GreenNode node) where T : GreenNode
+        {
+            return new InternalSyntax.SyntaxList<T>(node);
+        }
+
+        public static TNode WithAnnotationsGreen<TNode>(this TNode node, params SyntaxAnnotation[] annotations) where TNode : GreenNode
+        {
+            var newAnnotations = new List<SyntaxAnnotation>();
+            foreach (var candidate in annotations)
+            {
+                if (!newAnnotations.Contains(candidate))
+                {
+                    newAnnotations.Add(candidate);
+                }
+            }
+
+            if (newAnnotations.Count == 0)
+            {
+                var existingAnnotations = node.GetAnnotations();
+                if (existingAnnotations == null || existingAnnotations.Length == 0)
+                {
+                    return node;
+                }
+                else
+                {
+                    return (TNode)node.SetAnnotations(null);
+                }
+            }
+            else
+            {
+                return (TNode)node.SetAnnotations(newAnnotations.ToArray());
+            }
+        }
+
+        public static TNode WithDiagnosticsGreen<TNode>(this TNode node, params RazorDiagnostic[] diagnostics) where TNode : GreenNode
+        {
+            return (TNode)node.SetDiagnostics(diagnostics);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/RazorDirectiveSyntax.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/RazorDirectiveSyntax.cs
new file mode 100644
index 0000000000..ef27d17600
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/RazorDirectiveSyntax.cs
@@ -0,0 +1,34 @@
+// 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.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal sealed partial class RazorDirectiveSyntax
+    {
+        private static readonly string DirectiveDescriptorKey = typeof(DirectiveDescriptor).Name;
+
+        public DirectiveDescriptor DirectiveDescriptor
+        {
+            get
+            {
+                var annotation = GetAnnotations().FirstOrDefault(n => n.Kind == DirectiveDescriptorKey);
+                return annotation?.Data as DirectiveDescriptor;
+            }
+        }
+
+        public RazorDirectiveSyntax WithDirectiveDescriptor(DirectiveDescriptor descriptor)
+        {
+            var annotations = new List<SyntaxAnnotation>(GetAnnotations())
+            {
+                new SyntaxAnnotation(DirectiveDescriptorKey, descriptor)
+            };
+
+            var newGreen = this.WithAnnotationsGreen(annotations.ToArray());
+
+            return newGreen;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/RazorSyntaxNode.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/RazorSyntaxNode.cs
new file mode 100644
index 0000000000..a353a13dd7
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/RazorSyntaxNode.cs
@@ -0,0 +1,27 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal abstract partial class RazorSyntaxNode : GreenNode
+    {
+        protected RazorSyntaxNode(SyntaxKind kind) : base(kind)
+        {
+        }
+
+        protected RazorSyntaxNode(SyntaxKind kind, int fullWidth)
+            : base(kind, fullWidth)
+        {
+        }
+
+        protected RazorSyntaxNode(SyntaxKind kind, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+            : base(kind, diagnostics, annotations)
+        {
+        }
+
+        protected RazorSyntaxNode(SyntaxKind kind, int fullWidth, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+            : base(kind, fullWidth, diagnostics, annotations)
+        {
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxFactory.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxFactory.cs
new file mode 100644
index 0000000000..b8dba7bdf7
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxFactory.cs
@@ -0,0 +1,26 @@
+// 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.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal static partial class SyntaxFactory
+    {
+        internal static SyntaxToken Token(SyntaxKind kind, string content, IEnumerable<RazorDiagnostic> diagnostics)
+        {
+            return Token(kind, content, diagnostics.ToArray());
+        }
+
+        internal static SyntaxToken Token(SyntaxKind kind, string content, params RazorDiagnostic[] diagnostics)
+        {
+            return new SyntaxToken(kind, content, diagnostics);
+        }
+
+        internal static SyntaxToken MissingToken(SyntaxKind kind, params RazorDiagnostic[] diagnostics)
+        {
+            return SyntaxToken.CreateMissing(kind, diagnostics);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxList.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxList.cs
new file mode 100644
index 0000000000..ff466af513
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxList.cs
@@ -0,0 +1,428 @@
+// 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;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal abstract class SyntaxList : GreenNode
+    {
+        internal SyntaxList()
+            : base(SyntaxKind.List)
+        {
+        }
+
+        internal SyntaxList(RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+            : base(SyntaxKind.List, diagnostics, annotations)
+        {
+        }
+
+        internal override bool IsList => true;
+
+        internal static GreenNode List(GreenNode child)
+        {
+            return child;
+        }
+
+        internal static WithTwoChildren List(GreenNode child0, GreenNode child1)
+        {
+            Debug.Assert(child0 != null);
+            Debug.Assert(child1 != null);
+
+            var result = new WithTwoChildren(child0, child1);
+            return result;
+        }
+
+        internal static WithThreeChildren List(GreenNode child0, GreenNode child1, GreenNode child2)
+        {
+            Debug.Assert(child0 != null);
+            Debug.Assert(child1 != null);
+            Debug.Assert(child2 != null);
+
+            var result = new WithThreeChildren(child0, child1, child2);
+            return result;
+        }
+
+        internal static GreenNode List(GreenNode[] nodes)
+        {
+            return List(nodes, nodes.Length);
+        }
+
+        internal static GreenNode List(GreenNode[] nodes, int count)
+        {
+            var array = new ArrayElement<GreenNode>[count];
+            for (int i = 0; i < count; i++)
+            {
+                Debug.Assert(nodes[i] != null);
+                array[i].Value = nodes[i];
+            }
+
+            return List(array);
+        }
+
+        internal static SyntaxList List(ArrayElement<GreenNode>[] children)
+        {
+            // "WithLotsOfChildren" list will allocate a separate array to hold
+            // precomputed node offsets. It may not be worth it for smallish lists.
+            if (children.Length < 10)
+            {
+                return new WithManyChildren(children);
+            }
+            else
+            {
+                return new WithLotsOfChildren(children);
+            }
+        }
+
+        internal abstract void CopyTo(ArrayElement<GreenNode>[] array, int offset);
+
+        internal static GreenNode Concat(GreenNode left, GreenNode right)
+        {
+            if (left == null)
+            {
+                return right;
+            }
+
+            if (right == null)
+            {
+                return left;
+            }
+
+            var leftList = left as SyntaxList;
+            var rightList = right as SyntaxList;
+            if (leftList != null)
+            {
+                if (rightList != null)
+                {
+                    var tmp = new ArrayElement<GreenNode>[left.SlotCount + right.SlotCount];
+                    leftList.CopyTo(tmp, 0);
+                    rightList.CopyTo(tmp, left.SlotCount);
+                    return List(tmp);
+                }
+                else
+                {
+                    var tmp = new ArrayElement<GreenNode>[left.SlotCount + 1];
+                    leftList.CopyTo(tmp, 0);
+                    tmp[left.SlotCount].Value = right;
+                    return List(tmp);
+                }
+            }
+            else if (rightList != null)
+            {
+                var tmp = new ArrayElement<GreenNode>[rightList.SlotCount + 1];
+                tmp[0].Value = left;
+                rightList.CopyTo(tmp, 1);
+                return List(tmp);
+            }
+            else
+            {
+                return List(left, right);
+            }
+        }
+
+        public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+        {
+            return visitor.Visit(this);
+        }
+
+        public override void Accept(SyntaxVisitor visitor)
+        {
+            visitor.Visit(this);
+        }
+
+        internal class WithTwoChildren : SyntaxList
+        {
+            private readonly GreenNode _child0;
+            private readonly GreenNode _child1;
+
+            internal WithTwoChildren(GreenNode child0, GreenNode child1)
+            {
+                SlotCount = 2;
+                AdjustFlagsAndWidth(child0);
+                _child0 = child0;
+                AdjustFlagsAndWidth(child1);
+                _child1 = child1;
+            }
+
+            internal WithTwoChildren(RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations, GreenNode child0, GreenNode child1)
+            {
+                SlotCount = 2;
+                AdjustFlagsAndWidth(child0);
+                _child0 = child0;
+                AdjustFlagsAndWidth(child1);
+                _child1 = child1;
+            }
+
+            internal override GreenNode GetSlot(int index)
+            {
+                switch (index)
+                {
+                    case 0:
+                        return _child0;
+                    case 1:
+                        return _child1;
+                    default:
+                        return null;
+                }
+            }
+
+            internal override void CopyTo(ArrayElement<GreenNode>[] array, int offset)
+            {
+                array[offset].Value = _child0;
+                array[offset + 1].Value = _child1;
+            }
+
+            internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+            {
+                return new Syntax.SyntaxList.WithTwoChildren(this, parent, position);
+            }
+
+            internal override GreenNode SetDiagnostics(RazorDiagnostic[] errors)
+            {
+                return new WithTwoChildren(errors, this.GetAnnotations(), _child0, _child1);
+            }
+
+            internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+            {
+                return new WithTwoChildren(GetDiagnostics(), annotations, _child0, _child1);
+            }
+        }
+
+        internal class WithThreeChildren : SyntaxList
+        {
+            private readonly GreenNode _child0;
+            private readonly GreenNode _child1;
+            private readonly GreenNode _child2;
+
+            internal WithThreeChildren(GreenNode child0, GreenNode child1, GreenNode child2)
+            {
+                SlotCount = 3;
+                AdjustFlagsAndWidth(child0);
+                _child0 = child0;
+                AdjustFlagsAndWidth(child1);
+                _child1 = child1;
+                AdjustFlagsAndWidth(child2);
+                _child2 = child2;
+            }
+
+            internal WithThreeChildren(RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations, GreenNode child0, GreenNode child1, GreenNode child2)
+                : base(diagnostics, annotations)
+            {
+                SlotCount = 3;
+                AdjustFlagsAndWidth(child0);
+                _child0 = child0;
+                AdjustFlagsAndWidth(child1);
+                _child1 = child1;
+                AdjustFlagsAndWidth(child2);
+                _child2 = child2;
+            }
+
+            internal override GreenNode GetSlot(int index)
+            {
+                switch (index)
+                {
+                    case 0:
+                        return _child0;
+                    case 1:
+                        return _child1;
+                    case 2:
+                        return _child2;
+                    default:
+                        return null;
+                }
+            }
+
+            internal override void CopyTo(ArrayElement<GreenNode>[] array, int offset)
+            {
+                array[offset].Value = _child0;
+                array[offset + 1].Value = _child1;
+                array[offset + 2].Value = _child2;
+            }
+
+            internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+            {
+                return new Syntax.SyntaxList.WithThreeChildren(this, parent, position);
+            }
+
+            internal override GreenNode SetDiagnostics(RazorDiagnostic[] errors)
+            {
+                return new WithThreeChildren(errors, GetAnnotations(), _child0, _child1, _child2);
+            }
+
+            internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+            {
+                return new WithThreeChildren(GetDiagnostics(), annotations, _child0, _child1, _child2);
+            }
+        }
+
+        internal abstract class WithManyChildrenBase : SyntaxList
+        {
+            internal readonly ArrayElement<GreenNode>[] children;
+
+            internal WithManyChildrenBase(ArrayElement<GreenNode>[] children)
+            {
+                this.children = children;
+                this.InitializeChildren();
+            }
+
+            internal WithManyChildrenBase(RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations, ArrayElement<GreenNode>[] children)
+                : base(diagnostics, annotations)
+            {
+                this.children = children;
+                this.InitializeChildren();
+            }
+
+            private void InitializeChildren()
+            {
+                var n = children.Length;
+                if (n < byte.MaxValue)
+                {
+                    SlotCount = (byte)n;
+                }
+                else
+                {
+                    SlotCount = byte.MaxValue;
+                }
+
+                for (var i = 0; i < children.Length; i++)
+                {
+                    AdjustFlagsAndWidth(children[i]);
+                }
+            }
+
+            protected override int GetSlotCount()
+            {
+                return children.Length;
+            }
+
+            internal override GreenNode GetSlot(int index)
+            {
+                return children[index];
+            }
+
+            internal override void CopyTo(ArrayElement<GreenNode>[] array, int offset)
+            {
+                Array.Copy(children, 0, array, offset, children.Length);
+            }
+
+            internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+            {
+                return new Syntax.SyntaxList.WithManyChildren(this, parent, position);
+            }
+        }
+
+        internal sealed class WithManyChildren : WithManyChildrenBase
+        {
+            internal WithManyChildren(ArrayElement<GreenNode>[] children)
+                : base(children)
+            {
+            }
+
+            internal WithManyChildren(RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations, ArrayElement<GreenNode>[] children)
+                : base(diagnostics, annotations, children)
+            {
+            }
+
+            internal override GreenNode SetDiagnostics(RazorDiagnostic[] errors)
+            {
+                return new WithManyChildren(errors, GetAnnotations(), children);
+            }
+
+            internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+            {
+                return new WithManyChildren(GetDiagnostics(), annotations, children);
+            }
+        }
+
+        internal sealed class WithLotsOfChildren : WithManyChildrenBase
+        {
+            private readonly int[] _childOffsets;
+
+            internal WithLotsOfChildren(ArrayElement<GreenNode>[] children)
+                : base(children)
+            {
+                _childOffsets = CalculateOffsets(children);
+            }
+
+            internal WithLotsOfChildren(RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations, ArrayElement<GreenNode>[] children, int[] childOffsets)
+                : base(diagnostics, annotations, children)
+            {
+                _childOffsets = childOffsets;
+            }
+
+            public override int GetSlotOffset(int index)
+            {
+                return _childOffsets[index];
+            }
+
+            /// <summary>
+            /// Find the slot that contains the given offset.
+            /// </summary>
+            /// <param name="offset">The target offset. Must be between 0 and <see cref="GreenNode.FullWidth"/>.</param>
+            /// <returns>The slot index of the slot containing the given offset.</returns>
+            /// <remarks>
+            /// This implementation uses a binary search to find the first slot that contains
+            /// the given offset.
+            /// </remarks>
+            public override int FindSlotIndexContainingOffset(int offset)
+            {
+                Debug.Assert(offset >= 0 && offset < FullWidth);
+                return BinarySearchUpperBound(_childOffsets, offset) - 1;
+            }
+
+            private static int[] CalculateOffsets(ArrayElement<GreenNode>[] children)
+            {
+                var n = children.Length;
+                var childOffsets = new int[n];
+                var offset = 0;
+                for (var i = 0; i < n; i++)
+                {
+                    childOffsets[i] = offset;
+                    offset += children[i].Value.FullWidth;
+                }
+                return childOffsets;
+            }
+
+            internal override GreenNode SetDiagnostics(RazorDiagnostic[] errors)
+            {
+                return new WithLotsOfChildren(errors, this.GetAnnotations(), children, _childOffsets);
+            }
+
+            internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+            {
+                return new WithLotsOfChildren(GetDiagnostics(), annotations, children, _childOffsets);
+            }
+
+            /// <summary>
+            /// Search a sorted integer array for the target value in O(log N) time.
+            /// </summary>
+            /// <param name="array">The array of integers which must be sorted in ascending order.</param>
+            /// <param name="value">The target value.</param>
+            /// <returns>An index in the array pointing to the position where <paramref name="value"/> should be
+            /// inserted in order to maintain the sorted order. All values to the right of this position will be
+            /// strictly greater than <paramref name="value"/>. Note that this may return a position off the end
+            /// of the array if all elements are less than or equal to <paramref name="value"/>.</returns>
+            private static int BinarySearchUpperBound(int[] array, int value)
+            {
+                var low = 0;
+                var high = array.Length - 1;
+
+                while (low <= high)
+                {
+                    var middle = low + ((high - low) >> 1);
+                    if (array[middle] > value)
+                    {
+                        high = middle - 1;
+                    }
+                    else
+                    {
+                        low = middle + 1;
+                    }
+                }
+
+                return low;
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxListBuilder.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxListBuilder.cs
new file mode 100644
index 0000000000..fae8e718a7
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxListBuilder.cs
@@ -0,0 +1,201 @@
+// 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;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal class SyntaxListBuilder
+    {
+        private ArrayElement<GreenNode>[] _nodes;
+
+        public int Count { get; private set; }
+
+        public SyntaxListBuilder(int size)
+        {
+            _nodes = new ArrayElement<GreenNode>[size];
+        }
+
+        public static SyntaxListBuilder Create()
+        {
+            return new SyntaxListBuilder(8);
+        }
+
+        public void Clear()
+        {
+            Count = 0;
+        }
+
+        public GreenNode this[int index]
+        {
+            get
+            {
+                return _nodes[index];
+            }
+
+            set
+            {
+                _nodes[index].Value = value;
+            }
+        }
+
+        public void Add(GreenNode item)
+        {
+            if (item == null) return;
+
+            if (item.IsList)
+            {
+                var slotCount = item.SlotCount;
+
+                // Necessary, but not sufficient (e.g. for nested lists).
+                EnsureAdditionalCapacity(slotCount);
+
+                for (var i = 0; i < slotCount; i++)
+                {
+                    Add(item.GetSlot(i));
+                }
+            }
+            else
+            {
+                EnsureAdditionalCapacity(1);
+
+                _nodes[Count++].Value = item;
+            }
+        }
+
+        public void AddRange(GreenNode[] items)
+        {
+            AddRange(items, 0, items.Length);
+        }
+
+        public void AddRange(GreenNode[] items, int offset, int length)
+        {
+            // Necessary, but not sufficient (e.g. for nested lists).
+            EnsureAdditionalCapacity(length - offset);
+
+            var oldCount = Count;
+
+            for (var i = offset; i < length; i++)
+            {
+                Add(items[i]);
+            }
+
+            Validate(oldCount, Count);
+        }
+
+        [Conditional("DEBUG")]
+        private void Validate(int start, int end)
+        {
+            for (var i = start; i < end; i++)
+            {
+                Debug.Assert(_nodes[i].Value != null);
+            }
+        }
+
+        public void AddRange(SyntaxList<GreenNode> list)
+        {
+            this.AddRange(list, 0, list.Count);
+        }
+
+        public void AddRange(SyntaxList<GreenNode> list, int offset, int length)
+        {
+            // Necessary, but not sufficient (e.g. for nested lists).
+            EnsureAdditionalCapacity(length - offset);
+
+            var oldCount = Count;
+
+            for (var i = offset; i < length; i++)
+            {
+                Add(list[i]);
+            }
+
+            Validate(oldCount, Count);
+        }
+
+        public void AddRange<TNode>(SyntaxList<TNode> list) where TNode : GreenNode
+        {
+            this.AddRange(list, 0, list.Count);
+        }
+
+        public void AddRange<TNode>(SyntaxList<TNode> list, int offset, int length) where TNode : GreenNode
+        {
+            AddRange(new SyntaxList<GreenNode>(list.Node), offset, length);
+        }
+
+        public void RemoveLast()
+        {
+            Count--;
+            _nodes[Count].Value = null;
+        }
+
+        private void EnsureAdditionalCapacity(int additionalCount)
+        {
+            var currentSize = _nodes.Length;
+            var requiredSize = Count + additionalCount;
+
+            if (requiredSize <= currentSize) return;
+
+            var newSize =
+                requiredSize < 8 ? 8 :
+                requiredSize >= (int.MaxValue / 2) ? int.MaxValue :
+                Math.Max(requiredSize, currentSize * 2); // NB: Size will *at least* double.
+            Debug.Assert(newSize >= requiredSize);
+
+            Array.Resize(ref _nodes, newSize);
+        }
+
+        public bool Any(SyntaxKind kind)
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                if (_nodes[i].Value.Kind == kind)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public GreenNode[] ToArray()
+        {
+            var array = new GreenNode[Count];
+            for (var i = 0; i < array.Length; i++)
+            {
+                array[i] = _nodes[i];
+            }
+
+            return array;
+        }
+
+        internal GreenNode ToListNode()
+        {
+            switch (Count)
+            {
+                case 0:
+                    return null;
+                case 1:
+                    return _nodes[0];
+                case 2:
+                    return SyntaxList.List(_nodes[0], _nodes[1]);
+                case 3:
+                    return SyntaxList.List(_nodes[0], _nodes[1], _nodes[2]);
+                default:
+                    var tmp = new ArrayElement<GreenNode>[Count];
+                    Array.Copy(_nodes, tmp, Count);
+                    return SyntaxList.List(tmp);
+            }
+        }
+
+        public SyntaxList<GreenNode> ToList()
+        {
+            return new SyntaxList<GreenNode>(ToListNode());
+        }
+
+        public SyntaxList<TNode> ToList<TNode>() where TNode : GreenNode
+        {
+            return new SyntaxList<TNode>(ToListNode());
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxListBuilderOfT.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxListBuilderOfT.cs
new file mode 100644
index 0000000000..65a11313f6
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxListBuilderOfT.cs
@@ -0,0 +1,115 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal readonly struct SyntaxListBuilder<TNode> where TNode : GreenNode
+    {
+        private readonly SyntaxListBuilder _builder;
+
+        public SyntaxListBuilder(int size)
+            : this(new SyntaxListBuilder(size))
+        {
+        }
+
+        public static SyntaxListBuilder<TNode> Create()
+        {
+            return new SyntaxListBuilder<TNode>(8);
+        }
+
+        internal SyntaxListBuilder(SyntaxListBuilder builder)
+        {
+            _builder = builder;
+        }
+
+        public bool IsNull
+        {
+            get
+            {
+                return _builder == null;
+            }
+        }
+
+        public int Count
+        {
+            get
+            {
+                return _builder.Count;
+            }
+        }
+
+        public TNode this[int index]
+        {
+            get
+            {
+                return (TNode)_builder[index];
+            }
+
+            set
+            {
+                _builder[index] = value;
+            }
+        }
+
+        public void Clear()
+        {
+            _builder.Clear();
+        }
+
+        public SyntaxListBuilder<TNode> Add(TNode node)
+        {
+            _builder.Add(node);
+            return this;
+        }
+
+        public void AddRange(TNode[] items, int offset, int length)
+        {
+            _builder.AddRange(items, offset, length);
+        }
+
+        public void AddRange(SyntaxList<TNode> nodes)
+        {
+            _builder.AddRange(nodes);
+        }
+
+        public void AddRange(SyntaxList<TNode> nodes, int offset, int length)
+        {
+            _builder.AddRange(nodes, offset, length);
+        }
+
+        public bool Any(SyntaxKind kind)
+        {
+            return _builder.Any(kind);
+        }
+
+        public SyntaxList<TNode> ToList()
+        {
+            return _builder.ToList<TNode>();
+        }
+
+        public GreenNode ToListNode()
+        {
+            return _builder.ToListNode();
+        }
+
+        public static implicit operator SyntaxListBuilder(SyntaxListBuilder<TNode> builder)
+        {
+            return builder._builder;
+        }
+
+        public static implicit operator SyntaxList<TNode>(SyntaxListBuilder<TNode> builder)
+        {
+            if (builder._builder != null)
+            {
+                return builder.ToList();
+            }
+
+            return default(SyntaxList<TNode>);
+        }
+
+        public SyntaxList<TDerived> ToList<TDerived>() where TDerived : GreenNode
+        {
+            return new SyntaxList<TDerived>(ToListNode());
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxListOfT.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxListOfT.cs
new file mode 100644
index 0000000000..abb34c628c
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxListOfT.cs
@@ -0,0 +1,187 @@
+// 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;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal struct SyntaxList<TNode> : IEquatable<SyntaxList<TNode>>
+        where TNode : GreenNode
+    {
+        private readonly GreenNode _node;
+
+        public SyntaxList(GreenNode node)
+        {
+            _node = node;
+        }
+
+        internal GreenNode Node => _node;
+
+        public int Count
+        {
+            get
+            {
+                return (_node == null) ? 0 : _node.IsList ? _node.SlotCount : 1;
+            }
+        }
+
+        public TNode this[int index]
+        {
+            get
+            {
+                if (_node == null)
+                {
+                    return null;
+                }
+                else if (_node.IsList)
+                {
+                    Debug.Assert(index >= 0);
+                    Debug.Assert(index <= _node.SlotCount);
+
+                    return ((TNode)_node.GetSlot(index));
+                }
+                else if (index == 0)
+                {
+                    Debug.Assert(index == 0);
+                    return ((TNode)_node);
+                }
+                else
+                {
+                    throw new InvalidOperationException("This program location is thought to be unreachable.");
+                }
+            }
+        }
+
+        public GreenNode ItemUntyped(int index)
+        {
+            var node = _node;
+            if (node.IsList)
+            {
+                return node.GetSlot(index);
+            }
+
+            Debug.Assert(index == 0);
+            return node;
+        }
+
+        public bool Any()
+        {
+            return _node != null;
+        }
+
+        public bool Any(SyntaxKind kind)
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                var element = ItemUntyped(i);
+                if ((element.Kind == kind))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public TNode[] Nodes
+        {
+            get
+            {
+                var arr = new TNode[Count];
+                for (var i = 0; i < Count; i++)
+                {
+                    arr[i] = this[i];
+                }
+
+                return arr;
+            }
+        }
+
+        public TNode Last
+        {
+            get
+            {
+                var node = _node;
+                if (node.IsList)
+                {
+                    return ((TNode)node.GetSlot(node.SlotCount - 1));
+                }
+
+                return ((TNode)node);
+            }
+        }
+
+        public Enumerator GetEnumerator()
+        {
+            return new Enumerator(this);
+        }
+
+        public static bool operator ==(SyntaxList<TNode> left, SyntaxList<TNode> right)
+        {
+            return (left._node == right._node);
+        }
+
+        public static bool operator !=(SyntaxList<TNode> left, SyntaxList<TNode> right)
+        {
+            return !(left._node == right._node);
+        }
+
+        public bool Equals(SyntaxList<TNode> other)
+        {
+            return _node == other._node;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return (obj is SyntaxList<TNode> && (_node == ((SyntaxList<TNode>)obj)._node));
+        }
+
+        public override int GetHashCode()
+        {
+            return _node != null ? _node.GetHashCode() : 0;
+        }
+
+        public static implicit operator SyntaxList<TNode>(TNode node)
+        {
+            return new SyntaxList<TNode>(node);
+        }
+
+        public static implicit operator SyntaxList<GreenNode>(SyntaxList<TNode> nodes)
+        {
+            return new SyntaxList<GreenNode>(nodes._node);
+        }
+
+        internal struct Enumerator
+        {
+            private SyntaxList<TNode> _list;
+            private int _index;
+
+            internal Enumerator(SyntaxList<TNode> list)
+            {
+                _list = list;
+                _index = -1;
+            }
+
+            public bool MoveNext()
+            {
+                var newIndex = _index + 1;
+                if (newIndex < _list.Count)
+                {
+                    _index = newIndex;
+                    return true;
+                }
+
+                return false;
+            }
+
+            public TNode Current
+            {
+                get
+                {
+                    return _list[_index];
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxListPool.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxListPool.cs
new file mode 100644
index 0000000000..3f9e88608c
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxListPool.cs
@@ -0,0 +1,100 @@
+// 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;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal class SyntaxListPool
+    {
+        private ArrayElement<SyntaxListBuilder>[] _freeList = new ArrayElement<SyntaxListBuilder>[10];
+        private int _freeIndex;
+
+#if DEBUG
+        private readonly List<SyntaxListBuilder> _allocated = new List<SyntaxListBuilder>();
+#endif
+
+        internal SyntaxListPool()
+        {
+        }
+
+        internal SyntaxListBuilder Allocate()
+        {
+            SyntaxListBuilder item;
+            if (_freeIndex > 0)
+            {
+                _freeIndex--;
+                item = _freeList[_freeIndex].Value;
+                _freeList[_freeIndex].Value = null;
+            }
+            else
+            {
+                item = new SyntaxListBuilder(10);
+            }
+
+#if DEBUG
+            Debug.Assert(!_allocated.Contains(item));
+            _allocated.Add(item);
+#endif
+            return item;
+        }
+
+        internal PooledResult<TNode> Allocate<TNode>() where TNode : GreenNode
+        {
+            var builder = new SyntaxListBuilder<TNode>(this.Allocate());
+            return new PooledResult<TNode>(this, builder);
+        }
+
+        internal void Free(SyntaxListBuilder item)
+        {
+            item.Clear();
+            if (_freeIndex >= _freeList.Length)
+            {
+                this.Grow();
+            }
+#if DEBUG
+            Debug.Assert(_allocated.Contains(item));
+
+            _allocated.Remove(item);
+#endif
+            _freeList[_freeIndex].Value = item;
+            _freeIndex++;
+        }
+
+        private void Grow()
+        {
+            var tmp = new ArrayElement<SyntaxListBuilder>[_freeList.Length * 2];
+            Array.Copy(_freeList, tmp, _freeList.Length);
+            _freeList = tmp;
+        }
+
+        public SyntaxList<TNode> ToListAndFree<TNode>(SyntaxListBuilder<TNode> item)
+            where TNode : GreenNode
+        {
+            var list = item.ToList();
+            Free(item);
+            return list;
+        }
+
+        public readonly struct PooledResult<TNode> : IDisposable where TNode : GreenNode
+        {
+            private readonly SyntaxListBuilder<TNode> _builder;
+            private readonly SyntaxListPool _pool;
+
+            public PooledResult(SyntaxListPool pool, in SyntaxListBuilder<TNode> builder)
+            {
+                _pool = pool;
+                _builder = builder;
+            }
+
+            public SyntaxListBuilder<TNode> Builder => _builder;
+
+            public void Dispose()
+            {
+                _pool.Free(_builder);
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxRewriter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxRewriter.cs
new file mode 100644
index 0000000000..fcf0e04ef5
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxRewriter.cs
@@ -0,0 +1,56 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal abstract partial class SyntaxRewriter : SyntaxVisitor<GreenNode>
+    {
+        public override GreenNode VisitToken(SyntaxToken token)
+        {
+            var leading = VisitList(token.LeadingTrivia);
+            var trailing = VisitList(token.TrailingTrivia);
+
+            if (leading != token.LeadingTrivia || trailing != token.TrailingTrivia)
+            {
+                if (leading != token.LeadingTrivia)
+                {
+                    token = token.TokenWithLeadingTrivia(leading.Node);
+                }
+
+                if (trailing != token.TrailingTrivia)
+                {
+                    token = token.TokenWithTrailingTrivia(trailing.Node);
+                }
+            }
+
+            return token;
+        }
+
+        public SyntaxList<TNode> VisitList<TNode>(SyntaxList<TNode> list) where TNode : GreenNode
+        {
+            SyntaxListBuilder alternate = null;
+            for (int i = 0, n = list.Count; i < n; i++)
+            {
+                var item = list[i];
+                var visited = Visit(item);
+                if (item != visited && alternate == null)
+                {
+                    alternate = new SyntaxListBuilder(n);
+                    alternate.AddRange(list, 0, i);
+                }
+
+                if (alternate != null)
+                {
+                    alternate.Add(visited);
+                }
+            }
+
+            if (alternate != null)
+            {
+                return alternate.ToList<TNode>();
+            }
+
+            return list;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxToken.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxToken.cs
new file mode 100644
index 0000000000..2b958788ee
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxToken.cs
@@ -0,0 +1,226 @@
+// 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;
+using System.IO;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal class SyntaxToken : RazorSyntaxNode
+    {
+        private readonly GreenNode _leadingTrivia;
+        private readonly GreenNode _trailingTrivia;
+
+        internal SyntaxToken(SyntaxKind kind, string content, RazorDiagnostic[] diagnostics)
+            : base(kind, content.Length, diagnostics, annotations: null)
+        {
+            Content = content;
+        }
+
+        internal SyntaxToken(SyntaxKind kind, string content, GreenNode leadingTrivia, GreenNode trailingTrivia)
+            : base(kind, content.Length)
+        {
+            Content = content;
+            _leadingTrivia = leadingTrivia;
+            AdjustFlagsAndWidth(leadingTrivia);
+            _trailingTrivia = trailingTrivia;
+            AdjustFlagsAndWidth(trailingTrivia);
+        }
+
+        internal SyntaxToken(SyntaxKind kind, string content, GreenNode leadingTrivia, GreenNode trailingTrivia, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+            : base(kind, content.Length, diagnostics, annotations)
+        {
+            Content = content;
+            _leadingTrivia = leadingTrivia;
+            AdjustFlagsAndWidth(leadingTrivia);
+            _trailingTrivia = trailingTrivia;
+            AdjustFlagsAndWidth(trailingTrivia);
+        }
+
+        public string Content { get; }
+
+        public SyntaxList<GreenNode> LeadingTrivia
+        {
+            get { return new SyntaxList<GreenNode>(GetLeadingTrivia()); }
+        }
+
+        public SyntaxList<GreenNode> TrailingTrivia
+        {
+            get { return new SyntaxList<GreenNode>(GetTrailingTrivia()); }
+        }
+
+        internal override bool IsToken => true;
+
+        public override int Width => Content.Length;
+
+        internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+        {
+            return new Syntax.SyntaxToken(this, parent, position);
+        }
+
+        protected override void WriteTokenTo(TextWriter writer, bool leading, bool trailing)
+        {
+            if (leading)
+            {
+                var trivia = GetLeadingTrivia();
+                if (trivia != null)
+                {
+                    trivia.WriteTo(writer, true, true);
+                }
+            }
+
+            writer.Write(Content);
+
+            if (trailing)
+            {
+                var trivia = GetTrailingTrivia();
+                if (trivia != null)
+                {
+                    trivia.WriteTo(writer, true, true);
+                }
+            }
+        }
+
+        public override sealed GreenNode GetLeadingTrivia()
+        {
+            return _leadingTrivia;
+        }
+
+        public override int GetLeadingTriviaWidth()
+        {
+            return _leadingTrivia == null ? 0 : _leadingTrivia.FullWidth;
+        }
+
+        public override sealed GreenNode GetTrailingTrivia()
+        {
+            return _trailingTrivia;
+        }
+
+        public override int GetTrailingTriviaWidth()
+        {
+            return _trailingTrivia == null ? 0 : _trailingTrivia.FullWidth;
+        }
+
+        public sealed override GreenNode WithLeadingTrivia(GreenNode trivia)
+        {
+            return TokenWithLeadingTrivia(trivia);
+        }
+
+        public virtual SyntaxToken TokenWithLeadingTrivia(GreenNode trivia)
+        {
+            return new SyntaxToken(Kind, Content, trivia, _trailingTrivia, GetDiagnostics(), GetAnnotations());
+        }
+
+        public sealed override GreenNode WithTrailingTrivia(GreenNode trivia)
+        {
+            return TokenWithTrailingTrivia(trivia);
+        }
+
+        public virtual SyntaxToken TokenWithTrailingTrivia(GreenNode trivia)
+        {
+            return new SyntaxToken(Kind, Content, _leadingTrivia, trivia, GetDiagnostics(), GetAnnotations());
+        }
+
+        internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+        {
+            return new SyntaxToken(Kind, Content, _leadingTrivia, _trailingTrivia, diagnostics, GetAnnotations());
+        }
+
+        internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+        {
+            return new SyntaxToken(Kind, Content, _leadingTrivia, _trailingTrivia, GetDiagnostics(), annotations);
+        }
+
+        protected override sealed int GetSlotCount()
+        {
+            return 0;
+        }
+
+        internal override sealed GreenNode GetSlot(int index)
+        {
+            throw new InvalidOperationException("Tokens don't have slots.");
+        }
+
+        public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+        {
+            return visitor.VisitToken(this);
+        }
+
+        public override void Accept(SyntaxVisitor visitor)
+        {
+            visitor.VisitToken(this);
+        }
+
+        public override bool IsEquivalentTo(GreenNode other)
+        {
+            if (!base.IsEquivalentTo(other))
+            {
+                return false;
+            }
+
+            var otherToken = (SyntaxToken)other;
+
+            if (Content != otherToken.Content)
+            {
+                return false;
+            }
+
+            var thisLeading = GetLeadingTrivia();
+            var otherLeading = otherToken.GetLeadingTrivia();
+            if (thisLeading != otherLeading)
+            {
+                if (thisLeading == null || otherLeading == null)
+                {
+                    return false;
+                }
+
+                if (!thisLeading.IsEquivalentTo(otherLeading))
+                {
+                    return false;
+                }
+            }
+
+            var thisTrailing = GetTrailingTrivia();
+            var otherTrailing = otherToken.GetTrailingTrivia();
+            if (thisTrailing != otherTrailing)
+            {
+                if (thisTrailing == null || otherTrailing == null)
+                {
+                    return false;
+                }
+
+                if (!thisTrailing.IsEquivalentTo(otherTrailing))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        public override string ToString()
+        {
+            return Content;
+        }
+
+        internal static SyntaxToken CreateMissing(SyntaxKind kind, params RazorDiagnostic[] diagnostics)
+        {
+            return new MissingToken(kind, diagnostics);
+        }
+
+        private class MissingToken : SyntaxToken
+        {
+            internal MissingToken(SyntaxKind kind, RazorDiagnostic[] diagnostics)
+                : base(kind, string.Empty, diagnostics)
+            {
+                Flags |= NodeFlags.IsMissing;
+            }
+
+            internal MissingToken(SyntaxKind kind, GreenNode leading, GreenNode trailing, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+                : base(kind, string.Empty, leading, trailing, diagnostics, annotations)
+            {
+                Flags |= NodeFlags.IsMissing;
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxTrivia.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxTrivia.cs
new file mode 100644
index 0000000000..84ad53155a
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxTrivia.cs
@@ -0,0 +1,100 @@
+// 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;
+using System.Collections.Generic;
+using System.IO;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal class SyntaxTrivia : GreenNode
+    {
+        internal SyntaxTrivia(SyntaxKind kind, string text)
+            : base(kind, text.Length)
+        {
+            Text = text;
+        }
+
+        internal SyntaxTrivia(SyntaxKind kind, string text, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
+            : base(kind, text.Length, diagnostics, annotations)
+        {
+            Text = text;
+        }
+
+        public string Text { get; }
+
+        internal override bool IsTrivia => true;
+
+        public override int Width => Text.Length;
+
+        protected override void WriteTriviaTo(TextWriter writer)
+        {
+            writer.Write(Text);
+        }
+
+        public sealed override string ToFullString()
+        {
+            return Text;
+        }
+
+        public sealed override int GetLeadingTriviaWidth()
+        {
+            return 0;
+        }
+
+        public sealed override int GetTrailingTriviaWidth()
+        {
+            return 0;
+        }
+
+        protected override sealed int GetSlotCount()
+        {
+            return 0;
+        }
+
+        internal override sealed GreenNode GetSlot(int index)
+        {
+            throw new InvalidOperationException();
+        }
+
+        internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
+        {
+            return new Syntax.SyntaxTrivia(this, parent, position);
+        }
+
+        public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+        {
+            return visitor.VisitTrivia(this);
+        }
+
+        public override void Accept(SyntaxVisitor visitor)
+        {
+            visitor.VisitTrivia(this);
+        }
+
+        internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
+        {
+            return new SyntaxTrivia(Kind, Text, diagnostics, GetAnnotations());
+        }
+
+        internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
+        {
+            return new SyntaxTrivia(Kind, Text, GetDiagnostics(), annotations);
+        }
+
+        public override bool IsEquivalentTo(GreenNode other)
+        {
+            if (!base.IsEquivalentTo(other))
+            {
+                return false;
+            }
+
+            if (Text != ((SyntaxTrivia)other).Text)
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxVisitor.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxVisitor.cs
new file mode 100644
index 0000000000..a00f30f477
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/InternalSyntax/SyntaxVisitor.cs
@@ -0,0 +1,60 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
+{
+    internal abstract partial class SyntaxVisitor<TResult>
+    {
+        public virtual TResult Visit(GreenNode node)
+        {
+            if (node == null)
+            {
+                return default(TResult);
+            }
+
+            return node.Accept(this);
+        }
+
+        public virtual TResult VisitToken(SyntaxToken token)
+        {
+            return DefaultVisit(token);
+        }
+
+        public virtual TResult VisitTrivia(SyntaxTrivia trivia)
+        {
+            return DefaultVisit(trivia);
+        }
+
+        protected virtual TResult DefaultVisit(GreenNode node)
+        {
+            return default(TResult);
+        }
+    }
+
+    internal abstract partial class SyntaxVisitor
+    {
+        public virtual GreenNode Visit(GreenNode node)
+        {
+            if (node != null)
+            {
+                node.Accept(this);
+            }
+
+            return null;
+        }
+
+        public virtual void VisitToken(SyntaxToken token)
+        {
+            DefaultVisit(token);
+        }
+
+        public virtual void VisitTrivia(SyntaxTrivia trivia)
+        {
+            DefaultVisit(trivia);
+        }
+
+        protected virtual void DefaultVisit(GreenNode node)
+        {
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/MarkupElementRewriter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/MarkupElementRewriter.cs
new file mode 100644
index 0000000000..7aeda1c349
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/MarkupElementRewriter.cs
@@ -0,0 +1,290 @@
+// 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;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal static class MarkupElementRewriter
+    {
+        public static RazorSyntaxTree AddMarkupElements(RazorSyntaxTree syntaxTree)
+        {
+            var rewriter = new AddMarkupElementRewriter();
+            var rewrittenRoot = rewriter.Visit(syntaxTree.Root);
+
+            var newSyntaxTree = RazorSyntaxTree.Create(rewrittenRoot, syntaxTree.Source, syntaxTree.Diagnostics, syntaxTree.Options);
+            return newSyntaxTree;
+        }
+
+        public static RazorSyntaxTree RemoveMarkupElements(RazorSyntaxTree syntaxTree)
+        {
+            var rewriter = new RemoveMarkupElementRewriter();
+            var rewrittenRoot = rewriter.Visit(syntaxTree.Root);
+
+            var newSyntaxTree = RazorSyntaxTree.Create(rewrittenRoot, syntaxTree.Source, syntaxTree.Diagnostics, syntaxTree.Options);
+            return newSyntaxTree;
+        }
+
+        private class AddMarkupElementRewriter : SyntaxRewriter
+        {
+            private readonly Stack<TagBlockTracker> _startTagTracker = new Stack<TagBlockTracker>();
+
+            private TagBlockTracker CurrentTracker => _startTagTracker.Count > 0 ? _startTagTracker.Peek() : null;
+
+            private string CurrentStartTagName => CurrentTracker?.TagName;
+
+            public override SyntaxNode Visit(SyntaxNode node)
+            {
+                node = base.Visit(node);
+                
+                if (node != null)
+                {
+                    node = RewriteNode(node);
+                }
+
+                return node;
+            }
+
+            private SyntaxNode RewriteNode(SyntaxNode node)
+            {
+                if (node.IsToken)
+                {
+                    // Tokens don't have children.
+                    return node;
+                }
+
+                _startTagTracker.Clear();
+                var children = node.ChildNodes().ToList();
+                var rewrittenChildren = new List<SyntaxNode>(children.Count);
+                for (var i = 0; i < children.Count; i++)
+                {
+                    var child = children[i];
+                    if (!(child is MarkupTagBlockSyntax tagBlock))
+                    {
+                        TrackChild(child, rewrittenChildren);
+                        continue;
+                    }
+
+                    var tagName = tagBlock.GetTagName();
+                    if (string.IsNullOrWhiteSpace(tagName) || tagBlock.IsSelfClosing())
+                    {
+                        // Don't want to track incomplete, invalid (Eg. </>, <  >), void or self-closing tags.
+                        // Simply wrap it in a block with no body or start/end tag.
+                        if (IsEndTag(tagBlock))
+                        {
+                            // This is an error case.
+                            BuildMarkupElement(rewrittenChildren, startTag: null, tagChildren: new List<RazorSyntaxNode>(), endTag: tagBlock);
+                        }
+                        else
+                        {
+                            BuildMarkupElement(rewrittenChildren, startTag: tagBlock, tagChildren: new List<RazorSyntaxNode>(), endTag: null);
+                        }
+                    }
+                    else if (IsEndTag(tagBlock))
+                    {
+                        if (string.Equals(CurrentStartTagName, tagName, StringComparison.OrdinalIgnoreCase))
+                        {
+                            var startTagTracker = _startTagTracker.Pop();
+                            var startTag = startTagTracker.TagBlock;
+
+                            // Get the nodes between the start and the end tag.
+                            var tagChildren = startTagTracker.Children;
+
+                            BuildMarkupElement(rewrittenChildren, startTag, tagChildren, endTag: tagBlock);
+                        }
+                        else
+                        {
+                            // Current tag scope does not match the end tag. Attempt to recover the start tag
+                            // by looking up the previous tag scopes for a matching start tag.
+                            if (!TryRecoverStartTag(rewrittenChildren, tagName, tagBlock))
+                            {
+                                // Could not recover. The end tag doesn't have a corresponding start tag. Wrap it in a block and move on.
+                                var rewritten = SyntaxFactory.MarkupElement(startTag: null, body: new SyntaxList<RazorSyntaxNode>(), endTag: tagBlock);
+                                TrackChild(rewritten, rewrittenChildren);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // This is a start tag. Keep track of it.
+                        _startTagTracker.Push(new TagBlockTracker(tagBlock));
+                    }
+                }
+
+                while (_startTagTracker.Count > 0)
+                {
+                    // We reached the end of the list and still have unmatched start tags
+                    var startTagTracker = _startTagTracker.Pop();
+                    var startTag = startTagTracker.TagBlock;
+                    var tagChildren = startTagTracker.Children;
+                    BuildMarkupElement(rewrittenChildren, startTag, tagChildren, endTag: null);
+                }
+
+                // We now have finished building our list of rewritten Children.
+                // At this point, We should have a one to one replacement for every child. The replacement can be null.
+                Debug.Assert(children.Count == rewrittenChildren.Count);
+                node = node.ReplaceNodes(children, (original, rewritten) =>
+                {
+                    var originalIndex = children.IndexOf(original);
+                    if (originalIndex != -1)
+                    {
+                        // If this returns null, that node will be removed.
+                        return rewrittenChildren[originalIndex];
+                    }
+
+                    return original;
+                });
+
+                return node;
+            }
+
+            private void BuildMarkupElement(List<SyntaxNode> rewrittenChildren, MarkupTagBlockSyntax startTag, List<RazorSyntaxNode> tagChildren, MarkupTagBlockSyntax endTag)
+            {
+                // We are trying to replace multiple nodes (including the start/end tag) with one rewritten node.
+                // Since we need to have each child node accounted for in our rewritten list,
+                // we'll add "null" in place of them.
+                // The call to SyntaxNode.ReplaceNodes() later will take care removing the nodes whose replacement is null.
+
+                var body = tagChildren.Where(t => t != null).ToList();
+                var rewritten = SyntaxFactory.MarkupElement(startTag, new SyntaxList<RazorSyntaxNode>(body), endTag);
+                if (startTag != null)
+                {
+                    // If there was a start tag, that is where we want to put our new element.
+                    TrackChild(rewritten, rewrittenChildren);
+                }
+
+                foreach (var child in tagChildren)
+                {
+                    TrackChild(null, rewrittenChildren);
+                }
+                if (endTag != null)
+                {
+                    TrackChild(startTag == null ? rewritten : null, rewrittenChildren);
+                }
+            }
+
+            private void TrackChild(SyntaxNode child, List<SyntaxNode> rewrittenChildren)
+            {
+                if (CurrentTracker != null)
+                {
+                    CurrentTracker.Children.Add((RazorSyntaxNode)child);
+                    return;
+                }
+
+                rewrittenChildren.Add(child);
+            }
+
+            private bool TryRecoverStartTag(List<SyntaxNode> rewrittenChildren, string tagName, MarkupTagBlockSyntax endTag)
+            {
+                var malformedTagCount = 0;
+                foreach (var tracker in _startTagTracker)
+                {
+                    if (tracker.TagName.Equals(tagName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        break;
+                    }
+
+                    malformedTagCount++;
+                }
+
+                if (_startTagTracker.Count > malformedTagCount)
+                {
+                    RewriteMalformedTags(rewrittenChildren, malformedTagCount);
+
+                    // One final rewrite, this is the rewrite that completes our target tag which is not malformed.
+                    var startTagTracker = _startTagTracker.Pop();
+                    var startTag = startTagTracker.TagBlock;
+                    var tagChildren = startTagTracker.Children;
+
+                    BuildMarkupElement(rewrittenChildren, startTag, tagChildren, endTag);
+
+                    // We were able to recover
+                    return true;
+                }
+
+                // Could not recover tag. Aka we found an end tag without a corresponding start tag.
+                return false;
+            }
+
+            private void RewriteMalformedTags(List<SyntaxNode> rewrittenChildren, int malformedTagCount)
+            {
+                for (var i = 0; i < malformedTagCount; i++)
+                {
+                    var startTagTracker = _startTagTracker.Pop();
+                    var startTag = startTagTracker.TagBlock;
+
+                    BuildMarkupElement(rewrittenChildren, startTag, startTagTracker.Children, endTag: null);
+                }
+            }
+
+            private bool IsEndTag(MarkupTagBlockSyntax tagBlock)
+            {
+                var childContent = tagBlock.Children.First().GetContent();
+                if (string.IsNullOrEmpty(childContent))
+                {
+                    return false;
+                }
+
+                // We grab the token that could be forward slash
+                return childContent.StartsWith("</") || childContent.StartsWith("/");
+            }
+
+            private class TagBlockTracker
+            {
+                public TagBlockTracker(MarkupTagBlockSyntax tagBlock)
+                {
+                    TagBlock = tagBlock;
+                    TagName = tagBlock.GetTagName();
+                    Children = new List<RazorSyntaxNode>();
+                }
+
+                public MarkupTagBlockSyntax TagBlock { get; }
+
+                public List<RazorSyntaxNode> Children { get; }
+
+                public string TagName { get; }
+            }
+        }
+
+        private class RemoveMarkupElementRewriter : SyntaxRewriter
+        {
+            public override SyntaxNode Visit(SyntaxNode node)
+            {
+                if (node != null)
+                {
+                    node = RewriteNode(node);
+                }
+
+                return base.Visit(node);
+            }
+
+            private SyntaxNode RewriteNode(SyntaxNode node)
+            {
+                if (node.IsToken)
+                {
+                    return node;
+                }
+
+                var children = node.ChildNodes();
+                for (var i = 0; i < children.Count; i++)
+                {
+                    var child = children[i];
+                    if (!(child is MarkupElementSyntax tagElement))
+                    {
+                        continue;
+                    }
+
+                    node = node.ReplaceNode(tagElement, tagElement.ChildNodes());
+
+                    // Since we rewrote 'node', it's children are different. Update our collection.
+                    children = node.ChildNodes();
+                }
+
+                return node;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/MarkupMinimizedTagHelperAttributeSyntax.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/MarkupMinimizedTagHelperAttributeSyntax.cs
new file mode 100644
index 0000000000..980616d9c3
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/MarkupMinimizedTagHelperAttributeSyntax.cs
@@ -0,0 +1,33 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal sealed partial class MarkupMinimizedTagHelperAttributeSyntax
+    {
+        private static readonly string TagHelperAttributeInfoKey = typeof(TagHelperAttributeInfo).Name;
+
+        public TagHelperAttributeInfo TagHelperAttributeInfo
+        {
+            get
+            {
+                var tagHelperAttributeInfo = this.GetAnnotationValue(TagHelperAttributeInfoKey) as TagHelperAttributeInfo;
+                return tagHelperAttributeInfo;
+            }
+        }
+
+        public MarkupMinimizedTagHelperAttributeSyntax WithTagHelperAttributeInfo(TagHelperAttributeInfo info)
+        {
+            var annotations = new List<SyntaxAnnotation>(GetAnnotations())
+            {
+                new SyntaxAnnotation(TagHelperAttributeInfoKey, info)
+            };
+
+            var newGreen = Green.WithAnnotationsGreen(annotations.ToArray());
+
+            return (MarkupMinimizedTagHelperAttributeSyntax)newGreen.CreateRed(Parent, Position);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/MarkupTagHelperAttributeSyntax.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/MarkupTagHelperAttributeSyntax.cs
new file mode 100644
index 0000000000..4b7aea1e69
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/MarkupTagHelperAttributeSyntax.cs
@@ -0,0 +1,33 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal sealed partial class MarkupTagHelperAttributeSyntax
+    {
+        private static readonly string TagHelperAttributeInfoKey = typeof(TagHelperAttributeInfo).Name;
+
+        public TagHelperAttributeInfo TagHelperAttributeInfo
+        {
+            get
+            {
+                var tagHelperAttributeInfo = this.GetAnnotationValue(TagHelperAttributeInfoKey) as TagHelperAttributeInfo;
+                return tagHelperAttributeInfo;
+            }
+        }
+
+        public MarkupTagHelperAttributeSyntax WithTagHelperAttributeInfo(TagHelperAttributeInfo info)
+        {
+            var annotations = new List<SyntaxAnnotation>(GetAnnotations())
+            {
+                new SyntaxAnnotation(TagHelperAttributeInfoKey, info)
+            };
+
+            var newGreen = Green.WithAnnotationsGreen(annotations.ToArray());
+
+            return (MarkupTagHelperAttributeSyntax)newGreen.CreateRed(Parent, Position);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/MarkupTagHelperElementSyntax.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/MarkupTagHelperElementSyntax.cs
new file mode 100644
index 0000000000..eaca56474a
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/MarkupTagHelperElementSyntax.cs
@@ -0,0 +1,33 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal sealed partial class MarkupTagHelperElementSyntax
+    {
+        private static readonly string TagHelperInfoKey = typeof(TagHelperInfo).Name;
+
+        public TagHelperInfo TagHelperInfo
+        {
+            get
+            {
+                var tagHelperInfo = this.GetAnnotationValue(TagHelperInfoKey) as TagHelperInfo;
+                return tagHelperInfo;
+            }
+        }
+
+        public MarkupTagHelperElementSyntax WithTagHelperInfo(TagHelperInfo info)
+        {
+            var annotations = new List<SyntaxAnnotation>(GetAnnotations())
+            {
+                new SyntaxAnnotation(TagHelperInfoKey, info)
+            };
+
+            var newGreen = Green.WithAnnotationsGreen(annotations.ToArray());
+
+            return (MarkupTagHelperElementSyntax)newGreen.CreateRed(Parent, Position);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/NodeFlags.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/NodeFlags.cs
new file mode 100644
index 0000000000..5dd4850e58
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/NodeFlags.cs
@@ -0,0 +1,21 @@
+// 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;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    [Flags]
+    internal enum NodeFlags : byte
+    {
+        None = 0,
+        ContainsDiagnostics = 1 << 0,
+        ContainsStructuredTrivia = 1 << 1,
+        ContainsDirectives = 1 << 2,
+        ContainsSkippedText = 1 << 3,
+        ContainsAnnotations = 1 << 4,
+        IsMissing = 1 << 5,
+
+        InheritMask = ContainsDiagnostics | ContainsStructuredTrivia | ContainsDirectives | ContainsSkippedText | ContainsAnnotations | IsMissing,
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/ObjectPool.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/ObjectPool.cs
new file mode 100644
index 0000000000..2df35b64ac
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/ObjectPool.cs
@@ -0,0 +1,248 @@
+// 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;
+using System.Diagnostics;
+using System.Threading;
+
+#if DETECT_LEAKS
+using System.Runtime.CompilerServices;
+
+#endif
+
+// define TRACE_LEAKS to get additional diagnostics that can lead to the leak sources. note: it will
+// make everything about 2-3x slower
+//
+// #define TRACE_LEAKS
+
+// define DETECT_LEAKS to detect possible leaks
+// #if DEBUG
+// #define DETECT_LEAKS  //for now always enable DETECT_LEAKS in debug.
+// #endif
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    /// <summary>
+    /// Generic implementation of object pooling pattern with predefined pool size limit. The main
+    /// purpose is that limited number of frequently used objects can be kept in the pool for
+    /// further recycling.
+    ///
+    /// Notes:
+    /// 1) it is not the goal to keep all returned objects. Pool is not meant for storage. If there
+    ///    is no space in the pool, extra returned objects will be dropped.
+    ///
+    /// 2) it is implied that if object was obtained from a pool, the caller will return it back in
+    ///    a relatively short time. Keeping checked out objects for long durations is ok, but
+    ///    reduces usefulness of pooling. Just new up your own.
+    ///
+    /// Not returning objects to the pool in not detrimental to the pool's work, but is a bad practice.
+    /// Rationale:
+    ///    If there is no intent for reusing the object, do not use pool - just use "new".
+    /// </summary>
+    internal class ObjectPool<T> where T : class
+    {
+        private struct Element
+        {
+            internal T Value;
+        }
+
+        /// <remarks>
+        /// Not using <see cref="T:System.Func{T}"/> because this file is linked into the (debugger) Formatter,
+        /// which does not have that type (since it compiles against .NET 2.0).
+        /// </remarks>
+        internal delegate T Factory();
+
+        // storage for the pool objects.
+        private readonly Element[] _items;
+
+        // factory is stored for the lifetime of the pool. We will call this only when pool needs to
+        // expand. compared to "new T()", Func gives more flexibility to implementers and faster
+        // than "new T()".
+        private readonly Factory _factory;
+
+#if DETECT_LEAKS
+        private static readonly ConditionalWeakTable<T, LeakTracker> leakTrackers = new ConditionalWeakTable<T, LeakTracker>();
+
+        private class LeakTracker : IDisposable
+        {
+            private volatile bool disposed;
+
+#if TRACE_LEAKS
+            internal volatile System.Diagnostics.StackTrace Trace = null;
+#endif
+
+            public void Dispose()
+            {
+                disposed = true;
+                GC.SuppressFinalize(this);
+            }
+
+            private string GetTrace()
+            {
+#if TRACE_LEAKS
+                return Trace == null? "": Trace.ToString();
+#else
+                return "Leak tracing information is disabled. Define TRACE_LEAKS on ObjectPool`1.cs to get more info \n";
+#endif
+            }
+
+            ~LeakTracker()
+            {
+                if (!this.disposed &&
+                    !Environment.HasShutdownStarted &&
+                    !AppDomain.CurrentDomain.IsFinalizingForUnload())
+                {
+                    string report = string.Format("Pool detected potential leaking of {0}. \n Location of the leak: \n {1} ",
+                        typeof(T).ToString(),
+                        GetTrace());
+
+                    // If you are seeing this message it means that object has been allocated from the pool
+                    // and has not been returned back. This is not critical, but turns pool into rather
+                    // inefficient kind of "new".
+                    Debug.WriteLine("TRACEOBJECTPOOLLEAKS_BEGIN\n" + report + "TRACEOBJECTPOOLLEAKS_END");
+                }
+            }
+        }
+#endif
+
+        internal ObjectPool(Factory factory)
+            : this(factory, Environment.ProcessorCount * 2)
+        { }
+
+        internal ObjectPool(Factory factory, int size)
+        {
+            _factory = factory;
+            _items = new Element[size];
+        }
+
+        private T CreateInstance()
+        {
+            var inst = _factory();
+            return inst;
+        }
+
+        /// <summary>
+        /// Produces an instance.
+        /// </summary>
+        /// <remarks>
+        /// Search strategy is a simple linear probing which is chosen for it cache-friendliness.
+        /// Note that Free will try to store recycled objects close to the start thus statistically
+        /// reducing how far we will typically search.
+        /// </remarks>
+        internal T Allocate()
+        {
+            var items = _items;
+            T inst;
+
+            for (var i = 0; i < items.Length; i++)
+            {
+                // Note that the read is optimistically not synchronized. That is intentional.
+                // We will interlock only when we have a candidate. in a worst case we may miss some
+                // recently returned objects. Not a big deal.
+                inst = items[i].Value;
+                if (inst != null)
+                {
+                    if (inst == Interlocked.CompareExchange(ref items[i].Value, null, inst))
+                    {
+                        goto gotInstance;
+                    }
+                }
+            }
+
+            inst = CreateInstance();
+            gotInstance:
+
+#if DETECT_LEAKS
+            var tracker = new LeakTracker();
+            leakTrackers.Add(inst, tracker);
+
+#if TRACE_LEAKS
+            var frame = new System.Diagnostics.StackTrace(false);
+            tracker.Trace = frame;
+#endif
+#endif
+
+            return inst;
+        }
+
+        /// <summary>
+        /// Returns objects to the pool.
+        /// </summary>
+        /// <remarks>
+        /// Search strategy is a simple linear probing which is chosen for it cache-friendliness.
+        /// Note that Free will try to store recycled objects close to the start thus statistically
+        /// reducing how far we will typically search in Allocate.
+        /// </remarks>
+        internal void Free(T obj)
+        {
+            Validate(obj);
+            ForgetTrackedObject(obj);
+
+            var items = _items;
+            for (var i = 0; i < items.Length; i++)
+            {
+                if (items[i].Value == null)
+                {
+                    // Intentionally not using interlocked here.
+                    // In a worst case scenario two objects may be stored into same slot.
+                    // It is very unlikely to happen and will only mean that one of the objects will get collected.
+                    items[i].Value = obj;
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Removes an object from leak tracking.
+        ///
+        /// This is called when an object is returned to the pool.  It may also be explicitly
+        /// called if an object allocated from the pool is intentionally not being returned
+        /// to the pool.  This can be of use with pooled arrays if the consumer wants to
+        /// return a larger array to the pool than was originally allocated.
+        /// </summary>
+        [Conditional("DEBUG")]
+        internal void ForgetTrackedObject(T old, T replacement = null)
+        {
+#if DETECT_LEAKS
+            LeakTracker tracker;
+            if (leakTrackers.TryGetValue(old, out tracker))
+            {
+                tracker.Dispose();
+                leakTrackers.Remove(old);
+            }
+            else
+            {
+                string report = string.Format("Object of type {0} was freed, but was not from pool. \n Callstack: \n {1} ",
+                    typeof(T).ToString(),
+                    new System.Diagnostics.StackTrace(false));
+
+                Debug.WriteLine("TRACEOBJECTPOOLLEAKS_BEGIN\n" + report + "TRACEOBJECTPOOLLEAKS_END");
+            }
+
+            if (replacement != null)
+            {
+                tracker = new LeakTracker();
+                leakTrackers.Add(replacement, tracker);
+            }
+#endif
+        }
+
+        [Conditional("DEBUG")]
+        private void Validate(object obj)
+        {
+            Debug.Assert(obj != null, "freeing null?");
+
+            var items = _items;
+            for (var i = 0; i < items.Length; i++)
+            {
+                var value = items[i].Value;
+                if (value == null)
+                {
+                    return;
+                }
+
+                Debug.Assert(value != obj, "freeing twice?");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/RazorDirectiveSyntax.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/RazorDirectiveSyntax.cs
new file mode 100644
index 0000000000..cd23fda502
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/RazorDirectiveSyntax.cs
@@ -0,0 +1,33 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal sealed partial class RazorDirectiveSyntax
+    {
+        private static readonly string DirectiveDescriptorKey = typeof(DirectiveDescriptor).Name;
+
+        public DirectiveDescriptor DirectiveDescriptor
+        {
+            get
+            {
+                var descriptor = this.GetAnnotationValue(DirectiveDescriptorKey) as DirectiveDescriptor;
+                return descriptor;
+            }
+        }
+
+        public RazorDirectiveSyntax WithDirectiveDescriptor(DirectiveDescriptor descriptor)
+        {
+            var annotations = new List<SyntaxAnnotation>(GetAnnotations())
+            {
+                new SyntaxAnnotation(DirectiveDescriptorKey, descriptor)
+            };
+
+            var newGreen = Green.WithAnnotationsGreen(annotations.ToArray());
+
+            return (RazorDirectiveSyntax)newGreen.CreateRed(Parent, Position);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/RazorSyntaxNode.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/RazorSyntaxNode.cs
new file mode 100644
index 0000000000..6ed220f3d1
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/RazorSyntaxNode.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal abstract partial class RazorSyntaxNode : SyntaxNode
+    {
+        public RazorSyntaxNode(GreenNode green, SyntaxNode parent, int position)
+            : base(green, parent, position)
+        {
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SpecializedCollections.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SpecializedCollections.cs
new file mode 100644
index 0000000000..3e1094003f
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SpecializedCollections.cs
@@ -0,0 +1,169 @@
+// 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;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal static class SpecializedCollections
+    {
+        public static IEnumerator<T> EmptyEnumerator<T>()
+        {
+            return Empty.Enumerator<T>.Instance;
+        }
+
+        public static IEnumerable<T> EmptyEnumerable<T>()
+        {
+            return Empty.List<T>.Instance;
+        }
+
+        public static ICollection<T> EmptyCollection<T>()
+        {
+            return Empty.List<T>.Instance;
+        }
+
+        public static IList<T> EmptyList<T>()
+        {
+            return Empty.List<T>.Instance;
+        }
+
+        public static IReadOnlyList<T> EmptyReadOnlyList<T>()
+        {
+            return Empty.List<T>.Instance;
+        }
+
+        private class Empty
+        {
+            internal class Enumerator<T> : Enumerator, IEnumerator<T>
+            {
+                public static new readonly IEnumerator<T> Instance = new Enumerator<T>();
+
+                protected Enumerator()
+                {
+                }
+
+                public new T Current => throw new InvalidOperationException();
+
+                public void Dispose()
+                {
+                }
+            }
+
+            internal class Enumerator : IEnumerator
+            {
+                public static readonly IEnumerator Instance = new Enumerator();
+
+                protected Enumerator()
+                {
+                }
+
+                public object Current => throw new InvalidOperationException();
+
+                public bool MoveNext()
+                {
+                    return false;
+                }
+
+                public void Reset()
+                {
+                    throw new InvalidOperationException();
+                }
+            }
+
+            internal class Enumerable<T> : IEnumerable<T>
+            {
+                // PERF: cache the instance of enumerator. 
+                // accessing a generic static field is kinda slow from here,
+                // but since empty enumerables are singletons, there is no harm in having 
+                // one extra instance field
+                private readonly IEnumerator<T> _enumerator = Enumerator<T>.Instance;
+
+                public IEnumerator<T> GetEnumerator()
+                {
+                    return _enumerator;
+                }
+
+                System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+                {
+                    return GetEnumerator();
+                }
+            }
+
+            internal class Collection<T> : Enumerable<T>, ICollection<T>
+            {
+                public static readonly ICollection<T> Instance = new Collection<T>();
+
+                protected Collection()
+                {
+                }
+
+                public void Add(T item)
+                {
+                    throw new NotSupportedException();
+                }
+
+                public void Clear()
+                {
+                    throw new NotSupportedException();
+                }
+
+                public bool Contains(T item)
+                {
+                    return false;
+                }
+
+                public void CopyTo(T[] array, int arrayIndex)
+                {
+                }
+
+                public int Count => 0;
+
+                public bool IsReadOnly => true;
+
+                public bool Remove(T item)
+                {
+                    throw new NotSupportedException();
+                }
+            }
+
+            internal class List<T> : Collection<T>, IList<T>, IReadOnlyList<T>
+            {
+                public static readonly new List<T> Instance = new List<T>();
+
+                protected List()
+                {
+                }
+
+                public int IndexOf(T item)
+                {
+                    return -1;
+                }
+
+                public void Insert(int index, T item)
+                {
+                    throw new NotSupportedException();
+                }
+
+                public void RemoveAt(int index)
+                {
+                    throw new NotSupportedException();
+                }
+
+                public T this[int index]
+                {
+                    get
+                    {
+                        throw new ArgumentOutOfRangeException(nameof(index));
+                    }
+
+                    set
+                    {
+                        throw new NotSupportedException();
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/Syntax.xml b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/Syntax.xml
new file mode 100644
index 0000000000..7880c49622
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/Syntax.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Tree Root="SyntaxNode">
+  <PredefinedNode Name="RazorSyntaxNode" Base="SyntaxNode" />
+  <PredefinedNode Name="SyntaxToken" Base="RazorSyntaxNode" />
+  
+  <!-- Common -->
+  <AbstractNode Name="RazorBlockSyntax" Base="RazorSyntaxNode">
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" />
+  </AbstractNode>
+  <Node Name="RazorDocumentSyntax" Base="RazorSyntaxNode">
+    <Kind Name="RazorDocument" />
+    <Field Name="Document" Type="RazorBlockSyntax" />
+  </Node>
+  <Node Name="RazorCommentBlockSyntax" Base="RazorSyntaxNode">
+    <Kind Name="RazorComment" />
+    <Field Name="StartCommentTransition" Type="SyntaxToken">
+      <Kind Name="RazorCommentTransition" />
+    </Field>
+    <Field Name="StartCommentStar" Type="SyntaxToken">
+      <Kind Name="RazorCommentStar" />
+    </Field>
+    <Field Name="Comment" Type="SyntaxToken">
+      <Kind Name="RazorCommentLiteral" />
+    </Field>
+    <Field Name="EndCommentStar" Type="SyntaxToken">
+      <Kind Name="RazorCommentStar" />
+    </Field>
+    <Field Name="EndCommentTransition" Type="SyntaxToken">
+      <Kind Name="RazorCommentTransition" />
+    </Field>
+  </Node>
+  <Node Name="RazorMetaCodeSyntax" Base="RazorSyntaxNode">
+    <Kind Name="RazorMetaCode" />
+    <Field Name="MetaCode" Type="SyntaxList&lt;SyntaxToken&gt;" />
+  </Node>
+  <Node Name="GenericBlockSyntax" Base="RazorBlockSyntax">
+    <Kind Name="GenericBlock" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  <Node Name="UnclassifiedTextLiteralSyntax" Base="RazorSyntaxNode">
+    <Kind Name="UnclassifiedTextLiteral" />
+    <Field Name="LiteralTokens" Type="SyntaxList&lt;SyntaxToken&gt;" />
+  </Node>
+
+  <!-- Markup -->
+  <AbstractNode Name="MarkupSyntaxNode" Base="RazorSyntaxNode" />
+  <Node Name="MarkupBlockSyntax" Base="RazorBlockSyntax">
+    <Kind Name="MarkupBlock" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  <Node Name="MarkupTransitionSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupTransition" />
+    <Field Name="TransitionTokens" Type="SyntaxList&lt;SyntaxToken&gt;" />
+  </Node>
+  <Node Name="MarkupTextLiteralSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupTextLiteral" />
+    <Field Name="LiteralTokens" Type="SyntaxList&lt;SyntaxToken&gt;" />
+  </Node>
+  <Node Name="MarkupEphemeralTextLiteralSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupEphemeralTextLiteral" />
+    <Field Name="LiteralTokens" Type="SyntaxList&lt;SyntaxToken&gt;" />
+  </Node>
+  <Node Name="MarkupCommentBlockSyntax" Base="RazorBlockSyntax">
+    <Kind Name="MarkupCommentBlock" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  <Node Name="MarkupTagBlockSyntax" Base="RazorBlockSyntax">
+    <Kind Name="MarkupTagBlock" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  <Node Name="MarkupMinimizedAttributeBlockSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupMinimizedAttributeBlock" />
+    <Field Name="NamePrefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Name" Type="MarkupTextLiteralSyntax" />
+  </Node>
+  <Node Name="MarkupAttributeBlockSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupAttributeBlock" />
+    <Field Name="NamePrefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Name" Type="MarkupTextLiteralSyntax" />
+    <Field Name="NameSuffix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="EqualsToken" Type="SyntaxToken">
+      <Kind Name="Equals" />
+    </Field>
+    <Field Name="ValuePrefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Value" Type="RazorBlockSyntax" Optional="true" />
+    <Field Name="ValueSuffix" Type="MarkupTextLiteralSyntax" Optional="true" />
+  </Node>
+  <Node Name="MarkupLiteralAttributeValueSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupLiteralAttributeValue" />
+    <Field Name="Prefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Value" Type="MarkupTextLiteralSyntax" Optional="true" />
+  </Node>
+  <Node Name="MarkupDynamicAttributeValueSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupDynamicAttributeValue" />
+    <Field Name="Prefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Value" Type="RazorBlockSyntax" />
+  </Node>
+  <Node Name="MarkupElementSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupElement" />
+    <Field Name="StartTag" Type="MarkupTagBlockSyntax" Optional="true" />
+    <Field Name="Body" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Optional="true" />
+    <Field Name="EndTag" Type="MarkupTagBlockSyntax" Optional="true" />
+  </Node>
+  <Node Name="MarkupTagHelperElementSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupTagHelperElement" />
+    <Field Name="StartTag" Type="MarkupTagHelperStartTagSyntax" />
+    <Field Name="Body" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Optional="true" />
+    <Field Name="EndTag" Type="MarkupTagHelperEndTagSyntax" Optional="true" />
+  </Node>
+  <Node Name="MarkupTagHelperStartTagSyntax" Base="RazorBlockSyntax">
+    <Kind Name="MarkupTagHelperStartTag" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  <Node Name="MarkupTagHelperEndTagSyntax" Base="RazorBlockSyntax">
+    <Kind Name="MarkupTagHelperEndTag" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  <Node Name="MarkupTagHelperAttributeSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupTagHelperAttribute" />
+    <Field Name="NamePrefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Name" Type="MarkupTextLiteralSyntax" />
+    <Field Name="NameSuffix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="EqualsToken" Type="SyntaxToken">
+      <Kind Name="Equals" />
+    </Field>
+    <Field Name="ValuePrefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Value" Type="MarkupTagHelperAttributeValueSyntax" />
+    <Field Name="ValueSuffix" Type="MarkupTextLiteralSyntax" Optional="true" />
+  </Node>
+  <Node Name="MarkupMinimizedTagHelperAttributeSyntax" Base="MarkupSyntaxNode">
+    <Kind Name="MarkupMinimizedTagHelperAttribute" />
+    <Field Name="NamePrefix" Type="MarkupTextLiteralSyntax" Optional="true" />
+    <Field Name="Name" Type="MarkupTextLiteralSyntax" />
+  </Node>
+  <Node Name="MarkupTagHelperAttributeValueSyntax" Base="RazorBlockSyntax">
+    <Kind Name="MarkupTagHelperAttributeValue" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  
+  <!-- CSharp -->
+  <AbstractNode Name="CSharpSyntaxNode" Base="RazorSyntaxNode" />
+  <Node Name="CSharpCodeBlockSyntax" Base="RazorBlockSyntax">
+    <Kind Name="CSharpCodeBlock" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  <Node Name="CSharpTransitionSyntax" Base="CSharpSyntaxNode">
+    <Kind Name="CSharpTransition" />
+    <Field Name="Transition" Type="SyntaxToken">
+      <Kind Name="Transition" />
+    </Field>
+  </Node>
+  <Node Name="CSharpStatementLiteralSyntax" Base="CSharpSyntaxNode">
+    <Kind Name="CSharpStatementLiteral" />
+    <Field Name="LiteralTokens" Type="SyntaxList&lt;SyntaxToken&gt;" />
+  </Node>
+  <Node Name="CSharpExpressionLiteralSyntax" Base="CSharpSyntaxNode">
+    <Kind Name="CSharpExpressionLiteral" />
+    <Field Name="LiteralTokens" Type="SyntaxList&lt;SyntaxToken&gt;" />
+  </Node>
+  <Node Name="CSharpEphemeralTextLiteralSyntax" Base="CSharpSyntaxNode">
+    <Kind Name="CSharpEphemeralTextLiteral" />
+    <Field Name="LiteralTokens" Type="SyntaxList&lt;SyntaxToken&gt;" />
+  </Node>
+  <Node Name="CSharpTemplateBlockSyntax" Base="RazorBlockSyntax">
+    <Kind Name="CSharpTemplateBlock" />
+    <Field Name="Children" Type="SyntaxList&lt;RazorSyntaxNode&gt;" Override="true" />
+  </Node>
+  <AbstractNode Name="CSharpRazorBlockSyntax" Base="CSharpSyntaxNode">
+    <Field Name="Transition" Type="CSharpTransitionSyntax" />
+    <Field Name="Body" Type="CSharpSyntaxNode" />
+  </AbstractNode>
+  <Node Name="CSharpStatementSyntax" Base="CSharpRazorBlockSyntax">
+    <Kind Name="CSharpStatement" />
+    <Field Name="Transition" Type="CSharpTransitionSyntax" Override="true">
+      <Kind Name="CSharpTransition" />
+    </Field>
+    <Field Name="Body" Type="CSharpSyntaxNode" Override="true">
+      <Kind Name="CSharpStatementBody" />
+    </Field>
+  </Node>
+  <Node Name="CSharpStatementBodySyntax" Base="CSharpSyntaxNode">
+    <Kind Name="CSharpStatementBody" />
+    <Field Name="OpenBrace" Type="RazorMetaCodeSyntax" />
+    <Field Name="CSharpCode" Type="CSharpCodeBlockSyntax" />
+    <Field Name="CloseBrace" Type="RazorMetaCodeSyntax" />
+  </Node>
+  <Node Name="CSharpExplicitExpressionSyntax" Base="CSharpRazorBlockSyntax">
+    <Kind Name="CSharpExplicitExpression" />
+    <Field Name="Transition" Type="CSharpTransitionSyntax" Override="true">
+      <Kind Name="CSharpTransition" />
+    </Field>
+    <Field Name="Body" Type="CSharpSyntaxNode" Override="true">
+      <Kind Name="CSharpExplicitExpressionBody" />
+    </Field>
+  </Node>
+  <Node Name="CSharpExplicitExpressionBodySyntax" Base="CSharpSyntaxNode">
+    <Kind Name="CSharpExplicitExpressionBody" />
+    <Field Name="OpenParen" Type="RazorMetaCodeSyntax" />
+    <Field Name="CSharpCode" Type="CSharpCodeBlockSyntax" />
+    <Field Name="CloseParen" Type="RazorMetaCodeSyntax" />
+  </Node>
+  <Node Name="CSharpImplicitExpressionSyntax" Base="CSharpRazorBlockSyntax">
+    <Kind Name="CSharpImplicitExpression" />
+    <Field Name="Transition" Type="CSharpTransitionSyntax" Override="true">
+      <Kind Name="CSharpTransition" />
+    </Field>
+    <Field Name="Body" Type="CSharpSyntaxNode" Override="true">
+      <Kind Name="CSharpImplicitExpressionBody" />
+    </Field>
+  </Node>
+  <Node Name="CSharpImplicitExpressionBodySyntax" Base="CSharpSyntaxNode">
+    <Kind Name="CSharpImplicitExpressionBody" />
+    <Field Name="CSharpCode" Type="CSharpCodeBlockSyntax" />
+  </Node>
+  <Node Name="RazorDirectiveSyntax" Base="CSharpRazorBlockSyntax">
+    <Kind Name="RazorDirective" />
+    <Field Name="Transition" Type="CSharpTransitionSyntax" Override="true">
+      <Kind Name="CSharpTransition" />
+    </Field>
+    <Field Name="Body" Type="CSharpSyntaxNode" Override="true">
+      <Kind Name="RazorDirectiveBody" />
+    </Field>
+  </Node>
+  <Node Name="RazorDirectiveBodySyntax" Base="CSharpSyntaxNode">
+    <Kind Name="RazorDirectiveBody" />
+    <Field Name="Keyword" Type="RazorSyntaxNode" />
+    <Field Name="CSharpCode" Type="CSharpCodeBlockSyntax" Optional="true" />
+  </Node>
+</Tree>
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxAnnotation.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxAnnotation.cs
new file mode 100644
index 0000000000..e639335475
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxAnnotation.cs
@@ -0,0 +1,93 @@
+// 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;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    /// <summary>
+    /// A SyntaxAnnotation is used to annotate syntax elements with additional information. 
+    /// 
+    /// Since syntax elements are immutable, annotating them requires creating new instances of them
+    /// with the annotations attached.
+    /// </summary>
+    [DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+    internal sealed class SyntaxAnnotation : IEquatable<SyntaxAnnotation>
+    {
+        // use a value identity instead of object identity so a deserialized instance matches the original instance.
+        private readonly long _id;
+        private static long s_nextId;
+
+        // use a value identity instead of object identity so a deserialized instance matches the original instance.
+        public string Kind { get; }
+        public object Data { get; }
+
+        public SyntaxAnnotation()
+        {
+            _id = System.Threading.Interlocked.Increment(ref s_nextId);
+        }
+
+        public SyntaxAnnotation(string kind)
+            : this()
+        {
+            Kind = kind;
+        }
+
+        public SyntaxAnnotation(string kind, object data)
+            : this(kind)
+        {
+            Data = data;
+        }
+
+        private string GetDebuggerDisplay()
+        {
+            return string.Format("Annotation: Kind='{0}' Data='{1}'", this.Kind ?? "", this.Data ?? "");
+        }
+
+        public bool Equals(SyntaxAnnotation other)
+        {
+            return (object)other != null && _id == other._id;
+        }
+
+        public static bool operator ==(SyntaxAnnotation left, SyntaxAnnotation right)
+        {
+            if ((object)left == (object)right)
+            {
+                return true;
+            }
+
+            if ((object)left == null || (object)right == null)
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(SyntaxAnnotation left, SyntaxAnnotation right)
+        {
+            if ((object)left == (object)right)
+            {
+                return false;
+            }
+
+            if ((object)left == null || (object)right == null)
+            {
+                return true;
+            }
+
+            return !left.Equals(right);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as SyntaxAnnotation);
+        }
+
+        public override int GetHashCode()
+        {
+            return _id.GetHashCode();
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxExtensions.cs
new file mode 100644
index 0000000000..055180ca97
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxExtensions.cs
@@ -0,0 +1,53 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal partial class MarkupTextLiteralSyntax
+    {
+        protected override string GetDebuggerDisplay()
+        {
+            return string.Format("{0} [{1}]", base.GetDebuggerDisplay(), this.GetContent());
+        }
+    }
+
+    internal partial class MarkupEphemeralTextLiteralSyntax
+    {
+        protected override string GetDebuggerDisplay()
+        {
+            return string.Format("{0} [{1}]", base.GetDebuggerDisplay(), this.GetContent());
+        }
+    }
+
+    internal partial class CSharpStatementLiteralSyntax
+    {
+        protected override string GetDebuggerDisplay()
+        {
+            return string.Format("{0} [{1}]", base.GetDebuggerDisplay(), this.GetContent());
+        }
+    }
+
+    internal partial class CSharpExpressionLiteralSyntax
+    {
+        protected override string GetDebuggerDisplay()
+        {
+            return string.Format("{0} [{1}]", base.GetDebuggerDisplay(), this.GetContent());
+        }
+    }
+
+    internal partial class CSharpEphemeralTextLiteralSyntax
+    {
+        protected override string GetDebuggerDisplay()
+        {
+            return string.Format("{0} [{1}]", base.GetDebuggerDisplay(), this.GetContent());
+        }
+    }
+
+    internal partial class UnclassifiedTextLiteralSyntax
+    {
+        protected override string GetDebuggerDisplay()
+        {
+            return string.Format("{0} [{1}]", base.GetDebuggerDisplay(), this.GetContent());
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxFactory.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxFactory.cs
new file mode 100644
index 0000000000..4e619799db
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxFactory.cs
@@ -0,0 +1,23 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal static partial class SyntaxFactory
+    {
+        public static SyntaxToken Token(SyntaxKind kind, params RazorDiagnostic[] diagnostics)
+        {
+            return Token(kind, content: string.Empty, diagnostics: diagnostics);
+        }
+
+        public static SyntaxToken Token(SyntaxKind kind, string content, params RazorDiagnostic[] diagnostics)
+        {
+            return new SyntaxToken(InternalSyntax.SyntaxFactory.Token(kind, content), parent: null, position: 0);
+        }
+
+        internal static SyntaxToken MissingToken(SyntaxKind kind, params RazorDiagnostic[] diagnostics)
+        {
+            return new SyntaxToken(InternalSyntax.SyntaxFactory.MissingToken(kind, diagnostics), parent: null, position: 0);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxKind.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxKind.cs
new file mode 100644
index 0000000000..75dd554ab6
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxKind.cs
@@ -0,0 +1,136 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal enum SyntaxKind : byte
+    {
+        #region Nodes
+        // Common
+        RazorDocument,
+        GenericBlock,
+        RazorComment,
+        RazorMetaCode,
+        RazorDirective,
+        RazorDirectiveBody,
+        UnclassifiedTextLiteral,
+
+        // Markup
+        MarkupBlock,
+        MarkupTransition,
+        MarkupElement,
+        MarkupTagBlock,
+        MarkupTextLiteral,
+        MarkupEphemeralTextLiteral,
+        MarkupCommentBlock,
+        MarkupAttributeBlock,
+        MarkupMinimizedAttributeBlock,
+        MarkupLiteralAttributeValue,
+        MarkupDynamicAttributeValue,
+        MarkupTagHelperElement,
+        MarkupTagHelperStartTag,
+        MarkupTagHelperEndTag,
+        MarkupTagHelperAttribute,
+        MarkupMinimizedTagHelperAttribute,
+        MarkupTagHelperAttributeValue,
+
+        // CSharp
+        CSharpStatement,
+        CSharpStatementBody,
+        CSharpExplicitExpression,
+        CSharpExplicitExpressionBody,
+        CSharpImplicitExpression,
+        CSharpImplicitExpressionBody,
+        CSharpCodeBlock,
+        CSharpTemplateBlock,
+        CSharpStatementLiteral,
+        CSharpExpressionLiteral,
+        CSharpEphemeralTextLiteral,
+        CSharpTransition,
+        #endregion
+
+        #region Tokens
+        // Common
+        None,
+        Marker,
+        List,
+        Whitespace,
+        NewLine,
+        Colon,
+        QuestionMark,
+        RightBracket,
+        LeftBracket,
+        Equals,
+        Transition,
+
+        // HTML
+        Text,
+        OpenAngle,
+        Bang,
+        ForwardSlash,
+        DoubleHyphen,
+        CloseAngle,
+        DoubleQuote,
+        SingleQuote,
+
+        // CSharp literals
+        Identifier,
+        Keyword,
+        IntegerLiteral,
+        CSharpComment,
+        RealLiteral,
+        CharacterLiteral,
+        StringLiteral,
+
+        // CSharp operators
+        Arrow,
+        Minus,
+        Decrement,
+        MinusAssign,
+        NotEqual,
+        Not,
+        Modulo,
+        ModuloAssign,
+        AndAssign,
+        And,
+        DoubleAnd,
+        LeftParenthesis,
+        RightParenthesis,
+        Star,
+        MultiplyAssign,
+        Comma,
+        Dot,
+        Slash,
+        DivideAssign,
+        DoubleColon,
+        Semicolon,
+        NullCoalesce,
+        XorAssign,
+        Xor,
+        LeftBrace,
+        OrAssign,
+        DoubleOr,
+        Or,
+        RightBrace,
+        Tilde,
+        Plus,
+        PlusAssign,
+        Increment,
+        LessThan,
+        LessThanEqual,
+        LeftShift,
+        LeftShiftAssign,
+        Assign,
+        GreaterThan,
+        GreaterThanEqual,
+        RightShift,
+        RightShiftAssign,
+        Hash,
+
+        // Razor specific
+        RazorCommentLiteral,
+        RazorCommentStar,
+        RazorCommentTransition,
+        #endregion
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxList.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxList.cs
new file mode 100644
index 0000000000..3b7d318e37
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxList.cs
@@ -0,0 +1,123 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal abstract class SyntaxList : SyntaxNode
+    {
+        internal SyntaxList(InternalSyntax.SyntaxList green, SyntaxNode parent, int position)
+            : base(green, parent, position)
+        {
+        }
+
+        public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+        {
+            return visitor.Visit(this);
+        }
+
+        public override void Accept(SyntaxVisitor visitor)
+        {
+            visitor.Visit(this);
+        }
+
+        internal class WithTwoChildren : SyntaxList
+        {
+            private SyntaxNode _child0;
+            private SyntaxNode _child1;
+
+            internal WithTwoChildren(InternalSyntax.SyntaxList green, SyntaxNode parent, int position)
+                : base(green, parent, position)
+            {
+            }
+
+            internal override SyntaxNode GetNodeSlot(int index)
+            {
+                switch (index)
+                {
+                    case 0:
+                        return GetRedElement(ref _child0, 0);
+                    case 1:
+                        return GetRedElement(ref _child1, 1);
+                    default:
+                        return null;
+                }
+            }
+
+            internal override SyntaxNode GetCachedSlot(int index)
+            {
+                switch (index)
+                {
+                    case 0:
+                        return _child0;
+                    case 1:
+                        return _child1;
+                    default:
+                        return null;
+                }
+            }
+        }
+
+        internal class WithThreeChildren : SyntaxList
+        {
+            private SyntaxNode _child0;
+            private SyntaxNode _child1;
+            private SyntaxNode _child2;
+
+            internal WithThreeChildren(InternalSyntax.SyntaxList green, SyntaxNode parent, int position)
+                : base(green, parent, position)
+            {
+            }
+
+            internal override SyntaxNode GetNodeSlot(int index)
+            {
+                switch (index)
+                {
+                    case 0:
+                        return GetRedElement(ref _child0, 0);
+                    case 1:
+                        return GetRedElement(ref _child1, 1);
+                    case 2:
+                        return GetRedElement(ref _child2, 2);
+                    default:
+                        return null;
+                }
+            }
+
+            internal override SyntaxNode GetCachedSlot(int index)
+            {
+                switch (index)
+                {
+                    case 0:
+                        return _child0;
+                    case 1:
+                        return _child1;
+                    case 2:
+                        return _child2;
+                    default:
+                        return null;
+                }
+            }
+        }
+
+        internal class WithManyChildren : SyntaxList
+        {
+            private readonly ArrayElement<SyntaxNode>[] _children;
+
+            internal WithManyChildren(InternalSyntax.SyntaxList green, SyntaxNode parent, int position)
+                : base(green, parent, position)
+            {
+                _children = new ArrayElement<SyntaxNode>[green.SlotCount];
+            }
+
+            internal override SyntaxNode GetNodeSlot(int index)
+            {
+                return this.GetRedElement(ref _children[index].Value, index);
+            }
+
+            internal override SyntaxNode GetCachedSlot(int index)
+            {
+                return _children[index];
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxListBuilder.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxListBuilder.cs
new file mode 100644
index 0000000000..415b8352bb
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxListBuilder.cs
@@ -0,0 +1,172 @@
+// 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;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal class SyntaxListBuilder
+    {
+        private ArrayElement<GreenNode>[] _nodes;
+
+        public int Count { get; private set; }
+
+        public SyntaxListBuilder(int size)
+        {
+            _nodes = new ArrayElement<GreenNode>[size];
+        }
+
+        public void Clear()
+        {
+            Count = 0;
+        }
+
+        public void Add(SyntaxNode item)
+        {
+            AddInternal(item.Green);
+        }
+
+        internal void AddInternal(GreenNode item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException();
+            }
+
+            if (_nodes == null || Count >= _nodes.Length)
+            {
+                Grow(Count == 0 ? 8 : _nodes.Length * 2);
+            }
+
+            _nodes[Count++].Value = item;
+        }
+
+        public void AddRange(SyntaxNode[] items)
+        {
+            AddRange(items, 0, items.Length);
+        }
+
+        public void AddRange(SyntaxNode[] items, int offset, int length)
+        {
+            if (_nodes == null || Count + length > _nodes.Length)
+            {
+                Grow(Count + length);
+            }
+
+            for (int i = offset, j = Count; i < offset + length; ++i, ++j)
+            {
+                _nodes[j].Value = items[i].Green;
+            }
+
+            var start = Count;
+            Count += length;
+            Validate(start, Count);
+        }
+
+        [Conditional("DEBUG")]
+        private void Validate(int start, int end)
+        {
+            for (var i = start; i < end; i++)
+            {
+                if (_nodes[i].Value == null)
+                {
+                    throw new ArgumentException("Cannot add a null node.");
+                }
+            }
+        }
+
+        public void AddRange(SyntaxList<SyntaxNode> list)
+        {
+            AddRange(list, 0, list.Count);
+        }
+
+        public void AddRange(SyntaxList<SyntaxNode> list, int offset, int count)
+        {
+            if (_nodes == null || Count + count > _nodes.Length)
+            {
+                Grow(Count + count);
+            }
+
+            var dst = Count;
+            for (int i = offset, limit = offset + count; i < limit; i++)
+            {
+                _nodes[dst].Value = list.ItemInternal(i).Green;
+                dst++;
+            }
+
+            var start = Count;
+            Count += count;
+            Validate(start, Count);
+        }
+
+        public void AddRange<TNode>(SyntaxList<TNode> list) where TNode : SyntaxNode
+        {
+            AddRange(list, 0, list.Count);
+        }
+
+        public void AddRange<TNode>(SyntaxList<TNode> list, int offset, int count) where TNode : SyntaxNode
+        {
+            AddRange(new SyntaxList<SyntaxNode>(list.Node), offset, count);
+        }
+
+        private void Grow(int size)
+        {
+            var tmp = new ArrayElement<GreenNode>[size];
+            Array.Copy(_nodes, tmp, _nodes.Length);
+            _nodes = tmp;
+        }
+
+        public bool Any(SyntaxKind kind)
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                if (_nodes[i].Value.Kind == kind)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        internal GreenNode ToListNode()
+        {
+            switch (Count)
+            {
+                case 0:
+                    return null;
+                case 1:
+                    return _nodes[0].Value;
+                case 2:
+                    return InternalSyntax.SyntaxList.List(_nodes[0].Value, _nodes[1].Value);
+                case 3:
+                    return InternalSyntax.SyntaxList.List(_nodes[0].Value, _nodes[1].Value, _nodes[2].Value);
+                default:
+                    var tmp = new ArrayElement<GreenNode>[Count];
+                    for (var i = 0; i < Count; i++)
+                    {
+                        tmp[i].Value = _nodes[i].Value;
+                    }
+
+                    return InternalSyntax.SyntaxList.List(tmp);
+            }
+        }
+
+        public static implicit operator SyntaxList<SyntaxNode>(SyntaxListBuilder builder)
+        {
+            if (builder == null)
+            {
+                return default(SyntaxList<SyntaxNode>);
+            }
+
+            return builder.ToList();
+        }
+
+        internal void RemoveLast()
+        {
+            Count -= 1;
+            _nodes[Count] = default(ArrayElement<GreenNode>);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxListBuilderExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxListBuilderExtensions.cs
new file mode 100644
index 0000000000..5b813c05b1
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxListBuilderExtensions.cs
@@ -0,0 +1,29 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal static class SyntaxListBuilderExtensions
+    {
+        public static SyntaxList<SyntaxNode> ToList(this SyntaxListBuilder builder)
+        {
+            if (builder == null || builder.Count == 0)
+            {
+                return default(SyntaxList<SyntaxNode>);
+            }
+
+            return new SyntaxList<SyntaxNode>(builder.ToListNode().CreateRed());
+        }
+
+        public static SyntaxList<TNode> ToList<TNode>(this SyntaxListBuilder builder)
+            where TNode : SyntaxNode
+        {
+            if (builder == null || builder.Count == 0)
+            {
+                return new SyntaxList<TNode>();
+            }
+
+            return new SyntaxList<TNode>(builder.ToListNode().CreateRed());
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxListBuilderOfT.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxListBuilderOfT.cs
new file mode 100644
index 0000000000..8fcd9f2b3a
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxListBuilderOfT.cs
@@ -0,0 +1,93 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal readonly struct SyntaxListBuilder<TNode>
+        where TNode : SyntaxNode
+    {
+        private readonly SyntaxListBuilder _builder;
+
+        public SyntaxListBuilder(int size)
+            : this(new SyntaxListBuilder(size))
+        {
+        }
+
+        public static SyntaxListBuilder<TNode> Create()
+        {
+            return new SyntaxListBuilder<TNode>(8);
+        }
+
+        internal SyntaxListBuilder(SyntaxListBuilder builder)
+        {
+            _builder = builder;
+        }
+
+        public bool IsNull
+        {
+            get
+            {
+                return _builder == null;
+            }
+        }
+
+        public int Count
+        {
+            get
+            {
+                return _builder.Count;
+            }
+        }
+
+        public void Clear()
+        {
+            _builder.Clear();
+        }
+
+        public SyntaxListBuilder<TNode> Add(TNode node)
+        {
+            _builder.Add(node);
+            return this;
+        }
+
+        public void AddRange(TNode[] items, int offset, int length)
+        {
+            _builder.AddRange(items, offset, length);
+        }
+
+        public void AddRange(SyntaxList<TNode> nodes)
+        {
+            _builder.AddRange(nodes);
+        }
+
+        public void AddRange(SyntaxList<TNode> nodes, int offset, int length)
+        {
+            _builder.AddRange(nodes, offset, length);
+        }
+
+        public bool Any(SyntaxKind kind)
+        {
+            return _builder.Any(kind);
+        }
+
+        public SyntaxList<TNode> ToList()
+        {
+            return _builder.ToList();
+        }
+
+        public static implicit operator SyntaxListBuilder(SyntaxListBuilder<TNode> builder)
+        {
+            return builder._builder;
+        }
+
+        public static implicit operator SyntaxList<TNode>(SyntaxListBuilder<TNode> builder)
+        {
+            if (builder._builder != null)
+            {
+                return builder.ToList();
+            }
+
+            return default(SyntaxList<TNode>);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxListOfT.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxListOfT.cs
new file mode 100644
index 0000000000..158e82859f
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxListOfT.cs
@@ -0,0 +1,606 @@
+// 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;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal readonly struct SyntaxList<TNode> : IReadOnlyList<TNode>, IEquatable<SyntaxList<TNode>>
+        where TNode : SyntaxNode
+    {
+        public SyntaxList(SyntaxNode node)
+        {
+            Node = node;
+        }
+
+        /// <summary>
+        /// Creates a singleton list of syntax nodes.
+        /// </summary>
+        /// <param name="node">The single element node.</param>
+        public SyntaxList(TNode node)
+            : this((SyntaxNode)node)
+        {
+        }
+
+        /// <summary>
+        /// Creates a list of syntax nodes.
+        /// </summary>
+        /// <param name="nodes">A sequence of element nodes.</param>
+        public SyntaxList(IEnumerable<TNode> nodes)
+            : this(CreateNode(nodes))
+        {
+        }
+
+        private static SyntaxNode CreateNode(IEnumerable<TNode> nodes)
+        {
+            if (nodes == null)
+            {
+                return null;
+            }
+
+            var builder = (nodes is ICollection<TNode> collection) ? new SyntaxListBuilder<TNode>(collection.Count) : SyntaxListBuilder<TNode>.Create();
+
+            foreach (var node in nodes)
+            {
+                builder.Add(node);
+            }
+
+            return builder.ToList().Node;
+        }
+
+        internal SyntaxNode Node { get; }
+
+        /// <summary>
+        /// The number of nodes in the list.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                return Node == null ? 0 : (Node.IsList ? Node.SlotCount : 1);
+            }
+        }
+
+        /// <summary>
+        /// Gets the node at the specified index.
+        /// </summary>
+        /// <param name="index">The zero-based index of the node to get or set.</param>
+        /// <returns>The node at the specified index.</returns>
+        public TNode this[int index]
+        {
+            get
+            {
+                if (Node != null)
+                {
+                    if (Node.IsList)
+                    {
+                        if (unchecked((uint)index < (uint)Node.SlotCount))
+                        {
+                            return (TNode)Node.GetNodeSlot(index);
+                        }
+                    }
+                    else if (index == 0)
+                    {
+                        return (TNode)Node;
+                    }
+                }
+                throw new ArgumentOutOfRangeException();
+            }
+        }
+
+        internal SyntaxNode ItemInternal(int index)
+        {
+            if (Node.IsList)
+            {
+                return Node.GetNodeSlot(index);
+            }
+
+            Debug.Assert(index == 0);
+            return Node;
+        }
+
+        /// <summary>
+        /// The absolute span of the list elements in characters, including the leading and trailing trivia of the first and last elements.
+        /// </summary>
+        public TextSpan FullSpan
+        {
+            get
+            {
+                if (Count == 0)
+                {
+                    return default(TextSpan);
+                }
+                else
+                {
+                    return TextSpan.FromBounds(this[0].FullSpan.Start, this[Count - 1].FullSpan.End);
+                }
+            }
+        }
+
+        /// <summary>
+        /// The absolute span of the list elements in characters, not including the leading and trailing trivia of the first and last elements.
+        /// </summary>
+        public TextSpan Span
+        {
+            get
+            {
+                if (Count == 0)
+                {
+                    return default(TextSpan);
+                }
+                else
+                {
+                    return TextSpan.FromBounds(this[0].Span.Start, this[Count - 1].Span.End);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the string representation of the nodes in this list, not including
+        /// the first node's leading trivia and the last node's trailing trivia.
+        /// </summary>
+        /// <returns>
+        /// The string representation of the nodes in this list, not including
+        /// the first node's leading trivia and the last node's trailing trivia.
+        /// </returns>
+        public override string ToString()
+        {
+            return Node != null ? Node.ToString() : string.Empty;
+        }
+
+        /// <summary>
+        /// Returns the full string representation of the nodes in this list including
+        /// the first node's leading trivia and the last node's trailing trivia.
+        /// </summary>
+        /// <returns>
+        /// The full string representation of the nodes in this list including
+        /// the first node's leading trivia and the last node's trailing trivia.
+        /// </returns>
+        public string ToFullString()
+        {
+            return Node != null ? Node.ToFullString() : string.Empty;
+        }
+
+        /// <summary>
+        /// Creates a new list with the specified node added at the end.
+        /// </summary>
+        /// <param name="node">The node to add.</param>
+        public SyntaxList<TNode> Add(TNode node)
+        {
+            return Insert(Count, node);
+        }
+
+        /// <summary>
+        /// Creates a new list with the specified nodes added at the end.
+        /// </summary>
+        /// <param name="nodes">The nodes to add.</param>
+        public SyntaxList<TNode> AddRange(IEnumerable<TNode> nodes)
+        {
+            return InsertRange(Count, nodes);
+        }
+
+        /// <summary>
+        /// Creates a new list with the specified node inserted at the index.
+        /// </summary>
+        /// <param name="index">The index to insert at.</param>
+        /// <param name="node">The node to insert.</param>
+        public SyntaxList<TNode> Insert(int index, TNode node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return InsertRange(index, new[] { node });
+        }
+
+        /// <summary>
+        /// Creates a new list with the specified nodes inserted at the index.
+        /// </summary>
+        /// <param name="index">The index to insert at.</param>
+        /// <param name="nodes">The nodes to insert.</param>
+        public SyntaxList<TNode> InsertRange(int index, IEnumerable<TNode> nodes)
+        {
+            if (index < 0 || index > Count)
+            {
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+
+            if (nodes == null)
+            {
+                throw new ArgumentNullException(nameof(nodes));
+            }
+
+            var list = this.ToList();
+            list.InsertRange(index, nodes);
+
+            if (list.Count == 0)
+            {
+                return this;
+            }
+            else
+            {
+                return CreateList(list[0].Green, list);
+            }
+        }
+
+        /// <summary>
+        /// Creates a new list with the element at specified index removed.
+        /// </summary>
+        /// <param name="index">The index of the element to remove.</param>
+        public SyntaxList<TNode> RemoveAt(int index)
+        {
+            if (index < 0 || index > Count)
+            {
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+
+            return Remove(this[index]);
+        }
+
+        /// <summary>
+        /// Creates a new list with the element removed.
+        /// </summary>
+        /// <param name="node">The element to remove.</param>
+        public SyntaxList<TNode> Remove(TNode node)
+        {
+            return CreateList(this.Where(x => x != node).ToList());
+        }
+
+        /// <summary>
+        /// Creates a new list with the specified element replaced with the new node.
+        /// </summary>
+        /// <param name="nodeInList">The element to replace.</param>
+        /// <param name="newNode">The new node.</param>
+        public SyntaxList<TNode> Replace(TNode nodeInList, TNode newNode)
+        {
+            return ReplaceRange(nodeInList, new[] { newNode });
+        }
+
+        /// <summary>
+        /// Creates a new list with the specified element replaced with new nodes.
+        /// </summary>
+        /// <param name="nodeInList">The element to replace.</param>
+        /// <param name="newNodes">The new nodes.</param>
+        public SyntaxList<TNode> ReplaceRange(TNode nodeInList, IEnumerable<TNode> newNodes)
+        {
+            if (nodeInList == null)
+            {
+                throw new ArgumentNullException(nameof(nodeInList));
+            }
+
+            if (newNodes == null)
+            {
+                throw new ArgumentNullException(nameof(newNodes));
+            }
+
+            var index = IndexOf(nodeInList);
+            if (index >= 0 && index < Count)
+            {
+                var list = this.ToList();
+                list.RemoveAt(index);
+                list.InsertRange(index, newNodes);
+                return CreateList(list);
+            }
+            else
+            {
+                throw new ArgumentException(nameof(nodeInList));
+            }
+        }
+
+        static SyntaxList<TNode> CreateList(List<TNode> items)
+        {
+            if (items.Count == 0)
+            {
+                return default(SyntaxList<TNode>);
+            }
+            else
+            {
+                return CreateList(items[0].Green, items);
+            }
+        }
+
+        static SyntaxList<TNode> CreateList(GreenNode creator, List<TNode> items)
+        {
+            if (items.Count == 0)
+            {
+                return default(SyntaxList<TNode>);
+            }
+
+            var newGreen = creator.CreateList(items.Select(n => n.Green));
+            return new SyntaxList<TNode>(newGreen.CreateRed());
+        }
+
+        /// <summary>
+        /// The first node in the list.
+        /// </summary>
+        public TNode First()
+        {
+            return this[0];
+        }
+
+        /// <summary>
+        /// The first node in the list or default if the list is empty.
+        /// </summary>
+        public TNode FirstOrDefault()
+        {
+            if (this.Any())
+            {
+                return this[0];
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// The last node in the list.
+        /// </summary>
+        public TNode Last()
+        {
+            return this[Count - 1];
+        }
+
+        /// <summary>
+        /// The last node in the list or default if the list is empty.
+        /// </summary>
+        public TNode LastOrDefault()
+        {
+            if (Any())
+            {
+                return this[Count - 1];
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// True if the list has at least one node.
+        /// </summary>
+        public bool Any()
+        {
+            Debug.Assert(Node == null || Count != 0);
+            return Node != null;
+        }
+
+        // for debugging
+        private TNode[] Nodes
+        {
+            get { return this.ToArray(); }
+        }
+
+        /// <summary>
+        /// Get's the enumerator for this list.
+        /// </summary>
+        public Enumerator GetEnumerator()
+        {
+            return new Enumerator(in this);
+        }
+
+        IEnumerator<TNode> IEnumerable<TNode>.GetEnumerator()
+        {
+            if (this.Any())
+            {
+                return new EnumeratorImpl(this);
+            }
+
+            return SpecializedCollections.EmptyEnumerator<TNode>();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            if (this.Any())
+            {
+                return new EnumeratorImpl(this);
+            }
+
+            return SpecializedCollections.EmptyEnumerator<TNode>();
+        }
+
+        public static bool operator ==(SyntaxList<TNode> left, SyntaxList<TNode> right)
+        {
+            return left.Node == right.Node;
+        }
+
+        public static bool operator !=(SyntaxList<TNode> left, SyntaxList<TNode> right)
+        {
+            return left.Node != right.Node;
+        }
+
+        public bool Equals(SyntaxList<TNode> other)
+        {
+            return Node == other.Node;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is SyntaxList<TNode> && Equals((SyntaxList<TNode>)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return Node?.GetHashCode() ?? 0;
+        }
+
+        public static implicit operator SyntaxList<TNode>(SyntaxList<SyntaxNode> nodes)
+        {
+            return new SyntaxList<TNode>(nodes.Node);
+        }
+
+        public static implicit operator SyntaxList<SyntaxNode>(SyntaxList<TNode> nodes)
+        {
+            return new SyntaxList<SyntaxNode>(nodes.Node);
+        }
+
+        /// <summary>
+        /// The index of the node in this list, or -1 if the node is not in the list.
+        /// </summary>
+        public int IndexOf(TNode node)
+        {
+            var index = 0;
+            foreach (var child in this)
+            {
+                if (object.Equals(child, node))
+                {
+                    return index;
+                }
+
+                index++;
+            }
+
+            return -1;
+        }
+
+        public int IndexOf(Func<TNode, bool> predicate)
+        {
+            var index = 0;
+            foreach (var child in this)
+            {
+                if (predicate(child))
+                {
+                    return index;
+                }
+
+                index++;
+            }
+
+            return -1;
+        }
+
+        internal int IndexOf(SyntaxKind kind)
+        {
+            var index = 0;
+            foreach (var child in this)
+            {
+                if (child.Kind == kind)
+                {
+                    return index;
+                }
+
+                index++;
+            }
+
+            return -1;
+        }
+
+        public int LastIndexOf(TNode node)
+        {
+            for (var i = Count - 1; i >= 0; i--)
+            {
+                if (object.Equals(this[i], node))
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        public int LastIndexOf(Func<TNode, bool> predicate)
+        {
+            for (var i = Count - 1; i >= 0; i--)
+            {
+                if (predicate(this[i]))
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        public struct Enumerator
+        {
+            private readonly SyntaxList<TNode> _list;
+            private int _index;
+
+            internal Enumerator(in SyntaxList<TNode> list)
+            {
+                _list = list;
+                _index = -1;
+            }
+
+            public bool MoveNext()
+            {
+                var newIndex = _index + 1;
+                if (newIndex < _list.Count)
+                {
+                    _index = newIndex;
+                    return true;
+                }
+
+                return false;
+            }
+
+            public TNode Current
+            {
+                get
+                {
+                    return (TNode)_list.ItemInternal(_index);
+                }
+            }
+
+            public void Reset()
+            {
+                _index = -1;
+            }
+
+            public override bool Equals(object obj)
+            {
+                throw new NotSupportedException();
+            }
+
+            public override int GetHashCode()
+            {
+                throw new NotSupportedException();
+            }
+        }
+
+        private class EnumeratorImpl : IEnumerator<TNode>
+        {
+            private Enumerator _e;
+
+            internal EnumeratorImpl(in SyntaxList<TNode> list)
+            {
+                _e = new Enumerator(in list);
+            }
+
+            public bool MoveNext()
+            {
+                return _e.MoveNext();
+            }
+
+            public TNode Current
+            {
+                get
+                {
+                    return _e.Current;
+                }
+            }
+
+            void IDisposable.Dispose()
+            {
+            }
+
+            object IEnumerator.Current
+            {
+                get
+                {
+                    return _e.Current;
+                }
+            }
+
+            void IEnumerator.Reset()
+            {
+                _e.Reset();
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxNode.Iterators.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxNode.Iterators.cs
new file mode 100644
index 0000000000..e619a75b2c
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxNode.Iterators.cs
@@ -0,0 +1,126 @@
+// 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;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal abstract partial class SyntaxNode
+    {
+        private IEnumerable<SyntaxNode> DescendantNodesImpl(TextSpan span, Func<SyntaxNode, bool> descendIntoChildren, bool includeSelf)
+        {
+            if (includeSelf && IsInSpan(in span, FullSpan))
+            {
+                yield return this;
+            }
+
+            using (var stack = new ChildSyntaxListEnumeratorStack(this, descendIntoChildren))
+            {
+                while (stack.IsNotEmpty)
+                {
+                    var nodeValue = stack.TryGetNextAsNodeInSpan(in span);
+                    if (nodeValue != null)
+                    {
+                        // PERF: Push before yield return so that "nodeValue" is 'dead' after the yield
+                        // and therefore doesn't need to be stored in the iterator state machine. This
+                        // saves a field.
+                        stack.PushChildren(nodeValue, descendIntoChildren);
+
+                        yield return nodeValue;
+                    }
+                }
+            }
+        }
+
+        private static bool IsInSpan(in TextSpan span, TextSpan childSpan)
+        {
+            return span.OverlapsWith(childSpan)
+                // special case for zero-width tokens (OverlapsWith never returns true for these)
+                || (childSpan.Length == 0 && span.IntersectsWith(childSpan));
+        }
+
+        private struct ChildSyntaxListEnumeratorStack : IDisposable
+        {
+            private static readonly ObjectPool<ChildSyntaxList.Enumerator[]> StackPool = new ObjectPool<ChildSyntaxList.Enumerator[]>(() => new ChildSyntaxList.Enumerator[16]);
+
+            private ChildSyntaxList.Enumerator[] _stack;
+            private int _stackPtr;
+
+            public ChildSyntaxListEnumeratorStack(SyntaxNode startingNode, Func<SyntaxNode, bool> descendIntoChildren)
+            {
+                if (descendIntoChildren == null || descendIntoChildren(startingNode))
+                {
+                    _stack = StackPool.Allocate();
+                    _stackPtr = 0;
+                    _stack[0].InitializeFrom(startingNode);
+                }
+                else
+                {
+                    _stack = null;
+                    _stackPtr = -1;
+                }
+            }
+
+            public bool IsNotEmpty { get { return _stackPtr >= 0; } }
+
+            public bool TryGetNextInSpan(in TextSpan span, out SyntaxNode value)
+            {
+                while (_stack[_stackPtr].TryMoveNextAndGetCurrent(out value))
+                {
+                    if (IsInSpan(in span, value.FullSpan))
+                    {
+                        return true;
+                    }
+                }
+
+                _stackPtr--;
+                return false;
+            }
+
+            public SyntaxNode TryGetNextAsNodeInSpan(in TextSpan span)
+            {
+                SyntaxNode nodeValue;
+                while ((nodeValue = _stack[_stackPtr].TryMoveNextAndGetCurrentAsNode()) != null)
+                {
+                    if (IsInSpan(in span, nodeValue.FullSpan))
+                    {
+                        return nodeValue;
+                    }
+                }
+
+                _stackPtr--;
+                return null;
+            }
+
+            public void PushChildren(SyntaxNode node)
+            {
+                if (++_stackPtr >= _stack.Length)
+                {
+                    // Geometric growth
+                    Array.Resize(ref _stack, checked(_stackPtr * 2));
+                }
+
+                _stack[_stackPtr].InitializeFrom(node);
+            }
+
+            public void PushChildren(SyntaxNode node, Func<SyntaxNode, bool> descendIntoChildren)
+            {
+                if (descendIntoChildren == null || descendIntoChildren(node))
+                {
+                    PushChildren(node);
+                }
+            }
+
+            public void Dispose()
+            {
+                // Return only reasonably-sized stacks to the pool.
+                if (_stack?.Length < 256)
+                {
+                    Array.Clear(_stack, 0, _stack.Length);
+                    StackPool.Free(_stack);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxNode.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxNode.cs
new file mode 100644
index 0000000000..2f58f13fe3
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxNode.cs
@@ -0,0 +1,413 @@
+// 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;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+using System.Threading;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    [DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+    internal abstract partial class SyntaxNode
+    {
+        public SyntaxNode(GreenNode green, SyntaxNode parent, int position)
+        {
+            Green = green;
+            Parent = parent;
+            Position = position;
+        }
+
+        internal GreenNode Green { get; }
+
+        public SyntaxNode Parent { get; }
+
+        public int Position { get; }
+
+        public int EndPosition => Position + FullWidth;
+
+        public SyntaxKind Kind => Green.Kind;
+
+        public int Width => Green.Width;
+
+        public int FullWidth => Green.FullWidth;
+
+        public int SpanStart => Position + Green.GetLeadingTriviaWidth();
+
+        public TextSpan FullSpan => new TextSpan(Position, Green.FullWidth);
+
+        public TextSpan Span
+        {
+            get
+            {
+                // Start with the full span.
+                var start = Position;
+                var width = Green.FullWidth;
+
+                // adjust for preceding trivia (avoid calling this twice, do not call Green.Width)
+                var precedingWidth = Green.GetLeadingTriviaWidth();
+                start += precedingWidth;
+                width -= precedingWidth;
+
+                // adjust for following trivia width
+                width -= Green.GetTrailingTriviaWidth();
+
+                Debug.Assert(width >= 0);
+                return new TextSpan(start, width);
+            }
+        }
+
+        internal int SlotCount => Green.SlotCount;
+
+        public bool IsList => Green.IsList;
+
+        public bool IsMissing => Green.IsMissing;
+
+        public bool IsToken => Green.IsToken;
+
+        public bool IsTrivia => Green.IsTrivia;
+
+        public bool HasLeadingTrivia
+        {
+            get
+            {
+                return GetLeadingTrivia().Count > 0;
+            }
+        }
+
+        public bool HasTrailingTrivia
+        {
+            get
+            {
+                return GetTrailingTrivia().Count > 0;
+            }
+        }
+
+        public bool ContainsDiagnostics => Green.ContainsDiagnostics;
+
+        public bool ContainsAnnotations => Green.ContainsAnnotations;
+
+        internal string SerializedValue => SyntaxSerializer.Serialize(this);
+
+        public abstract TResult Accept<TResult>(SyntaxVisitor<TResult> visitor);
+
+        public abstract void Accept(SyntaxVisitor visitor);
+
+        internal abstract SyntaxNode GetNodeSlot(int index);
+
+        internal abstract SyntaxNode GetCachedSlot(int index);
+
+        internal SyntaxNode GetRed(ref SyntaxNode field, int slot)
+        {
+            var result = field;
+
+            if (result == null)
+            {
+                var green = Green.GetSlot(slot);
+                if (green != null)
+                {
+                    Interlocked.CompareExchange(ref field, green.CreateRed(this, GetChildPosition(slot)), null);
+                    result = field;
+                }
+            }
+
+            return result;
+        }
+
+        // Special case of above function where slot = 0, does not need GetChildPosition 
+        internal SyntaxNode GetRedAtZero(ref SyntaxNode field)
+        {
+            var result = field;
+
+            if (result == null)
+            {
+                var green = Green.GetSlot(0);
+                if (green != null)
+                {
+                    Interlocked.CompareExchange(ref field, green.CreateRed(this, Position), null);
+                    result = field;
+                }
+            }
+
+            return result;
+        }
+
+        protected T GetRed<T>(ref T field, int slot) where T : SyntaxNode
+        {
+            var result = field;
+
+            if (result == null)
+            {
+                var green = Green.GetSlot(slot);
+                if (green != null)
+                {
+                    Interlocked.CompareExchange(ref field, (T)green.CreateRed(this, this.GetChildPosition(slot)), null);
+                    result = field;
+                }
+            }
+
+            return result;
+        }
+
+        // special case of above function where slot = 0, does not need GetChildPosition 
+        protected T GetRedAtZero<T>(ref T field) where T : SyntaxNode
+        {
+            var result = field;
+
+            if (result == null)
+            {
+                var green = Green.GetSlot(0);
+                if (green != null)
+                {
+                    Interlocked.CompareExchange(ref field, (T)green.CreateRed(this, Position), null);
+                    result = field;
+                }
+            }
+
+            return result;
+        }
+
+        internal SyntaxNode GetRedElement(ref SyntaxNode element, int slot)
+        {
+            Debug.Assert(IsList);
+
+            var result = element;
+
+            if (result == null)
+            {
+                var green = Green.GetSlot(slot);
+                // passing list's parent
+                Interlocked.CompareExchange(ref element, green.CreateRed(Parent, GetChildPosition(slot)), null);
+                result = element;
+            }
+
+            return result;
+        }
+
+        internal virtual int GetChildPosition(int index)
+        {
+            var offset = 0;
+            var green = Green;
+            while (index > 0)
+            {
+                index--;
+                var prevSibling = GetCachedSlot(index);
+                if (prevSibling != null)
+                {
+                    return prevSibling.EndPosition + offset;
+                }
+                var greenChild = green.GetSlot(index);
+                if (greenChild != null)
+                {
+                    offset += greenChild.FullWidth;
+                }
+            }
+
+            return Position + offset;
+        }
+
+        public virtual SyntaxTriviaList GetLeadingTrivia()
+        {
+            var firstToken = GetFirstToken();
+            return firstToken != null ? firstToken.GetLeadingTrivia() : default(SyntaxTriviaList);
+        }
+
+        public virtual SyntaxTriviaList GetTrailingTrivia()
+        {
+            var lastToken = GetLastToken();
+            return lastToken != null ? lastToken.GetTrailingTrivia() : default(SyntaxTriviaList);
+        }
+
+        internal SyntaxToken GetFirstToken()
+        {
+            return ((SyntaxToken)GetFirstTerminal());
+        }
+
+        internal SyntaxToken GetLastToken()
+        {
+            return ((SyntaxToken)GetLastTerminal());
+        }
+
+        public SyntaxNode GetFirstTerminal()
+        {
+            var node = this;
+
+            do
+            {
+                var foundChild = false;
+                for (int i = 0, n = node.SlotCount; i < n; i++)
+                {
+                    var child = node.GetNodeSlot(i);
+                    if (child != null)
+                    {
+                        node = child;
+                        foundChild = true;
+                        break;
+                    }
+                }
+
+                if (!foundChild)
+                {
+                    return null;
+                }
+            }
+            while (node.SlotCount != 0);
+
+            return node == this ? this : node;
+        }
+
+        public SyntaxNode GetLastTerminal()
+        {
+            var node = this;
+
+            do
+            {
+                SyntaxNode lastChild = null;
+                for (var i = node.SlotCount - 1; i >= 0; i--)
+                {
+                    var child = node.GetNodeSlot(i);
+                    if (child != null && child.FullWidth > 0)
+                    {
+                        lastChild = child;
+                        break;
+                    }
+                }
+                node = lastChild;
+            } while (node?.SlotCount > 0);
+
+            return node;
+        }
+
+        /// <summary>
+        /// The list of child nodes of this node, where each element is a SyntaxNode instance.
+        /// </summary>
+        public ChildSyntaxList ChildNodes()
+        {
+            return new ChildSyntaxList(this);
+        }
+
+        /// <summary>
+        /// Gets a list of ancestor nodes
+        /// </summary>
+        public IEnumerable<SyntaxNode> Ancestors()
+        {
+            return Parent?
+                .AncestorsAndSelf() ??
+                Array.Empty<SyntaxNode>();
+        }
+
+        /// <summary>
+        /// Gets a list of ancestor nodes (including this node) 
+        /// </summary>
+        public IEnumerable<SyntaxNode> AncestorsAndSelf()
+        {
+            for (var node = this; node != null; node = node.Parent)
+            {
+                yield return node;
+            }
+        }
+
+        /// <summary>
+        /// Gets the first node of type TNode that matches the predicate.
+        /// </summary>
+        public TNode FirstAncestorOrSelf<TNode>(Func<TNode, bool> predicate = null)
+            where TNode : SyntaxNode
+        {
+            for (var node = this; node != null; node = node.Parent)
+            {
+                if (node is TNode tnode && (predicate == null || predicate(tnode)))
+                {
+                    return tnode;
+                }
+            }
+
+            return default;
+        }
+
+        /// <summary>
+        /// Gets a list of descendant nodes in prefix document order.
+        /// </summary>
+        /// <param name="descendIntoChildren">An optional function that determines if the search descends into the argument node's children.</param>
+        public IEnumerable<SyntaxNode> DescendantNodes(Func<SyntaxNode, bool> descendIntoChildren = null)
+        {
+            return DescendantNodesImpl(FullSpan, descendIntoChildren, includeSelf: false);
+        }
+
+        /// <summary>
+        /// Gets a list of descendant nodes (including this node) in prefix document order.
+        /// </summary>
+        /// <param name="descendIntoChildren">An optional function that determines if the search descends into the argument node's children.</param>
+        public IEnumerable<SyntaxNode> DescendantNodesAndSelf(Func<SyntaxNode, bool> descendIntoChildren = null)
+        {
+            return DescendantNodesImpl(FullSpan, descendIntoChildren, includeSelf: true);
+        }
+
+        protected internal SyntaxNode ReplaceCore<TNode>(
+            IEnumerable<TNode> nodes = null,
+            Func<TNode, TNode, SyntaxNode> computeReplacementNode = null)
+            where TNode : SyntaxNode
+        {
+            return SyntaxReplacer.Replace(this, nodes, computeReplacementNode);
+        }
+
+        protected internal SyntaxNode ReplaceNodeInListCore(SyntaxNode originalNode, IEnumerable<SyntaxNode> replacementNodes)
+        {
+            return SyntaxReplacer.ReplaceNodeInList(this, originalNode, replacementNodes);
+        }
+
+        protected internal SyntaxNode InsertNodesInListCore(SyntaxNode nodeInList, IEnumerable<SyntaxNode> nodesToInsert, bool insertBefore)
+        {
+            return SyntaxReplacer.InsertNodeInList(this, nodeInList, nodesToInsert, insertBefore);
+        }
+
+        public RazorDiagnostic[] GetDiagnostics()
+        {
+            return Green.GetDiagnostics();
+        }
+
+        public SyntaxAnnotation[] GetAnnotations()
+        {
+            return Green.GetAnnotations();
+        }
+
+        public bool IsEquivalentTo(SyntaxNode other)
+        {
+            if (this == other)
+            {
+                return true;
+            }
+
+            if (other == null)
+            {
+                return false;
+            }
+
+            return Green.IsEquivalentTo(other.Green);
+        }
+
+        public override string ToString()
+        {
+            var builder = new StringBuilder();
+            builder.Append(Green.ToString());
+            builder.AppendFormat(" at {0}::{1}", Position, FullWidth);
+
+            return builder.ToString();
+        }
+
+        public virtual string ToFullString()
+        {
+            return Green.ToFullString();
+        }
+
+        protected virtual string GetDebuggerDisplay()
+        {
+            if (IsToken)
+            {
+                return string.Format("{0};[{1}]", Kind, ToFullString());
+            }
+
+            return string.Format("{0} [{1}..{2})", Kind, Position, EndPosition);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxNodeExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxNodeExtensions.cs
new file mode 100644
index 0000000000..86b8cf4a19
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxNodeExtensions.cs
@@ -0,0 +1,339 @@
+// 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;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal static class SyntaxNodeExtensions
+    {
+        // From http://dev.w3.org/html5/spec/Overview.html#elements-0
+        private static readonly HashSet<string> VoidElements = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        {
+            "area",
+            "base",
+            "br",
+            "col",
+            "command",
+            "embed",
+            "hr",
+            "img",
+            "input",
+            "keygen",
+            "link",
+            "meta",
+            "param",
+            "source",
+            "track",
+            "wbr"
+        };
+
+        public static TNode WithAnnotations<TNode>(this TNode node, params SyntaxAnnotation[] annotations) where TNode : SyntaxNode
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return (TNode)node.Green.SetAnnotations(annotations).CreateRed(node.Parent, node.Position);
+        }
+
+        public static object GetAnnotationValue<TNode>(this TNode node, string key) where TNode : SyntaxNode
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var annotation = node.GetAnnotations().FirstOrDefault(n => n.Kind == key);
+            return annotation?.Data;
+        }
+
+        public static TNode WithDiagnostics<TNode>(this TNode node, params RazorDiagnostic[] diagnostics) where TNode : SyntaxNode
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            return (TNode)node.Green.SetDiagnostics(diagnostics).CreateRed(node.Parent, node.Position);
+        }
+
+        public static TNode AppendDiagnostic<TNode>(this TNode node, params RazorDiagnostic[] diagnostics) where TNode : SyntaxNode
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var existingDiagnostics = node.GetDiagnostics();
+            var allDiagnostics = existingDiagnostics.Concat(diagnostics).ToArray();
+
+            return (TNode)node.WithDiagnostics(allDiagnostics);
+        }
+
+        public static SourceLocation GetSourceLocation(this SyntaxNode node, RazorSourceDocument source)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            try
+            {
+                if (source.Length == 0)
+                {
+                    // Just a marker symbol
+                    return new SourceLocation(source.FilePath, 0, 0, 0);
+                }
+                if (node.Position == source.Length)
+                {
+                    // E.g. Marker symbol at the end of the document
+                    var lastPosition = source.Length - 1;
+                    var endsWithLineBreak = ParserHelpers.IsNewLine(source[lastPosition]);
+                    var lastLocation = source.Lines.GetLocation(lastPosition);
+                    return new SourceLocation(
+                        source.FilePath, // GetLocation prefers RelativePath but we want FilePath.
+                        lastLocation.AbsoluteIndex + 1,
+                        lastLocation.LineIndex + (endsWithLineBreak ? 1 : 0),
+                        endsWithLineBreak ? 0 : lastLocation.CharacterIndex + 1);
+                }
+
+                var location = source.Lines.GetLocation(node.Position);
+                return new SourceLocation(
+                    source.FilePath, // GetLocation prefers RelativePath but we want FilePath.
+                    location.AbsoluteIndex,
+                    location.LineIndex,
+                    location.CharacterIndex);
+            }
+            catch (IndexOutOfRangeException)
+            {
+                Debug.Assert(false, "Node position should stay within document length.");
+                return new SourceLocation(source.FilePath, node.Position, 0, 0);
+            }
+        }
+
+        public static SourceSpan GetSourceSpan(this SyntaxNode node, RazorSourceDocument source)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            var location = node.GetSourceLocation(source);
+
+            return new SourceSpan(location, node.FullWidth);
+        }
+
+        /// <summary>
+        /// Creates a new tree of nodes with the specified nodes, tokens and trivia replaced.
+        /// </summary>
+        /// <typeparam name="TRoot">The type of the root node.</typeparam>
+        /// <param name="root">The root node of the tree of nodes.</param>
+        /// <param name="nodes">The nodes to be replaced.</param>
+        /// <param name="computeReplacementNode">A function that computes a replacement node for the
+        /// argument nodes. The first argument is the original node. The second argument is the same
+        /// node potentially rewritten with replaced descendants.</param>
+        public static TRoot ReplaceSyntax<TRoot>(
+            this TRoot root,
+            IEnumerable<SyntaxNode> nodes,
+            Func<SyntaxNode, SyntaxNode, SyntaxNode> computeReplacementNode)
+            where TRoot : SyntaxNode
+        {
+            return (TRoot)root.ReplaceCore(
+                nodes: nodes, computeReplacementNode: computeReplacementNode);
+        }
+
+        /// <summary>
+        /// Creates a new tree of nodes with the specified old node replaced with a new node.
+        /// </summary>
+        /// <typeparam name="TRoot">The type of the root node.</typeparam>
+        /// <typeparam name="TNode">The type of the nodes being replaced.</typeparam>
+        /// <param name="root">The root node of the tree of nodes.</param>
+        /// <param name="nodes">The nodes to be replaced; descendants of the root node.</param>
+        /// <param name="computeReplacementNode">A function that computes a replacement node for the
+        /// argument nodes. The first argument is the original node. The second argument is the same
+        /// node potentially rewritten with replaced descendants.</param>
+        public static TRoot ReplaceNodes<TRoot, TNode>(this TRoot root, IEnumerable<TNode> nodes, Func<TNode, TNode, SyntaxNode> computeReplacementNode)
+            where TRoot : SyntaxNode
+            where TNode : SyntaxNode
+        {
+            return (TRoot)root.ReplaceCore(nodes: nodes, computeReplacementNode: computeReplacementNode);
+        }
+
+        /// <summary>
+        /// Creates a new tree of nodes with the specified old node replaced with a new node.
+        /// </summary>
+        /// <typeparam name="TRoot">The type of the root node.</typeparam>
+        /// <param name="root">The root node of the tree of nodes.</param>
+        /// <param name="oldNode">The node to be replaced; a descendant of the root node.</param>
+        /// <param name="newNode">The new node to use in the new tree in place of the old node.</param>
+        public static TRoot ReplaceNode<TRoot>(this TRoot root, SyntaxNode oldNode, SyntaxNode newNode)
+            where TRoot : SyntaxNode
+        {
+            if (oldNode == newNode)
+            {
+                return root;
+            }
+
+            return (TRoot)root.ReplaceCore(nodes: new[] { oldNode }, computeReplacementNode: (o, r) => newNode);
+        }
+
+        /// <summary>
+        /// Creates a new tree of nodes with specified old node replaced with a new nodes.
+        /// </summary>
+        /// <typeparam name="TRoot">The type of the root node.</typeparam>
+        /// <param name="root">The root of the tree of nodes.</param>
+        /// <param name="oldNode">The node to be replaced; a descendant of the root node and an element of a list member.</param>
+        /// <param name="newNodes">A sequence of nodes to use in the tree in place of the old node.</param>
+        public static TRoot ReplaceNode<TRoot>(this TRoot root, SyntaxNode oldNode, IEnumerable<SyntaxNode> newNodes)
+            where TRoot : SyntaxNode
+        {
+            return (TRoot)root.ReplaceNodeInListCore(oldNode, newNodes);
+        }
+
+        /// <summary>
+        /// Creates a new tree of nodes with new nodes inserted before the specified node.
+        /// </summary>
+        /// <typeparam name="TRoot">The type of the root node.</typeparam>
+        /// <param name="root">The root of the tree of nodes.</param>
+        /// <param name="nodeInList">The node to insert before; a descendant of the root node an element of a list member.</param>
+        /// <param name="newNodes">A sequence of nodes to insert into the tree immediately before the specified node.</param>
+        public static TRoot InsertNodesBefore<TRoot>(this TRoot root, SyntaxNode nodeInList, IEnumerable<SyntaxNode> newNodes)
+            where TRoot : SyntaxNode
+        {
+            return (TRoot)root.InsertNodesInListCore(nodeInList, newNodes, insertBefore: true);
+        }
+
+        /// <summary>
+        /// Creates a new tree of nodes with new nodes inserted after the specified node.
+        /// </summary>
+        /// <typeparam name="TRoot">The type of the root node.</typeparam>
+        /// <param name="root">The root of the tree of nodes.</param>
+        /// <param name="nodeInList">The node to insert after; a descendant of the root node an element of a list member.</param>
+        /// <param name="newNodes">A sequence of nodes to insert into the tree immediately after the specified node.</param>
+        public static TRoot InsertNodesAfter<TRoot>(this TRoot root, SyntaxNode nodeInList, IEnumerable<SyntaxNode> newNodes)
+            where TRoot : SyntaxNode
+        {
+            return (TRoot)root.InsertNodesInListCore(nodeInList, newNodes, insertBefore: false);
+        }
+
+        public static string GetContent<TNode>(this TNode node) where TNode : SyntaxNode
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            var tokens = node.DescendantNodes().Where(n => n.IsToken).Cast<SyntaxToken>();
+            var content = string.Concat(tokens.Select(t => t.Content));
+            return content;
+        }
+
+        public static string GetTagName(this MarkupTagBlockSyntax tagBlock)
+        {
+            if (tagBlock == null)
+            {
+                throw new ArgumentNullException(nameof(tagBlock));
+            }
+
+            var child = tagBlock.Children[0];
+
+            if (tagBlock.Children.Count == 0 || !(child is MarkupTextLiteralSyntax))
+            {
+                return null;
+            }
+
+            var childLiteral = (MarkupTextLiteralSyntax)child;
+            SyntaxToken textToken = null;
+            for (var i = 0; i < childLiteral.LiteralTokens.Count; i++)
+            {
+                var token = childLiteral.LiteralTokens[i];
+
+                if (token != null &&
+                    (token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.Text))
+                {
+                    textToken = token;
+                    break;
+                }
+            }
+
+            if (textToken == null)
+            {
+                return null;
+            }
+
+            return textToken.Kind == SyntaxKind.Whitespace ? null : textToken.Content;
+        }
+
+        public static string GetTagName(this MarkupTagHelperStartTagSyntax tagBlock)
+        {
+            if (tagBlock == null)
+            {
+                throw new ArgumentNullException(nameof(tagBlock));
+            }
+
+            var child = tagBlock.Children[0];
+
+            if (tagBlock.Children.Count == 0 || !(child is MarkupTextLiteralSyntax))
+            {
+                return null;
+            }
+
+            var childLiteral = (MarkupTextLiteralSyntax)child;
+            SyntaxToken textToken = null;
+            for (var i = 0; i < childLiteral.LiteralTokens.Count; i++)
+            {
+                var token = childLiteral.LiteralTokens[i];
+
+                if (token != null &&
+                    (token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.Text))
+                {
+                    textToken = token;
+                    break;
+                }
+            }
+
+            if (textToken == null)
+            {
+                return null;
+            }
+
+            return textToken.Kind == SyntaxKind.Whitespace ? null : textToken.Content;
+        }
+
+        public static bool IsSelfClosing(this MarkupTagBlockSyntax tagBlock)
+        {
+            if (tagBlock == null)
+            {
+                throw new ArgumentNullException(nameof(tagBlock));
+            }
+
+            var lastChild = tagBlock.ChildNodes().LastOrDefault();
+
+            return lastChild?.GetContent().EndsWith("/>", StringComparison.Ordinal) ?? false;
+        }
+
+        public static bool IsVoidElement(this MarkupTagBlockSyntax tagBlock)
+        {
+            if (tagBlock == null)
+            {
+                throw new ArgumentNullException(nameof(tagBlock));
+            }
+
+            return VoidElements.Contains(tagBlock.GetTagName());
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxReplacer.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxReplacer.cs
new file mode 100644
index 0000000000..2d192958e4
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxReplacer.cs
@@ -0,0 +1,207 @@
+// 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;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal static class SyntaxReplacer
+    {
+        internal static SyntaxNode Replace<TNode>(
+            SyntaxNode root,
+            IEnumerable<TNode> nodes = null,
+            Func<TNode, TNode, SyntaxNode> computeReplacementNode = null)
+            where TNode : SyntaxNode
+        {
+            var replacer = new Replacer<TNode>(nodes, computeReplacementNode);
+
+            if (replacer.HasWork)
+            {
+                return replacer.Visit(root);
+            }
+            else
+            {
+                return root;
+            }
+        }
+
+        internal static SyntaxNode ReplaceNodeInList(SyntaxNode root, SyntaxNode originalNode, IEnumerable<SyntaxNode> newNodes)
+        {
+            return new NodeListEditor(originalNode, newNodes, ListEditKind.Replace).Visit(root);
+        }
+
+        internal static SyntaxNode InsertNodeInList(SyntaxNode root, SyntaxNode nodeInList, IEnumerable<SyntaxNode> nodesToInsert, bool insertBefore)
+        {
+            return new NodeListEditor(nodeInList, nodesToInsert, insertBefore ? ListEditKind.InsertBefore : ListEditKind.InsertAfter).Visit(root);
+        }
+
+        private class Replacer<TNode> : SyntaxRewriter where TNode : SyntaxNode
+        {
+            private readonly Func<TNode, TNode, SyntaxNode> _computeReplacementNode;
+            private readonly HashSet<SyntaxNode> _nodeSet;
+            private readonly HashSet<TextSpan> _spanSet;
+            private readonly TextSpan _totalSpan;
+
+            public Replacer(IEnumerable<TNode> nodes, Func<TNode, TNode, SyntaxNode> computeReplacementNode)
+            {
+                _computeReplacementNode = computeReplacementNode;
+                _nodeSet = nodes != null ? new HashSet<SyntaxNode>(nodes) : new HashSet<SyntaxNode>();
+                _spanSet = new HashSet<TextSpan>(_nodeSet.Select(n => n.FullSpan));
+                _totalSpan = ComputeTotalSpan(_spanSet);
+            }
+
+            public bool HasWork => _nodeSet.Count > 0;
+
+            public override SyntaxNode Visit(SyntaxNode node)
+            {
+                var rewritten = node;
+
+                if (node != null)
+                {
+                    if (ShouldVisit(node.FullSpan))
+                    {
+                        rewritten = base.Visit(node);
+                    }
+
+                    if (_nodeSet.Contains(node) && _computeReplacementNode != null)
+                    {
+                        rewritten = _computeReplacementNode((TNode)node, (TNode)rewritten);
+                    }
+                }
+
+                return rewritten;
+            }
+
+            private static TextSpan ComputeTotalSpan(IEnumerable<TextSpan> spans)
+            {
+                var first = true;
+                var start = 0;
+                var end = 0;
+
+                foreach (var span in spans)
+                {
+                    if (first)
+                    {
+                        start = span.Start;
+                        end = span.End;
+                        first = false;
+                    }
+                    else
+                    {
+                        start = Math.Min(start, span.Start);
+                        end = Math.Max(end, span.End);
+                    }
+                }
+
+                return new TextSpan(start, end - start);
+            }
+
+            private bool ShouldVisit(TextSpan span)
+            {
+                // first do quick check against total span
+                if (!span.IntersectsWith(_totalSpan))
+                {
+                    // if the node is outside the total span of the nodes to be replaced
+                    // then we won't find any nodes to replace below it.
+                    return false;
+                }
+
+                foreach (var s in _spanSet)
+                {
+                    if (span.IntersectsWith(s))
+                    {
+                        // node's full span intersects with at least one node to be replaced
+                        // so we need to visit node's children to find it.
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        }
+
+        private class NodeListEditor : SyntaxRewriter
+        {
+            private readonly TextSpan _elementSpan;
+            private readonly SyntaxNode _originalNode;
+            private readonly IEnumerable<SyntaxNode> _newNodes;
+            private readonly ListEditKind _editKind;
+
+            public NodeListEditor(
+                SyntaxNode originalNode,
+                IEnumerable<SyntaxNode> replacementNodes,
+                ListEditKind editKind)
+            {
+                _elementSpan = originalNode.Span;
+                _originalNode = originalNode;
+                _newNodes = replacementNodes;
+                _editKind = editKind;
+            }
+
+            private bool ShouldVisit(TextSpan span)
+            {
+                if (span.IntersectsWith(_elementSpan))
+                {
+                    // node's full span intersects with at least one node to be replaced
+                    // so we need to visit node's children to find it.
+                    return true;
+                }
+
+                return false;
+            }
+
+            public override SyntaxNode Visit(SyntaxNode node)
+            {
+                if (node == _originalNode)
+                {
+                    throw new InvalidOperationException("Expecting a list");
+                }
+
+                var rewritten = node;
+
+                if (node != null)
+                {
+                    if (ShouldVisit(node.FullSpan))
+                    {
+                        rewritten = base.Visit(node);
+                    }
+                }
+
+                return rewritten;
+            }
+
+            public override SyntaxList<TNode> VisitList<TNode>(SyntaxList<TNode> list)
+            {
+                if (_originalNode is TNode)
+                {
+                    var index = list.IndexOf((TNode)_originalNode);
+                    if (index >= 0 && index < list.Count)
+                    {
+                        switch (_editKind)
+                        {
+                            case ListEditKind.Replace:
+                                return list.ReplaceRange((TNode)_originalNode, _newNodes.Cast<TNode>());
+
+                            case ListEditKind.InsertAfter:
+                                return list.InsertRange(index + 1, _newNodes.Cast<TNode>());
+
+                            case ListEditKind.InsertBefore:
+                                return list.InsertRange(index, _newNodes.Cast<TNode>());
+                        }
+                    }
+                }
+
+                return base.VisitList<TNode>(list);
+            }
+        }
+
+        private enum ListEditKind
+        {
+            InsertBefore,
+            InsertAfter,
+            Replace
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxRewriter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxRewriter.cs
new file mode 100644
index 0000000000..d491bd0e88
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxRewriter.cs
@@ -0,0 +1,148 @@
+// 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.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal abstract partial class SyntaxRewriter : SyntaxVisitor<SyntaxNode>
+    {
+        public override SyntaxNode VisitToken(SyntaxToken token)
+        {
+            // PERF: This is a hot method, so it has been written to minimize the following:
+            // 1. Virtual method calls
+            // 2. Copying of structs
+            // 3. Repeated null checks
+
+            // PERF: Avoid testing node for null more than once
+            var node = token?.Green;
+            if (node == null)
+            {
+                return token;
+            }
+
+            // PERF: Make one virtual method call each to get the leading and trailing trivia
+            var leadingTrivia = node.GetLeadingTrivia();
+            var trailingTrivia = node.GetTrailingTrivia();
+
+            // Trivia is either null or a non-empty list (there's no such thing as an empty green list)
+            Debug.Assert(leadingTrivia == null || !leadingTrivia.IsList || leadingTrivia.SlotCount > 0);
+            Debug.Assert(trailingTrivia == null || !trailingTrivia.IsList || trailingTrivia.SlotCount > 0);
+
+            if (leadingTrivia != null)
+            {
+                // PERF: Expand token.LeadingTrivia when node is not null.
+                var leading = VisitList(new SyntaxTriviaList(leadingTrivia.CreateRed(token, token.Position)));
+
+                if (trailingTrivia != null)
+                {
+                    // Both leading and trailing trivia
+
+                    // PERF: Expand token.TrailingTrivia when node is not null and leadingTrivia is not null.
+                    // Also avoid node.Width because it makes a virtual call to GetText. Instead use node.FullWidth - trailingTrivia.FullWidth.
+                    var index = leadingTrivia.IsList ? leadingTrivia.SlotCount : 1;
+                    var position = token.Position + node.FullWidth - trailingTrivia.FullWidth;
+                    var trailing = VisitList(new SyntaxTriviaList(trailingTrivia.CreateRed(token, position), position, index));
+
+                    if (leading.Node.Green != leadingTrivia)
+                    {
+                        token = token.WithLeadingTrivia(leading);
+                    }
+
+                    return trailing.Node.Green != trailingTrivia ? token.WithTrailingTrivia(trailing) : token;
+                }
+                else
+                {
+                    // Leading trivia only
+                    return leading.Node.Green != leadingTrivia ? token.WithLeadingTrivia(leading) : token;
+                }
+            }
+            else if (trailingTrivia != null)
+            {
+                // Trailing trivia only
+                // PERF: Expand token.TrailingTrivia when node is not null and leading is null.
+                // Also avoid node.Width because it makes a virtual call to GetText. Instead use node.FullWidth - trailingTrivia.FullWidth.
+                var position = token.Position + node.FullWidth - trailingTrivia.FullWidth;
+                var trailing = VisitList(new SyntaxTriviaList(trailingTrivia.CreateRed(token, position), position, index: 0));
+                return trailing.Node.Green != trailingTrivia ? token.WithTrailingTrivia(trailing) : token;
+            }
+            else
+            {
+                // No trivia
+                return token;
+            }
+        }
+
+        public virtual SyntaxList<TNode> VisitList<TNode>(SyntaxList<TNode> list) where TNode : SyntaxNode
+        {
+            SyntaxListBuilder alternate = null;
+            for (int i = 0, n = list.Count; i < n; i++)
+            {
+                var item = list[i];
+                var visited = VisitListElement(item);
+                if (item != visited && alternate == null)
+                {
+                    alternate = new SyntaxListBuilder(n);
+                    alternate.AddRange(list, 0, i);
+                }
+
+                if (alternate != null && visited != null)
+                {
+                    alternate.Add(visited);
+                }
+            }
+
+            if (alternate != null)
+            {
+                return alternate.ToList();
+            }
+
+            return list;
+        }
+
+        public override SyntaxNode VisitTrivia(SyntaxTrivia trivia)
+        {
+            return trivia;
+        }
+
+        public virtual SyntaxTriviaList VisitList(SyntaxTriviaList list)
+        {
+            var count = list.Count;
+            if (count != 0)
+            {
+                SyntaxTriviaListBuilder alternate = null;
+                var index = -1;
+
+                foreach (var item in list)
+                {
+                    index++;
+                    var visited = VisitListElement(item);
+
+                    //skip the null check since SyntaxTrivia is a value type
+                    if (visited != item && alternate == null)
+                    {
+                        alternate = new SyntaxTriviaListBuilder(count);
+                        alternate.Add(list, 0, index);
+                    }
+
+                    if (alternate != null && visited != null)
+                    {
+                        alternate.Add(visited);
+                    }
+                }
+
+                if (alternate != null)
+                {
+                    return alternate.ToList();
+                }
+            }
+
+            return list;
+        }
+
+        public virtual TNode VisitListElement<TNode>(TNode node) where TNode : SyntaxNode
+        {
+            return (TNode)(SyntaxNode)Visit(node);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxSerializer.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxSerializer.cs
new file mode 100644
index 0000000000..5b167b510f
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxSerializer.cs
@@ -0,0 +1,304 @@
+// 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;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal class SyntaxSerializer
+    {
+        internal static string Serialize(SyntaxNode node)
+        {
+            using (var writer = new StringWriter())
+            {
+                var walker = new Walker(writer);
+                walker.Visit(node);
+
+                return writer.ToString();
+            }
+        }
+
+        private class Walker : SyntaxWalker
+        {
+            private readonly SyntaxWriter _visitor;
+            private readonly TextWriter _writer;
+
+            public Walker(TextWriter writer)
+            {
+                _visitor = new SyntaxWriter(writer);
+                _writer = writer;
+            }
+
+            public TextWriter Writer { get; }
+
+            public override SyntaxNode Visit(SyntaxNode node)
+            {
+                if (node == null)
+                {
+                    return node;
+                }
+
+                if (node.IsList)
+                {
+                    return base.DefaultVisit(node);
+                }
+
+                _visitor.Visit(node);
+                _writer.WriteLine();
+
+                if (!node.IsToken && !node.IsTrivia)
+                {
+                    _visitor.Depth++;
+                    node = base.DefaultVisit(node);
+                    _visitor.Depth--;
+                }
+
+                return node;
+            }
+        }
+
+        private class SyntaxWalker : SyntaxRewriter
+        {
+            private readonly List<SyntaxNode> _ancestors = new List<SyntaxNode>();
+
+            protected IReadOnlyList<SyntaxNode> Ancestors => _ancestors;
+
+            protected SyntaxNode Parent => _ancestors.Count > 0 ? _ancestors[0] : null;
+
+            protected override SyntaxNode DefaultVisit(SyntaxNode node)
+            {
+                _ancestors.Insert(0, node);
+
+                try
+                {
+                    for (var i = 0; i < node.SlotCount; i++)
+                    {
+                        var child = node.GetNodeSlot(i);
+                        Visit(child);
+                    }
+                }
+                finally
+                {
+                    _ancestors.RemoveAt(0);
+                }
+
+                return node;
+            }
+        }
+
+        private class SyntaxWriter : SyntaxRewriter
+        {
+            private readonly TextWriter _writer;
+            private bool _visitedRoot;
+
+            public SyntaxWriter(TextWriter writer)
+            {
+                _writer = writer;
+            }
+
+            public int Depth { get; set; }
+
+            public override SyntaxNode Visit(SyntaxNode node)
+            {
+                if (node is SyntaxToken token)
+                {
+                    return VisitToken(token);
+                }
+
+                WriteNode(node);
+                return node;
+            }
+
+            public override SyntaxNode VisitToken(SyntaxToken token)
+            {
+                WriteToken(token);
+                return base.VisitToken(token);
+            }
+
+            public override SyntaxNode VisitTrivia(SyntaxTrivia trivia)
+            {
+                WriteTrivia(trivia);
+                return base.VisitTrivia(trivia);
+            }
+
+            private void WriteNode(SyntaxNode node)
+            {
+                WriteIndent();
+                Write(node.Kind);
+                WriteSeparator();
+                Write($"[{node.Position}..{node.EndPosition})");
+                WriteSeparator();
+                Write($"FullWidth: {node.FullWidth}");
+
+                if (node is RazorDirectiveSyntax razorDirective)
+                {
+                    WriteRazorDirective(razorDirective);
+                }
+                else if (node is MarkupTagHelperElementSyntax tagHelperElement)
+                {
+                    WriteTagHelperElement(tagHelperElement);
+                }
+                else if (node is MarkupTagHelperAttributeSyntax tagHelperAttribute)
+                {
+                    WriteTagHelperAttributeInfo(tagHelperAttribute.TagHelperAttributeInfo);
+                }
+                else if (node is MarkupMinimizedTagHelperAttributeSyntax minimizedTagHelperAttribute)
+                {
+                    WriteTagHelperAttributeInfo(minimizedTagHelperAttribute.TagHelperAttributeInfo);
+                }
+
+                if (ShouldDisplayNodeContent(node))
+                {
+                    WriteSeparator();
+                    Write($"[{node.GetContent()}]");
+                }
+
+                var annotation = node.GetAnnotations().FirstOrDefault(a => a.Kind == SyntaxConstants.SpanContextKind);
+                if (annotation != null && annotation.Data is SpanContext context)
+                {
+                    WriteSpanContext(context);
+                }
+
+                if (!_visitedRoot)
+                {
+                    WriteSeparator();
+                    Write($"[{node.ToFullString()}]");
+                    _visitedRoot = true;
+                }
+            }
+
+            private void WriteRazorDirective(RazorDirectiveSyntax node)
+            {
+                if (node.DirectiveDescriptor == null)
+                {
+                    return;
+                }
+
+                var builder = new StringBuilder("Directive:{");
+                builder.Append(node.DirectiveDescriptor.Directive);
+                builder.Append(";");
+                builder.Append(node.DirectiveDescriptor.Kind);
+                builder.Append(";");
+                builder.Append(node.DirectiveDescriptor.Usage);
+                builder.Append("}");
+
+                var diagnostics = node.GetDiagnostics();
+                if (diagnostics.Length > 0)
+                {
+                    builder.Append(" [");
+                    var ids = string.Join(", ", diagnostics.Select(diagnostic => $"{diagnostic.Id}{diagnostic.Span}"));
+                    builder.Append(ids);
+                    builder.Append("]");
+                }
+
+                WriteSeparator();
+                Write(builder.ToString());
+            }
+
+            private void WriteTagHelperElement(MarkupTagHelperElementSyntax node)
+            {
+                // Write tag name
+                WriteSeparator();
+                Write($"{node.TagHelperInfo.TagName}[{node.TagHelperInfo.TagMode}]");
+
+                // Write descriptors
+                foreach (var descriptor in node.TagHelperInfo.BindingResult.Descriptors)
+                {
+                    WriteSeparator();
+
+                    // Get the type name without the namespace.
+                    var typeName = descriptor.Name.Substring(descriptor.Name.LastIndexOf('.') + 1);
+                    Write(typeName);
+                }
+            }
+
+            private void WriteTagHelperAttributeInfo(TagHelperAttributeInfo info)
+            {
+                // Write attributes
+                WriteSeparator();
+                Write(info.Name);
+                WriteSeparator();
+                Write(info.AttributeStructure);
+                WriteSeparator();
+                Write(info.Bound ? "Bound" : "Unbound");
+            }
+
+            private void WriteToken(SyntaxToken token)
+            {
+                WriteIndent();
+                var content = token.IsMissing ? "<Missing>" : token.Content;
+                var diagnostics = token.GetDiagnostics();
+                var tokenString = $"{token.Kind};[{content}];{string.Join(", ", diagnostics.Select(diagnostic => diagnostic.Id + diagnostic.Span))}";
+                Write(tokenString);
+            }
+
+            private void WriteTrivia(SyntaxTrivia trivia)
+            {
+                throw new NotImplementedException();
+            }
+
+            private void WriteSpanContext(SpanContext context)
+            {
+                WriteSeparator();
+                Write($"Gen<{context.ChunkGenerator}>");
+                WriteSeparator();
+                Write(context.EditHandler);
+            }
+
+            protected void WriteIndent()
+            {
+                for (var i = 0; i < Depth; i++)
+                {
+                    for (var j = 0; j < 4; j++)
+                    {
+                        Write(' ');
+                    }
+                }
+            }
+
+            protected void WriteSeparator()
+            {
+                Write(" - ");
+            }
+
+            protected void WriteNewLine()
+            {
+                _writer.WriteLine();
+            }
+
+            protected void Write(object value)
+            {
+                if (value is string stringValue)
+                {
+                    stringValue = stringValue.Replace(Environment.NewLine, "LF");
+                    _writer.Write(stringValue);
+                    return;
+                }
+
+                _writer.Write(value);
+            }
+
+            private static bool ShouldDisplayNodeContent(SyntaxNode node)
+            {
+                return node.Kind == SyntaxKind.MarkupTextLiteral ||
+                    node.Kind == SyntaxKind.MarkupEphemeralTextLiteral ||
+                    node.Kind == SyntaxKind.MarkupTagBlock ||
+                    node.Kind == SyntaxKind.MarkupAttributeBlock ||
+                    node.Kind == SyntaxKind.MarkupMinimizedAttributeBlock ||
+                    node.Kind == SyntaxKind.MarkupTagHelperAttribute ||
+                    node.Kind == SyntaxKind.MarkupMinimizedTagHelperAttribute ||
+                    node.Kind == SyntaxKind.MarkupLiteralAttributeValue ||
+                    node.Kind == SyntaxKind.MarkupDynamicAttributeValue ||
+                    node.Kind == SyntaxKind.CSharpStatementLiteral ||
+                    node.Kind == SyntaxKind.CSharpExpressionLiteral ||
+                    node.Kind == SyntaxKind.CSharpEphemeralTextLiteral ||
+                    node.Kind == SyntaxKind.UnclassifiedTextLiteral;
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxToken.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxToken.cs
new file mode 100644
index 0000000000..e3ecd35bf6
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxToken.cs
@@ -0,0 +1,105 @@
+// 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;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal class SyntaxToken : RazorSyntaxNode
+    {
+        internal SyntaxToken(GreenNode green, SyntaxNode parent, int position)
+            : base(green, parent, position)
+        {
+        }
+
+        internal new InternalSyntax.SyntaxToken Green => (InternalSyntax.SyntaxToken)base.Green;
+
+        public string Content => Green.Content;
+
+        internal override sealed SyntaxNode GetCachedSlot(int index)
+        {
+            throw new InvalidOperationException("Tokens can't have slots.");
+        }
+
+        internal override sealed SyntaxNode GetNodeSlot(int slot)
+        {
+            throw new InvalidOperationException("Tokens can't have slots.");
+        }
+
+        public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+        {
+            return visitor.VisitToken(this);
+        }
+
+        public override void Accept(SyntaxVisitor visitor)
+        {
+            visitor.VisitToken(this);
+        }
+
+        public SyntaxToken WithLeadingTrivia(SyntaxNode trivia)
+        {
+            return Green != null
+                ? new SyntaxToken(Green.WithLeadingTrivia(trivia.Green), parent: null, position: 0)
+                : default(SyntaxToken);
+        }
+
+        public SyntaxToken WithTrailingTrivia(SyntaxNode trivia)
+        {
+            return Green != null
+                ? new SyntaxToken(Green.WithTrailingTrivia(trivia.Green), parent: null, position: 0)
+                : default(SyntaxToken);
+        }
+
+        public SyntaxToken WithLeadingTrivia(IEnumerable<SyntaxTrivia> trivia)
+        {
+            var greenList = trivia?.Select(t => t.Green);
+            return WithLeadingTrivia(Green.CreateList(greenList)?.CreateRed());
+        }
+
+        public SyntaxToken WithTrailingTrivia(IEnumerable<SyntaxTrivia> trivia)
+        {
+            var greenList = trivia?.Select(t => t.Green);
+            return WithTrailingTrivia(Green.CreateList(greenList)?.CreateRed());
+        }
+
+        public override SyntaxTriviaList GetLeadingTrivia()
+        {
+            var leading = Green.GetLeadingTrivia();
+            if (leading == null)
+            {
+                return default(SyntaxTriviaList);
+            }
+
+            return new SyntaxTriviaList(leading.CreateRed(this, Position), Position);
+        }
+
+        public override SyntaxTriviaList GetTrailingTrivia()
+        {
+            var trailing = Green.GetTrailingTrivia();
+            if (trailing == null)
+            {
+                return default(SyntaxTriviaList);
+            }
+
+            var leading = Green.GetLeadingTrivia();
+            var index = 0;
+            if (leading != null)
+            {
+                index = leading.IsList ? leading.SlotCount : 1;
+            }
+            int trailingPosition = Position + FullWidth;
+            trailingPosition -= trailing.FullWidth;
+
+            return new SyntaxTriviaList(trailing.CreateRed(this, trailingPosition), trailingPosition, index);
+        }
+
+        public override string ToString()
+        {
+            return Content;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxTrivia.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxTrivia.cs
new file mode 100644
index 0000000000..d16e42f1ed
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxTrivia.cs
@@ -0,0 +1,59 @@
+// 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;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal class SyntaxTrivia : SyntaxNode
+    {
+        internal SyntaxTrivia(GreenNode green, SyntaxNode parent, int position)
+            : base(green, parent, position)
+        {
+        }
+
+        internal new InternalSyntax.SyntaxTrivia Green => (InternalSyntax.SyntaxTrivia)base.Green;
+
+        public string Text => Green.Text;
+
+        internal override sealed SyntaxNode GetCachedSlot(int index)
+        {
+            throw new InvalidOperationException();
+        }
+
+        internal override sealed SyntaxNode GetNodeSlot(int slot)
+        {
+            throw new InvalidOperationException();
+        }
+
+        public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
+        {
+            return visitor.VisitTrivia(this);
+        }
+
+        public override void Accept(SyntaxVisitor visitor)
+        {
+            visitor.VisitTrivia(this);
+        }
+
+        public sealed override SyntaxTriviaList GetTrailingTrivia()
+        {
+            return default(SyntaxTriviaList);
+        }
+
+        public sealed override SyntaxTriviaList GetLeadingTrivia()
+        {
+            return default(SyntaxTriviaList);
+        }
+
+        public override string ToString()
+        {
+            return Text;
+        }
+
+        public sealed override string ToFullString()
+        {
+            return Text;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxTriviaList.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxTriviaList.cs
new file mode 100644
index 0000000000..2097e9391c
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxTriviaList.cs
@@ -0,0 +1,785 @@
+// 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;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Runtime.InteropServices;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    [StructLayout(LayoutKind.Auto)]
+    internal readonly struct SyntaxTriviaList : IEquatable<SyntaxTriviaList>, IReadOnlyList<SyntaxTrivia>
+    {
+        public static SyntaxTriviaList Empty => default(SyntaxTriviaList);
+
+        internal SyntaxTriviaList(SyntaxNode node, int position, int index = 0)
+        {
+            Node = node;
+            Position = position;
+            Index = index;
+        }
+
+        internal SyntaxTriviaList(SyntaxNode node)
+        {
+            Node = node;
+            Position = node.Position;
+            Index = 0;
+        }
+
+        public SyntaxTriviaList(SyntaxTrivia trivia)
+        {
+            Node = trivia;
+            Position = 0;
+            Index = 0;
+        }
+
+        /// <summary>
+        /// Creates a list of trivia.
+        /// </summary>
+        /// <param name="trivias">An array of trivia.</param>
+        public SyntaxTriviaList(params SyntaxTrivia[] trivias)
+            : this(CreateNode(trivias), 0, 0)
+        {
+        }
+
+        /// <summary>
+        /// Creates a list of trivia.
+        /// </summary>
+        /// <param name="trivias">A sequence of trivia.</param>
+        public SyntaxTriviaList(IEnumerable<SyntaxTrivia> trivias)
+            : this(SyntaxTriviaListBuilder.Create(trivias).Node, 0, 0)
+        {
+        }
+
+        private static SyntaxNode CreateNode(SyntaxTrivia[] trivias)
+        {
+            if (trivias == null)
+            {
+                return null;
+            }
+
+            var builder = new SyntaxTriviaListBuilder(trivias.Length);
+            builder.Add(trivias);
+            return builder.ToList().Node;
+        }
+
+        internal SyntaxNode Node { get; }
+
+        internal int Position { get; }
+
+        internal int Index { get; }
+
+        public int Count
+        {
+            get { return Node == null ? 0 : (Node.IsList ? Node.SlotCount : 1); }
+        }
+
+        public SyntaxTrivia ElementAt(int index)
+        {
+            return this[index];
+        }
+
+        /// <summary>
+        /// Gets the trivia at the specified index.
+        /// </summary>
+        /// <param name="index">The zero-based index of the trivia to get.</param>
+        /// <returns>The token at the specified index.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// <paramref name="index" /> is less than 0.-or-<paramref name="index" /> is equal to or greater than <see cref="Count" />. </exception>
+        public SyntaxTrivia this[int index]
+        {
+            get
+            {
+                if (Node != null)
+                {
+                    if (Node.IsList)
+                    {
+                        if (unchecked((uint)index < (uint)Node.SlotCount))
+                        {
+                            return Node.GetNodeSlot(index) as SyntaxTrivia;
+                        }
+                    }
+                    else if (index == 0)
+                    {
+                        return Node as SyntaxTrivia;
+                    }
+                }
+
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+        }
+
+        /// <summary>
+        /// The absolute span of the list elements in characters, including the leading and trailing trivia of the first and last elements.
+        /// </summary>
+        public TextSpan FullSpan
+        {
+            get
+            {
+                if (Node == null)
+                {
+                    return default(TextSpan);
+                }
+
+                return new TextSpan(Position, Node.FullWidth);
+            }
+        }
+
+        /// <summary>
+        /// The absolute span of the list elements in characters, not including the leading and trailing trivia of the first and last elements.
+        /// </summary>
+        public TextSpan Span
+        {
+            get
+            {
+                if (Node == null)
+                {
+                    return default(TextSpan);
+                }
+
+                return TextSpan.FromBounds(Position + Node.Green.GetLeadingTriviaWidth(),
+                    Position + Node.FullWidth - Node.Green.GetTrailingTriviaWidth());
+            }
+        }
+
+        /// <summary>
+        /// Returns the first trivia in the list.
+        /// </summary>
+        /// <returns>The first trivia in the list.</returns>
+        /// <exception cref="InvalidOperationException">The list is empty.</exception>        
+        public SyntaxTrivia First()
+        {
+            if (Any())
+            {
+                return this[0];
+            }
+
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        /// Returns the last trivia in the list.
+        /// </summary>
+        /// <returns>The last trivia in the list.</returns>
+        /// <exception cref="InvalidOperationException">The list is empty.</exception>        
+        public SyntaxTrivia Last()
+        {
+            if (Any())
+            {
+                return this[Count - 1];
+            }
+
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        /// Does this list have any items.
+        /// </summary>
+        public bool Any()
+        {
+            return Node != null;
+        }
+
+        /// <summary>
+        /// Returns a list which contains all elements of <see cref="SyntaxTriviaList"/> in reversed order.
+        /// </summary>
+        /// <returns><see cref="Reversed"/> which contains all elements of <see cref="SyntaxTriviaList"/> in reversed order</returns>
+        public Reversed Reverse()
+        {
+            return new Reversed(this);
+        }
+
+        public Enumerator GetEnumerator()
+        {
+            return new Enumerator(this);
+        }
+
+        public int IndexOf(SyntaxTrivia triviaInList)
+        {
+            for (int i = 0, n = Count; i < n; i++)
+            {
+                var trivia = this[i];
+                if (trivia == triviaInList)
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        internal int IndexOf(SyntaxKind kind)
+        {
+            for (int i = 0, n = Count; i < n; i++)
+            {
+                if (this[i].Kind == kind)
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="SyntaxTriviaList"/> with the specified trivia added to the end.
+        /// </summary>
+        /// <param name="trivia">The trivia to add.</param>
+        public SyntaxTriviaList Add(SyntaxTrivia trivia)
+        {
+            return Insert(Count, trivia);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="SyntaxTriviaList"/> with the specified trivia added to the end.
+        /// </summary>
+        /// <param name="trivia">The trivia to add.</param>
+        public SyntaxTriviaList AddRange(IEnumerable<SyntaxTrivia> trivia)
+        {
+            return InsertRange(Count, trivia);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="SyntaxTriviaList"/> with the specified trivia inserted at the index.
+        /// </summary>
+        /// <param name="index">The index in the list to insert the trivia at.</param>
+        /// <param name="trivia">The trivia to insert.</param>
+        public SyntaxTriviaList Insert(int index, SyntaxTrivia trivia)
+        {
+            if (trivia == default(SyntaxTrivia))
+            {
+                throw new ArgumentOutOfRangeException(nameof(trivia));
+            }
+
+            return InsertRange(index, new[] { trivia });
+        }
+
+        private static readonly ObjectPool<SyntaxTriviaListBuilder> s_builderPool =
+            new ObjectPool<SyntaxTriviaListBuilder>(() => SyntaxTriviaListBuilder.Create());
+
+        private static SyntaxTriviaListBuilder GetBuilder()
+            => s_builderPool.Allocate();
+
+        private static void ClearAndFreeBuilder(SyntaxTriviaListBuilder builder)
+        {
+            // It's possible someone might create a list with a huge amount of trivia
+            // in it.  We don't want to hold onto such items forever.  So only cache
+            // reasonably sized lists.  In IDE testing, around 99% of all trivia lists
+            // were 16 or less elements.
+            const int MaxBuilderCount = 16;
+            if (builder.Count <= MaxBuilderCount)
+            {
+                builder.Clear();
+                s_builderPool.Free(builder);
+            }
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="SyntaxTriviaList"/> with the specified trivia inserted at the index.
+        /// </summary>
+        /// <param name="index">The index in the list to insert the trivia at.</param>
+        /// <param name="trivia">The trivia to insert.</param>
+        public SyntaxTriviaList InsertRange(int index, IEnumerable<SyntaxTrivia> trivia)
+        {
+            var thisCount = Count;
+            if (index < 0 || index > thisCount)
+            {
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+
+            if (trivia == null)
+            {
+                throw new ArgumentNullException(nameof(trivia));
+            }
+
+            // Just return ourselves if we're not being asked to add anything.
+            if (trivia is ICollection<SyntaxTrivia> triviaCollection && triviaCollection.Count == 0)
+            {
+                return this;
+            }
+
+            var builder = GetBuilder();
+            try
+            {
+                for (var i = 0; i < index; i++)
+                {
+                    builder.Add(this[i]);
+                }
+
+                builder.AddRange(trivia);
+
+                for (var i = index; i < thisCount; i++)
+                {
+                    builder.Add(this[i]);
+                }
+
+                return builder.Count == thisCount ? this : builder.ToList();
+            }
+            finally
+            {
+                ClearAndFreeBuilder(builder);
+            }
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="SyntaxTriviaList"/> with the element at the specified index removed.
+        /// </summary>
+        /// <param name="index">The index identifying the element to remove.</param>
+        public SyntaxTriviaList RemoveAt(int index)
+        {
+            if (index < 0 || index >= Count)
+            {
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+
+            var list = this.ToList();
+            list.RemoveAt(index);
+            return new SyntaxTriviaList(list);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="SyntaxTriviaList"/> with the specified element removed.
+        /// </summary>
+        /// <param name="triviaInList">The trivia element to remove.</param>
+        public SyntaxTriviaList Remove(SyntaxTrivia triviaInList)
+        {
+            var index = IndexOf(triviaInList);
+            if (index >= 0 && index < Count)
+            {
+                return RemoveAt(index);
+            }
+
+            return this;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="SyntaxTriviaList"/> with the specified element replaced with new trivia.
+        /// </summary>
+        /// <param name="triviaInList">The trivia element to replace.</param>
+        /// <param name="newTrivia">The trivia to replace the element with.</param>
+        public SyntaxTriviaList Replace(SyntaxTrivia triviaInList, SyntaxTrivia newTrivia)
+        {
+            if (newTrivia == default(SyntaxTrivia))
+            {
+                throw new ArgumentOutOfRangeException(nameof(newTrivia));
+            }
+
+            return ReplaceRange(triviaInList, new[] { newTrivia });
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="SyntaxTriviaList"/> with the specified element replaced with new trivia.
+        /// </summary>
+        /// <param name="triviaInList">The trivia element to replace.</param>
+        /// <param name="newTrivia">The trivia to replace the element with.</param>
+        public SyntaxTriviaList ReplaceRange(SyntaxTrivia triviaInList, IEnumerable<SyntaxTrivia> newTrivia)
+        {
+            var index = IndexOf(triviaInList);
+            if (index >= 0 && index < Count)
+            {
+                var list = this.ToList();
+                list.RemoveAt(index);
+                list.InsertRange(index, newTrivia);
+                return new SyntaxTriviaList(list);
+            }
+
+            throw new ArgumentOutOfRangeException(nameof(triviaInList));
+        }
+
+        // for debugging
+        private SyntaxTrivia[] Nodes => this.ToArray();
+
+        IEnumerator<SyntaxTrivia> IEnumerable<SyntaxTrivia>.GetEnumerator()
+        {
+            if (Node == null)
+            {
+                return SpecializedCollections.EmptyEnumerator<SyntaxTrivia>();
+            }
+
+            return new EnumeratorImpl(this);
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            if (Node == null)
+            {
+                return SpecializedCollections.EmptyEnumerator<SyntaxTrivia>();
+            }
+
+            return new EnumeratorImpl(this);
+        }
+
+        /// <summary>
+        /// get the green node at the specific slot
+        /// </summary>
+        private SyntaxNode GetNodeAt(int i)
+        {
+            return GetNodeAt(Node, i);
+        }
+
+        private static SyntaxNode GetNodeAt(SyntaxNode node, int i)
+        {
+            Debug.Assert(node.IsList || (i == 0 && !node.IsList));
+            return node.IsList ? node.GetNodeSlot(i) : node;
+        }
+
+        public bool Equals(SyntaxTriviaList other)
+        {
+            return Node == other.Node && Index == other.Index;
+        }
+
+        public static bool operator ==(SyntaxTriviaList left, SyntaxTriviaList right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(SyntaxTriviaList left, SyntaxTriviaList right)
+        {
+            return !left.Equals(right);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return (obj is SyntaxTriviaList) && Equals((SyntaxTriviaList)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            var hash = HashCodeCombiner.Start();
+            hash.Add(Node);
+            hash.Add(Index);
+            return hash.CombinedHash;
+        }
+
+        /// <summary>
+        /// Copy <paramref name="count"/> number of items starting at <paramref name="offset"/> from this list into <paramref name="array"/> starting at <paramref name="arrayOffset"/>.
+        /// </summary>
+        internal void CopyTo(int offset, SyntaxTrivia[] array, int arrayOffset, int count)
+        {
+            if (offset < 0 || count < 0 || Count < offset + count)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            if (count == 0)
+            {
+                return;
+            }
+
+            // get first one without creating any red node
+            var first = this[offset];
+            array[arrayOffset] = first;
+
+            // calculate trivia position from the first ourselves from now on
+            var position = first.Position;
+            var current = first;
+
+            for (var i = 1; i < count; i++)
+            {
+                position += current.FullWidth;
+                current = GetNodeAt(offset + i) as SyntaxTrivia;
+
+                array[arrayOffset + i] = current;
+            }
+        }
+
+        public override string ToString()
+        {
+            return Node != null ? Node.ToString() : string.Empty;
+        }
+
+        public string ToFullString()
+        {
+            return Node != null ? Node.ToFullString() : string.Empty;
+        }
+
+        public static SyntaxTriviaList Create(SyntaxTrivia trivia)
+        {
+            return new SyntaxTriviaList(trivia);
+        }
+
+        /// <summary>
+        /// Reversed enumerable.
+        /// </summary>
+        public struct Reversed : IEnumerable<SyntaxTrivia>, IEquatable<Reversed>
+        {
+            private SyntaxTriviaList _list;
+
+            public Reversed(in SyntaxTriviaList list)
+            {
+                _list = list;
+            }
+
+            public Enumerator GetEnumerator()
+            {
+                return new Enumerator(in _list);
+            }
+
+            IEnumerator<SyntaxTrivia> IEnumerable<SyntaxTrivia>.GetEnumerator()
+            {
+                if (_list.Count == 0)
+                {
+                    return SpecializedCollections.EmptyEnumerator<SyntaxTrivia>();
+                }
+
+                return new ReversedEnumeratorImpl(in _list);
+            }
+
+            IEnumerator
+                IEnumerable.GetEnumerator()
+            {
+                if (_list.Count == 0)
+                {
+                    return SpecializedCollections.EmptyEnumerator<SyntaxTrivia>();
+                }
+
+                return new ReversedEnumeratorImpl(in _list);
+            }
+
+            public override int GetHashCode()
+            {
+                return _list.GetHashCode();
+            }
+
+            public override bool Equals(object obj)
+            {
+                return obj is Reversed && Equals((Reversed)obj);
+            }
+
+            public bool Equals(Reversed other)
+            {
+                return _list.Equals(other._list);
+            }
+
+            [StructLayout(LayoutKind.Auto)]
+            public struct Enumerator
+            {
+                private readonly SyntaxNode _singleNodeOrList;
+                private readonly int _baseIndex;
+                private readonly int _count;
+
+                private int _index;
+                private SyntaxNode _current;
+                private int _position;
+
+                public Enumerator(in SyntaxTriviaList list)
+                    : this()
+                {
+                    if (list.Any())
+                    {
+                        _singleNodeOrList = list.Node;
+                        _baseIndex = list.Index;
+                        _count = list.Count;
+
+                        _index = _count;
+                        _current = null;
+
+                        var last = list.Last();
+                        _position = last.Position + last.FullWidth;
+                    }
+                }
+
+                public bool MoveNext()
+                {
+                    if (_count == 0 || _index <= 0)
+                    {
+                        _current = null;
+                        return false;
+                    }
+
+                    _index--;
+
+                    _current = GetNodeAt(_singleNodeOrList, _index);
+                    _position -= _current.FullWidth;
+
+                    return true;
+                }
+
+                public SyntaxTrivia Current
+                {
+                    get
+                    {
+                        if (_current == null)
+                        {
+                            throw new InvalidOperationException();
+                        }
+
+                        return (SyntaxTrivia)_current;
+                    }
+                }
+            }
+
+            private class ReversedEnumeratorImpl : IEnumerator<SyntaxTrivia>
+            {
+                private Enumerator _enumerator;
+
+                // SyntaxTriviaList is a relatively big struct so is passed as ref
+                internal ReversedEnumeratorImpl(in SyntaxTriviaList list)
+                {
+                    _enumerator = new Enumerator(in list);
+                }
+
+                public SyntaxTrivia Current => _enumerator.Current;
+
+                object IEnumerator.Current => _enumerator.Current;
+
+                public bool MoveNext()
+                {
+                    return _enumerator.MoveNext();
+                }
+
+                public void Reset()
+                {
+                    throw new NotSupportedException();
+                }
+
+                public void Dispose()
+                {
+                }
+            }
+        }
+
+        [StructLayout(LayoutKind.Auto)]
+        public struct Enumerator
+        {
+            private SyntaxNode _singleNodeOrList;
+            private int _baseIndex;
+            private int _count;
+
+            private int _index;
+            private SyntaxNode _current;
+            private int _position;
+
+            internal Enumerator(in SyntaxTriviaList list)
+            {
+                _singleNodeOrList = list.Node;
+                _baseIndex = list.Index;
+                _count = list.Count;
+
+                _index = -1;
+                _current = null;
+                _position = list.Position;
+            }
+
+            private void InitializeFrom(SyntaxNode node, int index, int position)
+            {
+                _singleNodeOrList = node;
+                _baseIndex = index;
+                _count = node.IsList ? node.SlotCount : 1;
+
+                _index = -1;
+                _current = null;
+                _position = position;
+            }
+
+            // PERF: Used to initialize an enumerator for leading trivia directly from a token.
+            // This saves constructing an intermediate SyntaxTriviaList. Also, passing token
+            // by ref since it's a non-trivial struct
+            internal void InitializeFromLeadingTrivia(in SyntaxToken token)
+            {
+                InitializeFrom(token.GetLeadingTrivia().Node, 0, token.Position);
+            }
+
+            // PERF: Used to initialize an enumerator for trailing trivia directly from a token.
+            // This saves constructing an intermediate SyntaxTriviaList. Also, passing token
+            // by ref since it's a non-trivial struct
+            internal void InitializeFromTrailingTrivia(in SyntaxToken token)
+            {
+                var leading = token.GetLeadingTrivia().Node;
+                var index = 0;
+                if (leading != null)
+                {
+                    index = leading.IsList ? leading.SlotCount : 1;
+                }
+
+                var trailing = token.GetTrailingTrivia().Node;
+                var trailingPosition = token.Position + token.FullWidth;
+                if (trailing != null)
+                {
+                    trailingPosition -= trailing.FullWidth;
+                }
+
+                InitializeFrom(trailing, index, trailingPosition);
+            }
+
+            public bool MoveNext()
+            {
+                var newIndex = _index + 1;
+                if (newIndex >= _count)
+                {
+                    // invalidate iterator
+                    _current = null;
+                    return false;
+                }
+
+                _index = newIndex;
+
+                if (_current != null)
+                {
+                    _position += _current.FullWidth;
+                }
+
+                _current = GetNodeAt(_singleNodeOrList, newIndex);
+                return true;
+            }
+
+            public SyntaxTrivia Current
+            {
+                get
+                {
+                    if (_current == null)
+                    {
+                        throw new InvalidOperationException();
+                    }
+
+                    return _current as SyntaxTrivia;
+                }
+            }
+
+            internal bool TryMoveNextAndGetCurrent(out SyntaxTrivia current)
+            {
+                if (!MoveNext())
+                {
+                    current = default;
+                    return false;
+                }
+
+                current = _current as SyntaxTrivia;
+                return true;
+            }
+        }
+
+        private class EnumeratorImpl : IEnumerator<SyntaxTrivia>
+        {
+            private Enumerator _enumerator;
+
+            // SyntaxTriviaList is a relatively big struct so is passed as ref
+            internal EnumeratorImpl(in SyntaxTriviaList list)
+            {
+                _enumerator = new Enumerator(list);
+            }
+
+            public SyntaxTrivia Current => _enumerator.Current;
+
+            object IEnumerator.Current => _enumerator.Current;
+
+            public bool MoveNext()
+            {
+                return _enumerator.MoveNext();
+            }
+
+            public void Reset()
+            {
+                throw new NotSupportedException();
+            }
+
+            public void Dispose()
+            {
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxTriviaListBuilder.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxTriviaListBuilder.cs
new file mode 100644
index 0000000000..aa0a8caaec
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxTriviaListBuilder.cs
@@ -0,0 +1,138 @@
+// 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;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal class SyntaxTriviaListBuilder
+    {
+        private SyntaxTrivia[] _nodes;
+
+        public SyntaxTriviaListBuilder(int size)
+        {
+            _nodes = new SyntaxTrivia[size];
+        }
+
+        public static SyntaxTriviaListBuilder Create()
+        {
+            return new SyntaxTriviaListBuilder(4);
+        }
+
+        public static SyntaxTriviaList Create(IEnumerable<SyntaxTrivia> trivia)
+        {
+            if (trivia == null)
+            {
+                return new SyntaxTriviaList();
+            }
+
+            var builder = Create();
+            builder.AddRange(trivia);
+            return builder.ToList();
+        }
+
+        public int Count { get; private set; }
+
+        public void Clear()
+        {
+            Count = 0;
+        }
+
+        public SyntaxTrivia this[int index]
+        {
+            get
+            {
+                if (index < 0 || index > Count)
+                {
+                    throw new IndexOutOfRangeException();
+                }
+
+                return _nodes[index];
+            }
+        }
+
+        public void AddRange(IEnumerable<SyntaxTrivia> items)
+        {
+            if (items != null)
+            {
+                foreach (var item in items)
+                {
+                    Add(item);
+                }
+            }
+        }
+
+        public SyntaxTriviaListBuilder Add(SyntaxTrivia item)
+        {
+            if (_nodes == null || Count >= _nodes.Length)
+            {
+                Grow(Count == 0 ? 8 : _nodes.Length * 2);
+            }
+
+            _nodes[Count++] = item;
+            return this;
+        }
+
+        public void Add(SyntaxTrivia[] items)
+        {
+            Add(items, 0, items.Length);
+        }
+
+        public void Add(SyntaxTrivia[] items, int offset, int length)
+        {
+            if (_nodes == null || Count + length > _nodes.Length)
+            {
+                Grow(Count + length);
+            }
+
+            Array.Copy(items, offset, _nodes, Count, length);
+            Count += length;
+        }
+
+        public void Add(in SyntaxTriviaList list)
+        {
+            Add(list, 0, list.Count);
+        }
+
+        public void Add(in SyntaxTriviaList list, int offset, int length)
+        {
+            if (_nodes == null || Count + length > _nodes.Length)
+            {
+                Grow(Count + length);
+            }
+
+            list.CopyTo(offset, _nodes, Count, length);
+            Count += length;
+        }
+
+        private void Grow(int size)
+        {
+            var tmp = new SyntaxTrivia[size];
+            Array.Copy(_nodes, tmp, _nodes.Length);
+            _nodes = tmp;
+        }
+
+        public static implicit operator SyntaxTriviaList(SyntaxTriviaListBuilder builder)
+        {
+            return builder.ToList();
+        }
+
+        public SyntaxTriviaList ToList()
+        {
+            if (Count > 0)
+            {
+                var tmp = new ArrayElement<GreenNode>[Count];
+                for (var i = 0; i < Count; i++)
+                {
+                    tmp[i].Value = _nodes[i].Green;
+                }
+                return new SyntaxTriviaList(InternalSyntax.SyntaxList.List(tmp).CreateRed(), position: 0, index: 0);
+            }
+            else
+            {
+                return default(SyntaxTriviaList);
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxVisitor.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxVisitor.cs
new file mode 100644
index 0000000000..2ff23683f6
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxVisitor.cs
@@ -0,0 +1,70 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    /// <summary>
+    /// Represents a <see cref="SyntaxNode"/> visitor that visits only the single SyntaxNode
+    /// passed into its Visit method and produces 
+    /// a value of the type specified by the <typeparamref name="TResult"/> parameter.
+    /// </summary>
+    /// <typeparam name="TResult">
+    /// The type of the return value this visitor's Visit method.
+    /// </typeparam>
+    internal abstract partial class SyntaxVisitor<TResult>
+    {
+        public virtual TResult Visit(SyntaxNode node)
+        {
+            if (node != null)
+            {
+                return node.Accept(this);
+            }
+
+            return default(TResult);
+        }
+
+        public virtual TResult VisitToken(SyntaxToken token)
+        {
+            return DefaultVisit(token);
+        }
+
+        public virtual TResult VisitTrivia(SyntaxTrivia trivia)
+        {
+            return DefaultVisit(trivia);
+        }
+
+        protected virtual TResult DefaultVisit(SyntaxNode node)
+        {
+            return default(TResult);
+        }
+    }
+
+    /// <summary>
+    /// Represents a <see cref="SyntaxNode"/> visitor that visits only the single SyntaxNode
+    /// passed into its Visit method.
+    /// </summary>
+    internal abstract partial class SyntaxVisitor
+    {
+        public virtual void Visit(SyntaxNode node)
+        {
+            if (node != null)
+            {
+                node.Accept(this);
+            }
+        }
+
+        public virtual void VisitToken(SyntaxToken token)
+        {
+            DefaultVisit(token);
+        }
+
+        public virtual void VisitTrivia(SyntaxTrivia trivia)
+        {
+            DefaultVisit(trivia);
+        }
+
+        public virtual void DefaultVisit(SyntaxNode node)
+        {
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxWalker.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxWalker.cs
new file mode 100644
index 0000000000..214a0039fe
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxWalker.cs
@@ -0,0 +1,55 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    /// <summary>
+    /// Represents a <see cref="SyntaxVisitor"/> that descends an entire <see cref="SyntaxNode"/> graph
+    /// visiting each SyntaxNode and its child SyntaxNodes and <see cref="SyntaxToken"/>s in depth-first order.
+    /// </summary>
+    internal abstract class SyntaxWalker : SyntaxVisitor
+    {
+        public override void Visit(SyntaxNode node)
+        {
+            node?.Accept(this);
+        }
+
+        public override void DefaultVisit(SyntaxNode node)
+        {
+            var children = node.ChildNodes();
+            for (var i = 0; i < children.Count; i++)
+            {
+                var child = children[i];
+                Visit(child);
+            }
+        }
+
+        public override void VisitToken(SyntaxToken token)
+        {
+            VisitLeadingTrivia(token);
+            VisitTrailingTrivia(token);
+        }
+
+        public virtual void VisitLeadingTrivia(SyntaxToken token)
+        {
+            if (token.HasLeadingTrivia)
+            {
+                foreach (var trivia in token.GetLeadingTrivia())
+                {
+                    VisitTrivia(trivia);
+                }
+            }
+        }
+
+        public virtual void VisitTrailingTrivia(SyntaxToken token)
+        {
+            if (token.HasTrailingTrivia)
+            {
+                foreach (var trivia in token.GetTrailingTrivia())
+                {
+                    VisitTrivia(trivia);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/TextSpan.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/TextSpan.cs
new file mode 100644
index 0000000000..e80562b01b
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/Syntax/TextSpan.cs
@@ -0,0 +1,261 @@
+// 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;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    /// <summary>
+    /// Immutable abstract representation of a span of text.  For example, in an error diagnostic that reports a
+    /// location, it could come from a parsed string, text from a tool editor buffer, etc.
+    /// </summary>
+    internal readonly struct TextSpan : IEquatable<TextSpan>, IComparable<TextSpan>
+    {
+        /// <summary>
+        /// Creates a TextSpan instance beginning with the position Start and having the Length
+        /// specified with <paramref name="length" />.
+        /// </summary>
+        public TextSpan(int start, int length)
+        {
+            if (start < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(start));
+            }
+
+            if (start + length < start)
+            {
+                throw new ArgumentOutOfRangeException(nameof(length));
+            }
+
+            Start = start;
+            Length = length;
+        }
+
+        /// <summary>
+        /// Start point of the span.
+        /// </summary>
+        public int Start { get; }
+
+        /// <summary>
+        /// End of the span.
+        /// </summary>
+        public int End => Start + Length;
+
+        /// <summary>
+        /// Length of the span.
+        /// </summary>
+        public int Length { get; }
+
+        /// <summary>
+        /// Determines whether or not the span is empty.
+        /// </summary>
+        public bool IsEmpty => Length == 0;
+
+        /// <summary>
+        /// Determines whether the position lies within the span.
+        /// </summary>
+        /// <param name="position">
+        /// The position to check.
+        /// </param>
+        /// <returns>
+        /// <c>true</c> if the position is greater than or equal to Start and strictly less
+        /// than End, otherwise <c>false</c>.
+        /// </returns>
+        public bool Contains(int position)
+        {
+            return unchecked((uint)(position - Start) < (uint)Length);
+        }
+
+        /// <summary>
+        /// Determines whether <paramref name="span"/> falls completely within this span.
+        /// </summary>
+        /// <param name="span">
+        /// The span to check.
+        /// </param>
+        /// <returns>
+        /// <c>true</c> if the specified span falls completely within this span, otherwise <c>false</c>.
+        /// </returns>
+        public bool Contains(TextSpan span)
+        {
+            return span.Start >= Start && span.End <= End;
+        }
+
+        /// <summary>
+        /// Determines whether <paramref name="span"/> overlaps this span. Two spans are considered to overlap
+        /// if they have positions in common and neither is empty. Empty spans do not overlap with any
+        /// other span.
+        /// </summary>
+        /// <param name="span">
+        /// The span to check.
+        /// </param>
+        /// <returns>
+        /// <c>true</c> if the spans overlap, otherwise <c>false</c>.
+        /// </returns>
+        public bool OverlapsWith(TextSpan span)
+        {
+            var overlapStart = Math.Max(Start, span.Start);
+            var overlapEnd = Math.Min(End, span.End);
+
+            return overlapStart < overlapEnd;
+        }
+
+        /// <summary>
+        /// Returns the overlap with the given span, or null if there is no overlap.
+        /// </summary>
+        /// <param name="span">
+        /// The span to check.
+        /// </param>
+        /// <returns>
+        /// The overlap of the spans, or null if the overlap is empty.
+        /// </returns>
+        public TextSpan? Overlap(TextSpan span)
+        {
+            var overlapStart = Math.Max(Start, span.Start);
+            var overlapEnd = Math.Min(End, span.End);
+
+            return overlapStart < overlapEnd
+                ? FromBounds(overlapStart, overlapEnd)
+                : (TextSpan?)null;
+        }
+
+        /// <summary>
+        /// Determines whether <paramref name="span"/> intersects this span. Two spans are considered to
+        /// intersect if they have positions in common or the end of one span
+        /// coincides with the start of the other span.
+        /// </summary>
+        /// <param name="span">
+        /// The span to check.
+        /// </param>
+        /// <returns>
+        /// <c>true</c> if the spans intersect, otherwise <c>false</c>.
+        /// </returns>
+        public bool IntersectsWith(TextSpan span)
+        {
+            return span.Start <= End && span.End >= Start;
+        }
+
+        /// <summary>
+        /// Determines whether <paramref name="position"/> intersects this span.
+        /// A position is considered to intersect if it is between the start and
+        /// end positions (inclusive) of this span.
+        /// </summary>
+        /// <param name="position">
+        /// The position to check.
+        /// </param>
+        /// <returns>
+        /// <c>true</c> if the position intersects, otherwise <c>false</c>.
+        /// </returns>
+        public bool IntersectsWith(int position)
+        {
+            return unchecked((uint)(position - Start) <= (uint)Length);
+        }
+
+        /// <summary>
+        /// Returns the intersection with the given span, or null if there is no intersection.
+        /// </summary>
+        /// <param name="span">
+        /// The span to check.
+        /// </param>
+        /// <returns>
+        /// The intersection of the spans, or null if the intersection is empty.
+        /// </returns>
+        public TextSpan? Intersection(TextSpan span)
+        {
+            var intersectStart = Math.Max(Start, span.Start);
+            var intersectEnd = Math.Min(End, span.End);
+
+            return intersectStart <= intersectEnd
+                ? FromBounds(intersectStart, intersectEnd)
+                : (TextSpan?)null;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="TextSpan"/> from <paramref name="start" /> and <paramref
+        /// name="end"/> positions as opposed to a position and length.
+        ///
+        /// The returned TextSpan contains the range with <paramref name="start"/> inclusive,
+        /// and <paramref name="end"/> exclusive.
+        /// </summary>
+        public static TextSpan FromBounds(int start, int end)
+        {
+            if (start < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(start), "start must not be negative");
+            }
+
+            if (end < start)
+            {
+                throw new ArgumentOutOfRangeException(nameof(end), "end must not be less than start");
+            }
+
+            return new TextSpan(start, end - start);
+        }
+
+        /// <summary>
+        /// Determines if two instances of <see cref="TextSpan"/> are the same.
+        /// </summary>
+        public static bool operator ==(TextSpan left, TextSpan right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Determines if two instances of <see cref="TextSpan"/> are different.
+        /// </summary>
+        public static bool operator !=(TextSpan left, TextSpan right)
+        {
+            return !left.Equals(right);
+        }
+
+        /// <summary>
+        /// Determines if current instance of <see cref="TextSpan"/> is equal to another.
+        /// </summary>
+        public bool Equals(TextSpan other)
+        {
+            return Start == other.Start && Length == other.Length;
+        }
+
+        /// <summary>
+        /// Determines if current instance of <see cref="TextSpan"/> is equal to another.
+        /// </summary>
+        public override bool Equals(object obj)
+        {
+            return obj is TextSpan && Equals((TextSpan)obj);
+        }
+
+        /// <summary>
+        /// Produces a hash code for <see cref="TextSpan"/>.
+        /// </summary>
+        public override int GetHashCode()
+        {
+            var combiner = new HashCodeCombiner();
+            combiner.Add(Start);
+            combiner.Add(Length);
+
+            return combiner.CombinedHash;
+        }
+
+        /// <summary>
+        /// Provides a string representation for <see cref="TextSpan"/>.
+        /// </summary>
+        public override string ToString()
+        {
+            return $"[{Start}..{End})";
+        }
+
+        /// <summary>
+        /// Compares current instance of <see cref="TextSpan"/> with another.
+        /// </summary>
+        public int CompareTo(TextSpan other)
+        {
+            var diff = Start - other.Start;
+            if (diff != 0)
+            {
+                return diff;
+            }
+
+            return Length - other.Length;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperAttributeInfo.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperAttributeInfo.cs
new file mode 100644
index 0000000000..a3f15f1708
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperAttributeInfo.cs
@@ -0,0 +1,24 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class TagHelperAttributeInfo
+    {
+        public TagHelperAttributeInfo(
+            string name,
+            AttributeStructure attributeStructure,
+            bool bound)
+        {
+            Name = name;
+            AttributeStructure = attributeStructure;
+            Bound = bound;
+        }
+
+        public string Name { get; }
+
+        public AttributeStructure AttributeStructure { get; }
+
+        public bool Bound { get; }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperConventions.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperConventions.cs
index 6e33901d0e..60618a61f4 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperConventions.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperConventions.cs
@@ -6,5 +6,7 @@ namespace Microsoft.AspNetCore.Razor.Language
     public static class TagHelperConventions
     {
         public static readonly string DefaultKind = "ITagHelper";
+
+        public static readonly string ComponentKind = "IComponent";
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperInfo.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperInfo.cs
new file mode 100644
index 0000000000..3cc665b4fd
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperInfo.cs
@@ -0,0 +1,24 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class TagHelperInfo
+    {
+        public TagHelperInfo(
+            string tagName,
+            TagMode tagMode,
+            TagHelperBinding bindingResult)
+        {
+            TagName = tagName;
+            TagMode = tagMode;
+            BindingResult = bindingResult;
+        }
+
+        public string TagName { get; }
+
+        public TagMode TagMode { get; }
+
+        public TagHelperBinding BindingResult { get; }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperSpanVisitor.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperSpanVisitor.cs
new file mode 100644
index 0000000000..836a45ae98
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/TagHelperSpanVisitor.cs
@@ -0,0 +1,31 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    internal class TagHelperSpanVisitor : SyntaxWalker
+    {
+        private RazorSourceDocument _source;
+        private List<TagHelperSpanInternal> _spans;
+
+        public TagHelperSpanVisitor(RazorSourceDocument source)
+        {
+            _source = source;
+            _spans = new List<TagHelperSpanInternal>();
+        }
+
+        public IReadOnlyList<TagHelperSpanInternal> TagHelperSpans => _spans;
+
+        public override void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)
+        {
+            var span = new TagHelperSpanInternal(node.GetSourceSpan(_source), node.TagHelperInfo.BindingResult);
+            _spans.Add(span);
+
+            base.VisitMarkupTagHelperElement(node);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Client.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Client.cs
index 9378906d45..cf94173337 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Client.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Client.cs
@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using System.IO.Pipes;
-#if NET46
+#if NETFRAMEWORK
 using System.Security.AccessControl;
 using System.Security.Principal;
 #endif
@@ -71,7 +71,7 @@ namespace Microsoft.AspNetCore.Razor.Tools
                 ServerLogger.Log("Named pipe '{0}' connected", pipeName);
                 cancellationToken.ThrowIfCancellationRequested();
 
-#if NET46
+#if NETFRAMEWORK
                 // Verify that we own the pipe.
                 if (!CheckPipeConnectionOwnership(stream))
                 {
@@ -89,7 +89,7 @@ namespace Microsoft.AspNetCore.Razor.Tools
             }
         }
 
-#if NET46
+#if NETFRAMEWORK
         /// <summary>
         /// Check to ensure that the named pipe server we connected to is owned by the same
         /// user.
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/DiscoverCommand.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/DiscoverCommand.cs
index e699e24532..3ba5eb5ab5 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/DiscoverCommand.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/DiscoverCommand.cs
@@ -141,6 +141,7 @@ namespace Microsoft.AspNetCore.Razor.Tools
                 b.Features.Add(new DefaultMetadataReferenceFeature() { References = metadataReferences });
                 b.Features.Add(new CompilationTagHelperFeature());
                 b.Features.Add(new DefaultTagHelperDescriptorProvider());
+                b.Features.Add(new ComponentTagHelperDescriptorProvider());
             });
 
             var feature = engine.Engine.Features.OfType<ITagHelperFeature>().Single();
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/GenerateCommand.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/GenerateCommand.cs
index a1089e4150..338c496033 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/GenerateCommand.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/GenerateCommand.cs
@@ -5,8 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Microsoft.Extensions.CommandLineUtils;
 using Microsoft.VisualStudio.LanguageServices.Razor.Serialization;
 using Newtonsoft.Json;
@@ -21,12 +23,14 @@ namespace Microsoft.AspNetCore.Razor.Tools
             Sources = Option("-s", ".cshtml files to compile", CommandOptionType.MultipleValue);
             Outputs = Option("-o", "Generated output file path", CommandOptionType.MultipleValue);
             RelativePaths = Option("-r", "Relative path", CommandOptionType.MultipleValue);
+            DocumentKinds = Option("-k", "Document kind", CommandOptionType.MultipleValue);
             ProjectDirectory = Option("-p", "project root directory", CommandOptionType.SingleValue);
             TagHelperManifest = Option("-t", "tag helper manifest file", CommandOptionType.SingleValue);
             Version = Option("-v|--version", "Razor language version", CommandOptionType.SingleValue);
             Configuration = Option("-c", "Razor configuration name", CommandOptionType.SingleValue);
             ExtensionNames = Option("-n", "extension name", CommandOptionType.MultipleValue);
             ExtensionFilePaths = Option("-e", "extension file path", CommandOptionType.MultipleValue);
+            GenerateDeclaration = Option("--generate-declaration", "Generate declaration", CommandOptionType.NoValue);
         }
 
         public CommandOption Sources { get; }
@@ -35,6 +39,8 @@ namespace Microsoft.AspNetCore.Razor.Tools
 
         public CommandOption RelativePaths { get; }
 
+        public CommandOption DocumentKinds { get; }
+
         public CommandOption ProjectDirectory { get; }
 
         public CommandOption TagHelperManifest { get; }
@@ -47,6 +53,8 @@ namespace Microsoft.AspNetCore.Razor.Tools
 
         public CommandOption ExtensionFilePaths { get; }
 
+        public CommandOption GenerateDeclaration { get; }
+
         protected override Task<int> ExecuteCoreAsync()
         {
             if (!Parent.Checker.Check(ExtensionFilePaths.Values))
@@ -66,13 +74,13 @@ namespace Microsoft.AspNetCore.Razor.Tools
             var version = RazorLanguageVersion.Parse(Version.Value());
             var configuration = RazorConfiguration.Create(version, Configuration.Value(), extensions);
 
+            var sourceItems = GetSourceItems(ProjectDirectory.Value(), Sources.Values, Outputs.Values, RelativePaths.Values, DocumentKinds.Values);
+
             var result = ExecuteCore(
                 configuration: configuration,
                 projectDirectory: ProjectDirectory.Value(),
                 tagHelperManifest: TagHelperManifest.Value(),
-                sources: Sources.Values,
-                outputs: Outputs.Values,
-                relativePaths: RelativePaths.Values);
+                sourceItems: sourceItems);
 
             return Task.FromResult(result);
         }
@@ -88,11 +96,21 @@ namespace Microsoft.AspNetCore.Razor.Tools
             if (Outputs.Values.Count != Sources.Values.Count)
             {
                 Error.WriteLine($"{Sources.Description} has {Sources.Values.Count}, but {Outputs.Description} has {Outputs.Values.Count} values.");
+                return false;
             }
 
             if (RelativePaths.Values.Count != Sources.Values.Count)
             {
                 Error.WriteLine($"{Sources.Description} has {Sources.Values.Count}, but {RelativePaths.Description} has {RelativePaths.Values.Count} values.");
+                return false;
+            }
+
+            if (DocumentKinds.Values.Count != 0 && DocumentKinds.Values.Count != Sources.Values.Count)
+            {
+                // 2.x tasks do not specify DocumentKinds - in which case, no values will be present. If a kind for one document is specified, we expect as many kind entries
+                // as sources.
+                Error.WriteLine($"{Sources.Description} has {Sources.Values.Count}, but {DocumentKinds.Description} has {DocumentKinds.Values.Count} values.");
+                return false;
             }
 
             if (string.IsNullOrEmpty(ProjectDirectory.Value()))
@@ -138,26 +156,30 @@ namespace Microsoft.AspNetCore.Razor.Tools
             RazorConfiguration configuration,
             string projectDirectory,
             string tagHelperManifest,
-            List<string> sources,
-            List<string> outputs,
-            List<string> relativePaths)
+            SourceItem[] sourceItems)
         {
             tagHelperManifest = Path.Combine(projectDirectory, tagHelperManifest);
 
             var tagHelpers = GetTagHelpers(tagHelperManifest);
-            var inputItems = GetInputItems(projectDirectory, sources, outputs, relativePaths);
+
             var compositeFileSystem = new CompositeRazorProjectFileSystem(new[]
             {
-                GetVirtualRazorProjectSystem(inputItems),
+                GetVirtualRazorProjectSystem(sourceItems),
                 RazorProjectFileSystem.Create(projectDirectory),
             });
 
             var engine = RazorProjectEngine.Create(configuration, compositeFileSystem, b =>
             {
                 b.Features.Add(new StaticTagHelperFeature() { TagHelpers = tagHelpers, });
+                b.Features.Add(new InputDocumentKindClassifierPass(sourceItems));
+
+                if (GenerateDeclaration.HasValue())
+                {
+                    b.Features.Add(new SetSuppressPrimaryMethodBodyOptionFeature());
+                }
             });
 
-            var results = GenerateCode(engine, inputItems);
+            var results = GenerateCode(engine, sourceItems);
 
             var success = true;
 
@@ -229,13 +251,15 @@ namespace Microsoft.AspNetCore.Razor.Tools
             }
         }
 
-        private SourceItem[] GetInputItems(string projectDirectory, List<string> sources, List<string> outputs, List<string> relativePath)
+        private SourceItem[] GetSourceItems(string projectDirectory, List<string> sources, List<string> outputs, List<string> relativePath, List<string> documentKinds)
         {
             var items = new SourceItem[sources.Count];
             for (var i = 0; i < items.Length; i++)
             {
                 var outputPath = Path.Combine(projectDirectory, outputs[i]);
-                items[i] = new SourceItem(sources[i], outputs[i], relativePath[i]);
+                var documentKind = documentKinds.Count > 0 ? documentKinds[i] : "mvc";
+
+                items[i] = new SourceItem(sources[i], outputs[i], relativePath[i], documentKind);
             }
 
             return items;
@@ -271,9 +295,9 @@ namespace Microsoft.AspNetCore.Razor.Tools
             public RazorCSharpDocument CSharpDocument { get; }
         }
 
-        private struct SourceItem
+        private readonly struct SourceItem
         {
-            public SourceItem(string sourcePath, string outputPath, string physicalRelativePath)
+            public SourceItem(string sourcePath, string outputPath, string physicalRelativePath, string documentKind)
             {
                 SourcePath = sourcePath;
                 OutputPath = outputPath;
@@ -281,6 +305,7 @@ namespace Microsoft.AspNetCore.Razor.Tools
                 FilePath = '/' + physicalRelativePath
                     .Replace(Path.DirectorySeparatorChar, '/')
                     .Replace("//", "/");
+                DocumentKind = documentKind;
             }
 
             public string SourcePath { get; }
@@ -290,6 +315,8 @@ namespace Microsoft.AspNetCore.Razor.Tools
             public string RelativePhysicalPath { get; }
 
             public string FilePath { get; }
+
+            public string DocumentKind { get; }
         }
 
         private class StaticTagHelperFeature : ITagHelperFeature
@@ -300,5 +327,46 @@ namespace Microsoft.AspNetCore.Razor.Tools
 
             public IReadOnlyList<TagHelperDescriptor> GetDescriptors() => TagHelpers;
         }
+
+        private class SetSuppressPrimaryMethodBodyOptionFeature : RazorEngineFeatureBase, IConfigureRazorCodeGenerationOptionsFeature
+        {
+            public int Order { get; set; }
+
+            public void Configure(RazorCodeGenerationOptionsBuilder options)
+            {
+                if (options == null)
+                {
+                    throw new ArgumentNullException(nameof(options));
+                }
+
+                options.SuppressPrimaryMethodBody = true;
+            }
+        }
+
+        private class InputDocumentKindClassifierPass : RazorEngineFeatureBase, IRazorDocumentClassifierPass
+        {
+            public InputDocumentKindClassifierPass(SourceItem[] sourceItems)
+            {
+                DocumentKinds = new Dictionary<string, string>(sourceItems.Length, StringComparer.OrdinalIgnoreCase);
+                for (var i = 0; i < sourceItems.Length; i++)
+                {
+                    var item = sourceItems[i];
+                    DocumentKinds[item.SourcePath] = item.DocumentKind;
+                }
+            }
+
+            // Run before other document classifiers
+            public int Order => -1000;
+
+            public Dictionary<string, string> DocumentKinds { get; }
+
+            public void Execute(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+            {
+                if (DocumentKinds.TryGetValue(codeDocument.Source.FilePath, out var kind))
+                {
+                    codeDocument.SetInputDocumentKind(kind);
+                }
+            }
+        }
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Microsoft.AspNetCore.Razor.Tools.csproj b/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Microsoft.AspNetCore.Razor.Tools.csproj
index e67f36e02f..a3ab14c41f 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Microsoft.AspNetCore.Razor.Tools.csproj
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Microsoft.AspNetCore.Razor.Tools.csproj
@@ -1,15 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Razor is a markup syntax for adding server-side logic to web pages. This assembly contains infrastructure supporting Razor MSBuild integration.</Description>
 
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <AssemblyName>rzc</AssemblyName>
 
-    <!-- This is not a package, it is part of Microsoft.AspNetCore.Razor.Design. -->
+    <!-- This is not a package, it is part of Razor SDK. -->
     <IsPackable>false</IsPackable>
     <EnableApiCheck>false</EnableApiCheck>
+
+    <!-- Don't produce rzc.exe -->
+    <UseAppHost>false</UseAppHost>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Program.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Program.cs
index 8d9c5518c5..3cd93a2335 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Program.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Program.cs
@@ -40,6 +40,9 @@ namespace Microsoft.AspNetCore.Razor.Tools
             outputWriter.Dispose();
             errorWriter.Dispose();
 
+            Console.Write(output);
+            Console.Error.Write(error);
+
             // This will no-op if server logging is not enabled.
             ServerLogger.Log(output);
             ServerLogger.Log(error);
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Properties/AssemblyInfo.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Properties/AssemblyInfo.cs
index 91b536e78b..3770a8065e 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Properties/AssemblyInfo.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/Properties/AssemblyInfo.cs
@@ -4,6 +4,6 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Tools.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Design.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.NET.Sdk.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
 
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/RequestArgument.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/RequestArgument.cs
index fd15c40686..96e9ae0312 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/RequestArgument.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Tools/ServerProtocol/RequestArgument.cs
@@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Razor.Tools
     /// Strings are encoded via a length prefix as a signed
     /// 32-bit integer, followed by an array of characters.
     /// </summary>
-    internal struct RequestArgument
+    internal readonly struct RequestArgument
     {
         public readonly ArgumentId Id;
         public readonly int ArgumentIndex;
@@ -63,5 +63,10 @@ namespace Microsoft.AspNetCore.Razor.Tools
             // The directory to use for temporary operations.
             TempDirectory,
         }
+
+        public override string ToString()
+        {
+            return $"{Id} {Value}";
+        }
     }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultDocumentServiceProviderFactory.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultDocumentServiceProviderFactory.cs
new file mode 100644
index 0000000000..ceebd2813f
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultDocumentServiceProviderFactory.cs
@@ -0,0 +1,29 @@
+// 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;
+using System.Composition;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    [Export(typeof(DocumentServiceProviderFactory))]
+    internal class DefaultDocumentServiceProviderFactory : DocumentServiceProviderFactory
+    {
+        public override IDocumentServiceProvider Create(DocumentSnapshot document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            return new RazorDocumentServiceProvider(document);
+        }
+
+        public override IDocumentServiceProvider CreateEmpty()
+        {
+            return new RazorDocumentServiceProvider();
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultProjectSnapshotProjectEngineFactory.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultProjectSnapshotProjectEngineFactory.cs
index cd9ac1ee51..8651a9ced6 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultProjectSnapshotProjectEngineFactory.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultProjectSnapshotProjectEngineFactory.cs
@@ -32,13 +32,8 @@ namespace Microsoft.CodeAnalysis.Razor
             _factories = factories;
         }
 
-        public override RazorProjectEngine Create(ProjectSnapshot project, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure)
+        public override RazorProjectEngine Create(RazorConfiguration configuration, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure)
         {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
             if (fileSystem == null)
             {
                 throw new ArgumentNullException(nameof(fileSystem));
@@ -55,7 +50,7 @@ namespace Microsoft.CodeAnalysis.Razor
             //
             // We typically want this because the language adds features over time - we don't want to a bunch of errors
             // to show up when a document is first opened, and then go away when the configuration loads, we'd prefer the opposite.
-            var configuration = project.Configuration ?? DefaultConfiguration;
+            configuration = configuration ?? DefaultConfiguration;
 
             // If there's no factory to handle the configuration then fall back to a very basic configuration.
             //
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultRazorCompletionFactsService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultRazorCompletionFactsService.cs
new file mode 100644
index 0000000000..5d0c542e5f
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultRazorCompletionFactsService.cs
@@ -0,0 +1,92 @@
+// 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.Collections.Generic;
+using System.Composition;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    [Shared]
+    [Export(typeof(RazorCompletionFactsService))]
+    internal class DefaultRazorCompletionFactsService : RazorCompletionFactsService
+    {
+        private static readonly IEnumerable<DirectiveDescriptor> DefaultDirectives = new[]
+        {
+            CSharpCodeParser.AddTagHelperDirectiveDescriptor,
+            CSharpCodeParser.RemoveTagHelperDirectiveDescriptor,
+            CSharpCodeParser.TagHelperPrefixDirectiveDescriptor,
+        };
+
+        public override IReadOnlyList<RazorCompletionItem> GetCompletionItems(RazorSyntaxTree syntaxTree, SourceSpan location)
+        {
+            var completionItems = new List<RazorCompletionItem>();
+
+            if (AtDirectiveCompletionPoint(syntaxTree, location))
+            {
+                var directiveCompletions = GetDirectiveCompletionItems(syntaxTree);
+                completionItems.AddRange(directiveCompletions);
+            }
+
+            return completionItems;
+        }
+
+        // Internal for testing
+        internal static List<RazorCompletionItem> GetDirectiveCompletionItems(RazorSyntaxTree syntaxTree)
+        {
+            var directives = syntaxTree.Options.Directives.Concat(DefaultDirectives);
+            var completionItems = new List<RazorCompletionItem>();
+            foreach (var directive in directives)
+            {
+                var completionDisplayText = directive.DisplayName ?? directive.Directive;
+                var completionItem = new RazorCompletionItem(
+                    completionDisplayText,
+                    directive.Directive,
+                    directive.Description,
+                    RazorCompletionItemKind.Directive);
+                completionItems.Add(completionItem);
+            }
+
+            return completionItems;
+        }
+
+        // Internal for testing
+        internal static bool AtDirectiveCompletionPoint(RazorSyntaxTree syntaxTree, SourceSpan location)
+        {
+            if (syntaxTree == null)
+            {
+                return false;
+            }
+
+            var change = new SourceChange(location, string.Empty);
+            var owner = syntaxTree.Root.LocateOwner(change);
+
+            if (owner == null)
+            {
+                return false;
+            }
+
+            // Do not provide IntelliSense for explicit expressions. Explicit expressions will usually look like:
+            // [@] [(] [DateTime.Now] [)]
+            var isImplicitExpression = owner.FirstAncestorOrSelf<CSharpImplicitExpressionSyntax>() != null;
+            if (isImplicitExpression &&
+                owner.ChildNodes().All(n => n.IsToken && IsDirectiveCompletableToken((AspNetCore.Razor.Language.Syntax.SyntaxToken)n)))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        // Internal for testing
+        internal static bool IsDirectiveCompletableToken(AspNetCore.Razor.Language.Syntax.SyntaxToken token)
+        {
+            return token.Kind == SyntaxKind.Identifier ||
+                // Marker symbol
+                token.Kind == SyntaxKind.Marker;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentServiceProviderFactory.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentServiceProviderFactory.cs
new file mode 100644
index 0000000000..2abe4c61de
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentServiceProviderFactory.cs
@@ -0,0 +1,15 @@
+// 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 Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal abstract class DocumentServiceProviderFactory
+    {
+        public abstract IDocumentServiceProvider CreateEmpty();
+
+        public abstract IDocumentServiceProvider Create(DocumentSnapshot document);
+    }
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Host/IDocumentExcerptService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Host/IDocumentExcerptService.cs
new file mode 100644
index 0000000000..8729432a08
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Host/IDocumentExcerptService.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Microsoft.  All Rights Reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+#if DOCUMENT_SERVICE_FACTORY
+
+using System.Collections.Immutable;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Classification;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Host
+{
+    /// <summary>
+    /// excerpt some part of <see cref="Document"/>
+    /// </summary>
+    internal interface IDocumentExcerptService : IDocumentService
+    {
+        /// <summary>
+        /// return <see cref="ExcerptResult"/> of given <see cref="Document"/> and <see cref="TextSpan"/>
+        /// 
+        /// the result might not be an exact copy of the given source or contains more then given span
+        /// </summary>
+        Task<ExcerptResult?> TryExcerptAsync(Document document, TextSpan span, ExcerptMode mode, CancellationToken cancellationToken);
+    }
+
+    /// <summary>
+    /// this mode shows intention not actual behavior. it is up to implementation how to interpret the intention.
+    /// </summary>
+    internal enum ExcerptMode
+    {
+        SingleLine,
+        Tooltip
+    }
+
+    /// <summary>
+    /// Result of excerpt
+    /// </summary>
+    internal struct ExcerptResult
+    {
+        /// <summary>
+        /// excerpt content
+        /// </summary>
+        public readonly SourceText Content;
+
+        /// <summary>
+        /// span on <see cref="Content"/> that given <see cref="Span"/> got mapped to
+        /// </summary>
+        public readonly TextSpan MappedSpan;
+
+        /// <summary>
+        /// classification information on the <see cref="Content"/>
+        /// </summary>
+        public readonly ImmutableArray<ClassifiedSpan> ClassifiedSpans;
+
+        /// <summary>
+        /// <see cref="Document"/> this excerpt is from
+        /// </summary>
+        public readonly Document Document;
+
+        /// <summary>
+        /// span on <see cref="Document"/> this excerpt is from
+        /// </summary>
+        public readonly TextSpan Span;
+
+        public ExcerptResult(SourceText content, TextSpan mappedSpan, ImmutableArray<ClassifiedSpan> classifiedSpans, Document document, TextSpan span)
+        {
+            Content = content;
+            MappedSpan = mappedSpan;
+            ClassifiedSpans = classifiedSpans;
+
+            // these 2 might not actually needed
+            Document = document;
+            Span = span;
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Host/IDocumentOperationService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Host/IDocumentOperationService.cs
new file mode 100644
index 0000000000..ae3e5f2191
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Host/IDocumentOperationService.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft.  All Rights Reserved.
+// Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+#if DOCUMENT_SERVICE_FACTORY
+
+namespace Microsoft.CodeAnalysis.Host
+{
+    /// <summary>
+    /// provide various operations for this document
+    /// 
+    /// I followed name from EditorOperation for now. 
+    /// </summary>
+    internal interface IDocumentOperationService : IDocumentService
+    {
+        /// <summary>
+        /// document version of <see cref="Workspace.CanApplyChange(ApplyChangesKind)"/>
+        /// </summary>
+        bool CanApplyChange { get; }
+
+        /// <summary>
+        /// indicates whether this document supports diagnostics or not
+        /// </summary>
+        bool SupportDiagnostics { get; }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Host/IDocumentService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Host/IDocumentService.cs
new file mode 100644
index 0000000000..fe6b075d0e
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Host/IDocumentService.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft.  All Rights Reserved.
+// Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+#if DOCUMENT_SERVICE_FACTORY
+
+namespace Microsoft.CodeAnalysis.Host
+{
+    /// <summary>
+    /// Empty interface just to mark document services.
+    /// </summary>
+    internal interface IDocumentService
+    {
+    }
+}
+
+#endif
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Host/IDocumentServiceProvider.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Host/IDocumentServiceProvider.cs
new file mode 100644
index 0000000000..ba36d6fe04
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Host/IDocumentServiceProvider.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft.  All Rights Reserved.
+// Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+#if DOCUMENT_SERVICE_FACTORY
+
+namespace Microsoft.CodeAnalysis.Host
+{
+    internal interface IDocumentServiceProvider
+    {
+        /// <summary>
+        /// Gets a document specific service provided by the host identified by the service type. 
+        /// If the host does not provide the service, this method returns null.
+        /// </summary>
+        TService GetService<TService>() where TService : class, IDocumentService;
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Host/ISpanMappingService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Host/ISpanMappingService.cs
new file mode 100644
index 0000000000..4c32f09180
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Host/ISpanMappingService.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Microsoft.  All Rights Reserved.
+// Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+#if DOCUMENT_SERVICE_FACTORY
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Host
+{
+    /// <summary>
+    /// Map spans in a document to other spans even in other document
+    ///
+    /// this will be used by various features if provided to convert span in one document to other spans.
+    /// 
+    /// for example, it is used to show spans users expect in a razor file rather than spans in 
+    /// auto generated file that is implementation detail or navigate to the right place rather 
+    /// than the generated file and etc.
+    /// </summary>
+    internal interface ISpanMappingService : IDocumentService
+    {
+        /// <summary>
+        /// Map spans in the document to more appropriate locations
+        /// 
+        /// in current design, this can NOT map a span to a span that is not backed by a file.
+        /// for example, roslyn supports someone to have a document that is not backed by a file. and current design doesn't allow
+        /// such document to be returned from this API
+        /// for example, span on razor secondary buffer document in roslyn solution mapped to a span on razor cshtml file is possible but
+        /// a span on razor cshtml file to a span on secondary buffer document is not possible since secondary buffer document is not backed by a file
+        /// </summary>
+        /// <param name="document">Document given spans belong to</param>
+        /// <param name="spans">Spans in the document</param>
+        /// <param name="cancellationToken">Cancellation token</param>
+        /// <returns>Return mapped span. order of result should be same as the given span</returns>
+        Task<ImmutableArray<MappedSpanResult>> MapSpansAsync(Document document, IEnumerable<TextSpan> spans, CancellationToken cancellationToken);
+    }
+
+    /// <summary>
+    /// Result of span mapping
+    /// </summary>
+    internal struct MappedSpanResult
+    {
+        /// <summary>
+        /// Path to mapped file
+        /// </summary>
+        public readonly string FilePath;
+
+        /// <summary>
+        /// LinePosition representation of the Span
+        /// </summary>
+        public readonly LinePositionSpan LinePositionSpan;
+
+        /// <summary>
+        /// Mapped span
+        /// </summary>
+        public readonly TextSpan Span;
+
+        public MappedSpanResult(string filePath, LinePositionSpan linePositionSpan, TextSpan span)
+        {
+            FilePath = filePath;
+            LinePositionSpan = linePositionSpan;
+            Span = span;
+        }
+    }
+}
+
+#endif
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj
index ca09c13e78..7849c20439 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj
@@ -2,8 +2,9 @@
 
   <PropertyGroup>
     <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure.</Description>
-    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <EnableApiCheck>false</EnableApiCheck>
+    <DefineConstants>$(DefineConstants);DOCUMENT_SERVICE_FACTORY</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSnapshotProjectEngineFactory.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSnapshotProjectEngineFactory.cs
index cf2341878d..0f44e7c4c7 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSnapshotProjectEngineFactory.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSnapshotProjectEngineFactory.cs
@@ -45,7 +45,36 @@ namespace Microsoft.CodeAnalysis.Razor
             return Create(project, RazorProjectFileSystem.Create(Path.GetDirectoryName(project.FilePath)), configure);
         }
 
-        public abstract RazorProjectEngine Create(ProjectSnapshot project, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure);
+        public RazorProjectEngine Create(ProjectSnapshot project, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure)
+        {
+            if (project == null)
+            {
+                throw new ArgumentNullException(nameof(project));
+            }
 
+            if (fileSystem == null)
+            {
+                throw new ArgumentNullException(nameof(fileSystem));
+            }
+
+            return Create(project.Configuration, fileSystem, configure);
+        }
+
+        public RazorProjectEngine Create(RazorConfiguration configuration, string directoryPath, Action<RazorProjectEngineBuilder> configure)
+        {
+            if (configuration == null)
+            {
+                throw new ArgumentNullException(nameof(configuration));
+            }
+
+            if (directoryPath == null)
+            {
+                throw new ArgumentNullException(nameof(directoryPath));
+            }
+
+            return Create(configuration, RazorProjectFileSystem.Create(directoryPath), configure);
+        }
+
+        public abstract RazorProjectEngine Create(RazorConfiguration configuration, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure);
     }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultDocumentSnapshot.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultDocumentSnapshot.cs
index d25b38ddbe..cf5c1a7766 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultDocumentSnapshot.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultDocumentSnapshot.cs
@@ -23,11 +23,11 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 throw new ArgumentNullException(nameof(state));
             }
 
-            Project = project;
+            ProjectInternal = project;
             State = state;
         }
 
-        public DefaultProjectSnapshot Project { get; }
+        public DefaultProjectSnapshot ProjectInternal { get; }
 
         public DocumentState State { get; }
 
@@ -35,9 +35,13 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
         public override string TargetPath => State.HostDocument.TargetPath;
 
+        public override ProjectSnapshot Project => ProjectInternal;
+
+        public override bool SupportsOutput => true;
+
         public override IReadOnlyList<DocumentSnapshot> GetImports()
         {
-            return State.Imports.GetImports(Project, this);
+            return State.GetImports(ProjectInternal);
         }
 
         public override Task<SourceText> GetTextAsync()
@@ -50,10 +54,16 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             return State.GetTextVersionAsync();
         }
 
-        public override Task<RazorCodeDocument> GetGeneratedOutputAsync()
+        public override async Task<RazorCodeDocument> GetGeneratedOutputAsync()
         {
-            // IMPORTANT: Don't put more code here. We want this to return a cached task.
-            return State.GeneratedOutput.GetGeneratedOutputInitializationTask(Project, this);
+            var (output, _, _) = await State.GetGeneratedOutputAndVersionAsync(ProjectInternal, this).ConfigureAwait(false);
+            return output;
+        }
+
+        public override async Task<VersionStamp> GetGeneratedOutputVersionAsync()
+        {
+            var (_, _, version) = await State.GetGeneratedOutputAndVersionAsync(ProjectInternal, this).ConfigureAwait(false);
+            return version;
         }
 
         public override bool TryGetText(out SourceText result)
@@ -68,14 +78,26 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
         public override bool TryGetGeneratedOutput(out RazorCodeDocument result)
         {
-            if (State.GeneratedOutput.IsResultAvailable)
+            if (State.IsGeneratedOutputResultAvailable)
             {
-                result = State.GeneratedOutput.GetGeneratedOutputInitializationTask(Project, this).Result;
+                result = State.GetGeneratedOutputAndVersionAsync(ProjectInternal, this).Result.output;
                 return true;
             }
 
             result = null;
             return false;
         }
+
+        public override bool TryGetGeneratedOutputVersionAsync(out VersionStamp result)
+        {
+            if (State.IsGeneratedOutputResultAvailable)
+            {
+                result = State.GetGeneratedOutputAndVersionAsync(ProjectInternal, this).Result.outputVersion;
+                return true;
+            }
+
+            result = default(VersionStamp);
+            return false;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultImportDocumentSnapshot.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultImportDocumentSnapshot.cs
new file mode 100644
index 0000000000..d73446362d
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultImportDocumentSnapshot.cs
@@ -0,0 +1,95 @@
+// 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;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
+{
+    internal class DefaultImportDocumentSnapshot : DocumentSnapshot
+    {
+        private ProjectSnapshot _project;
+        private RazorProjectItem _importItem;
+        private SourceText _sourceText;
+        private VersionStamp _version;
+
+        public DefaultImportDocumentSnapshot(ProjectSnapshot project, RazorProjectItem item)
+        {
+            _project = project;
+            _importItem = item;
+            _version = VersionStamp.Default;
+        }
+
+        public override string FilePath => null;
+
+        public override string TargetPath => null;
+
+        public override bool SupportsOutput => false;
+
+        public override ProjectSnapshot Project => _project;
+
+        public override Task<RazorCodeDocument> GetGeneratedOutputAsync()
+        {
+            throw new NotSupportedException();
+        }
+
+        public override Task<VersionStamp> GetGeneratedOutputVersionAsync()
+        {
+            throw new NotSupportedException();
+        }
+
+        public override IReadOnlyList<DocumentSnapshot> GetImports()
+        {
+            return Array.Empty<DocumentSnapshot>();
+        }
+
+        public async override Task<SourceText> GetTextAsync()
+        {
+            using (var stream = _importItem.Read())
+            using (var reader = new StreamReader(stream))
+            {
+                var content = await reader.ReadToEndAsync();
+                _sourceText = SourceText.From(content);
+            }
+
+            return _sourceText;
+        }
+
+        public override Task<VersionStamp> GetTextVersionAsync()
+        {
+            return Task.FromResult(_version);
+        }
+
+        public override bool TryGetText(out SourceText result)
+        {
+            if (_sourceText != null)
+            {
+                result = _sourceText;
+                return true;
+            }
+
+            result = null;
+            return false;
+        }
+
+        public override bool TryGetTextVersion(out VersionStamp result)
+        {
+            result = _version;
+            return true;
+        }
+
+        public override bool TryGetGeneratedOutput(out RazorCodeDocument result)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override bool TryGetGeneratedOutputVersionAsync(out VersionStamp result)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshot.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshot.cs
index aba5e7a916..dff471af3d 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshot.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshot.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
 
@@ -58,22 +59,50 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             }
         }
 
+        public override bool IsImportDocument(DocumentSnapshot document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+            
+            return State.ImportsToRelatedDocuments.ContainsKey(document.TargetPath);
+        }
+
+        public override IEnumerable<DocumentSnapshot> GetRelatedDocuments(DocumentSnapshot document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            if (State.ImportsToRelatedDocuments.TryGetValue(document.TargetPath, out var relatedDocuments))
+            {
+                lock (_lock)
+                {
+                    return relatedDocuments.Select(GetDocument).ToArray();
+                }
+            }
+
+            return Array.Empty<DocumentSnapshot>();
+        }
+
         public override RazorProjectEngine GetProjectEngine()
         {
-            return State.ProjectEngine.GetProjectEngine(this);
+            return State.ProjectEngine;
         }
 
         public override Task<IReadOnlyList<TagHelperDescriptor>> GetTagHelpersAsync()
         {
             // IMPORTANT: Don't put more code here. We want this to return a cached task.
-            return State.TagHelpers.GetTagHelperInitializationTask(this);
+            return State.GetTagHelpersAsync(this);
         }
 
         public override bool TryGetTagHelpers(out IReadOnlyList<TagHelperDescriptor> result)
         {
-            if (State.TagHelpers.IsResultAvailable)
+            if (State.IsTagHelperResultAvailable)
             {
-                result = State.TagHelpers.GetTagHelperInitializationTask(this).Result;
+                result = State.GetTagHelpersAsync(this).Result;
                 return true;
             }
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshotManager.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshotManager.cs
index 5a810cc803..9953878518 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshotManager.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshotManager.cs
@@ -90,12 +90,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 var projects = new ProjectSnapshot[_projects.Count];
                 foreach (var entry in _projects)
                 {
-                    if (entry.Value.Snapshot == null)
-                    {
-                        entry.Value.Snapshot = new DefaultProjectSnapshot(entry.Value.State);
-                    }
-
-                    projects[i++] = entry.Value.Snapshot;
+                    projects[i++] = entry.Value.GetSnapshot();
                 }
 
                 return projects;
@@ -115,12 +110,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             if (_projects.TryGetValue(filePath, out var entry))
             {
-                if (entry.Snapshot == null)
-                {
-                    entry.Snapshot = new DefaultProjectSnapshot(entry.State);
-                }
-
-                return entry.Snapshot;
+                return entry.GetSnapshot();
             }
 
             return null;
@@ -175,8 +165,10 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 // Document updates can no-op.
                 if (!object.ReferenceEquals(state, entry.State))
                 {
-                    _projects[hostProject.FilePath] = new Entry(state);
-                    NotifyListeners(new ProjectChangeEventArgs(hostProject.FilePath, document.FilePath, ProjectChangeKind.DocumentAdded));
+                    var oldSnapshot = entry.GetSnapshot();
+                    entry = new Entry(state);
+                    _projects[hostProject.FilePath] = entry;
+                    NotifyListeners(new ProjectChangeEventArgs(oldSnapshot, entry.GetSnapshot(), document.FilePath, ProjectChangeKind.DocumentAdded));
                 }
             }
         }
@@ -201,8 +193,10 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 // Document updates can no-op.
                 if (!object.ReferenceEquals(state, entry.State))
                 {
-                    _projects[hostProject.FilePath] = new Entry(state);
-                    NotifyListeners(new ProjectChangeEventArgs(hostProject.FilePath, document.FilePath, ProjectChangeKind.DocumentRemoved));
+                    var oldSnapshot = entry.GetSnapshot();
+                    entry = new Entry(state);
+                    _projects[hostProject.FilePath] = entry;
+                    NotifyListeners(new ProjectChangeEventArgs(oldSnapshot, entry.GetSnapshot(), document.FilePath, ProjectChangeKind.DocumentRemoved));
                 }
             }
         }
@@ -229,12 +223,10 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 entry.State.Documents.TryGetValue(documentFilePath, out var older))
             {
                 ProjectState state;
-                SourceText olderText;
-                VersionStamp olderVersion;
 
                 var currentText = sourceText;
-                if (older.TryGetText(out olderText) && 
-                    older.TryGetTextVersion(out olderVersion))
+                if (older.TryGetText(out var olderText) &&
+                    older.TryGetTextVersion(out var olderVersion))
                 {
                     var version = currentText.ContentEquals(olderText) ? olderVersion : olderVersion.GetNewerVersion();
                     state = entry.State.WithChangedHostDocument(older.HostDocument, currentText, version);
@@ -256,8 +248,10 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 // Document updates can no-op.
                 if (!object.ReferenceEquals(state, entry.State))
                 {
-                    _projects[projectFilePath] = new Entry(state);
-                    NotifyListeners(new ProjectChangeEventArgs(projectFilePath, documentFilePath, ProjectChangeKind.DocumentChanged));
+                    var oldSnapshot = entry.GetSnapshot();
+                    entry = new Entry(state);
+                    _projects[projectFilePath] = entry;
+                    NotifyListeners(new ProjectChangeEventArgs(oldSnapshot, entry.GetSnapshot(), documentFilePath, ProjectChangeKind.DocumentChanged));
                 }
             }
         }
@@ -293,8 +287,10 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 // Document updates can no-op.
                 if (!object.ReferenceEquals(state, entry.State))
                 {
-                    _projects[projectFilePath] = new Entry(state);
-                    NotifyListeners(new ProjectChangeEventArgs(projectFilePath, documentFilePath, ProjectChangeKind.DocumentChanged));
+                    var oldSnapshot = entry.GetSnapshot();
+                    entry = new Entry(state);
+                    _projects[projectFilePath] = entry;
+                    NotifyListeners(new ProjectChangeEventArgs(oldSnapshot, entry.GetSnapshot(), documentFilePath, ProjectChangeKind.DocumentChanged));
                 }
             }
         }
@@ -321,12 +317,10 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 entry.State.Documents.TryGetValue(documentFilePath, out var older))
             {
                 ProjectState state;
-                SourceText olderText;
-                VersionStamp olderVersion;
 
                 var currentText = sourceText;
-                if (older.TryGetText(out olderText) &&
-                    older.TryGetTextVersion(out olderVersion))
+                if (older.TryGetText(out var olderText) &&
+                    older.TryGetTextVersion(out var olderVersion))
                 {
                     var version = currentText.ContentEquals(olderText) ? olderVersion : olderVersion.GetNewerVersion();
                     state = entry.State.WithChangedHostDocument(older.HostDocument, currentText, version);
@@ -346,8 +340,10 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 // Document updates can no-op.
                 if (!object.ReferenceEquals(state, entry.State))
                 {
-                    _projects[projectFilePath] = new Entry(state);
-                    NotifyListeners(new ProjectChangeEventArgs(projectFilePath, documentFilePath, ProjectChangeKind.DocumentChanged));
+                    var oldSnapshot = entry.GetSnapshot();
+                    entry = new Entry(state);
+                    _projects[projectFilePath] = entry;
+                    NotifyListeners(new ProjectChangeEventArgs(oldSnapshot, entry.GetSnapshot(), documentFilePath, ProjectChangeKind.DocumentChanged));
                 }
             }
         }
@@ -381,8 +377,10 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 // Document updates can no-op.
                 if (!object.ReferenceEquals(state, entry.State))
                 {
-                    _projects[projectFilePath] = new Entry(state);
-                    NotifyListeners(new ProjectChangeEventArgs(projectFilePath, documentFilePath, ProjectChangeKind.DocumentChanged));
+                    var oldSnapshot = entry.GetSnapshot();
+                    entry = new Entry(state);
+                    _projects[projectFilePath] = entry;
+                    NotifyListeners(new ProjectChangeEventArgs(oldSnapshot, entry.GetSnapshot(), documentFilePath, ProjectChangeKind.DocumentChanged));
                 }
             }
         }
@@ -407,10 +405,11 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             var workspaceProject = GetWorkspaceProject(hostProject.FilePath);
 
             var state = ProjectState.Create(Workspace.Services, hostProject, workspaceProject);
-            _projects[hostProject.FilePath] = new Entry(state);
+            var entry = new Entry(state);
+            _projects[hostProject.FilePath] = entry;
 
             // We need to notify listeners about every project add.
-            NotifyListeners(new ProjectChangeEventArgs(hostProject.FilePath, ProjectChangeKind.ProjectAdded));
+            NotifyListeners(new ProjectChangeEventArgs(null, entry.GetSnapshot(), ProjectChangeKind.ProjectAdded));
         }
 
         public override void HostProjectChanged(HostProject hostProject)
@@ -429,9 +428,10 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 // HostProject updates can no-op.
                 if (!object.ReferenceEquals(state, entry.State))
                 {
-                    _projects[hostProject.FilePath] = new Entry(state);
-
-                    NotifyListeners(new ProjectChangeEventArgs(hostProject.FilePath, ProjectChangeKind.ProjectChanged));
+                    var oldSnapshot = entry.GetSnapshot();
+                    entry = new Entry(state);
+                    _projects[hostProject.FilePath] = entry;
+                    NotifyListeners(new ProjectChangeEventArgs(oldSnapshot, entry.GetSnapshot(), ProjectChangeKind.ProjectChanged));
                 }
             }
         }
@@ -445,12 +445,12 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             _foregroundDispatcher.AssertForegroundThread();
 
-            if (_projects.TryGetValue(hostProject.FilePath, out var snapshot))
+            if (_projects.TryGetValue(hostProject.FilePath, out var entry))
             {
-                _projects.Remove(hostProject.FilePath);
-
                 // We need to notify listeners about every project removal.
-                NotifyListeners(new ProjectChangeEventArgs(hostProject.FilePath, ProjectChangeKind.ProjectRemoved));
+                var oldSnapshot = entry.GetSnapshot();
+                _projects.Remove(hostProject.FilePath);
+                NotifyListeners(new ProjectChangeEventArgs(oldSnapshot, null, ProjectChangeKind.ProjectRemoved));
             }
         }
 
@@ -477,9 +477,11 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 if (entry.State.WorkspaceProject == null)
                 {
                     var state = entry.State.WithWorkspaceProject(workspaceProject);
-                    _projects[workspaceProject.FilePath] = new Entry(state);
 
-                    NotifyListeners(new ProjectChangeEventArgs(workspaceProject.FilePath, ProjectChangeKind.ProjectChanged));
+                    var oldSnapshot = entry.GetSnapshot();
+                    entry = new Entry(state);
+                    _projects[workspaceProject.FilePath] = entry;
+                    NotifyListeners(new ProjectChangeEventArgs(oldSnapshot, entry.GetSnapshot(), ProjectChangeKind.ProjectChanged));
                 }
             }
         }
@@ -505,14 +507,15 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 (entry.State.WorkspaceProject == null || entry.State.WorkspaceProject.Version.GetNewerVersion(workspaceProject.Version) == workspaceProject.Version))
             {
                 var state = entry.State.WithWorkspaceProject(workspaceProject);
-                
+
                 // WorkspaceProject updates can no-op. This can be the case if a build is triggered, but we've
                 // already seen the update.
                 if (!object.ReferenceEquals(state, entry.State))
                 {
-                    _projects[workspaceProject.FilePath] = new Entry(state);
-
-                    NotifyListeners(new ProjectChangeEventArgs(workspaceProject.FilePath, ProjectChangeKind.ProjectChanged));
+                    var oldSnapshot = entry.GetSnapshot();
+                    entry = new Entry(state);
+                    _projects[workspaceProject.FilePath] = entry;
+                    NotifyListeners(new ProjectChangeEventArgs(oldSnapshot, entry.GetSnapshot(), ProjectChangeKind.ProjectChanged));
                 }
             }
         }
@@ -549,17 +552,21 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 {
                     // OK there's another WorkspaceProject, use that.
                     state = entry.State.WithWorkspaceProject(otherWorkspaceProject);
-                    _projects[otherWorkspaceProject.FilePath] = new Entry(state);
 
-                    NotifyListeners(new ProjectChangeEventArgs(otherWorkspaceProject.FilePath, ProjectChangeKind.ProjectChanged));
+                    var oldSnapshot = entry.GetSnapshot();
+                    entry = new Entry(state);
+                    _projects[otherWorkspaceProject.FilePath] = entry;
+                    NotifyListeners(new ProjectChangeEventArgs(oldSnapshot, entry.GetSnapshot(), ProjectChangeKind.ProjectChanged));
                 }
                 else
                 {
-                    state = entry.State.WithWorkspaceProject(null);
-                    _projects[workspaceProject.FilePath] = new Entry(state);
-
                     // Notify listeners of a change because we've removed computed state.
-                    NotifyListeners(new ProjectChangeEventArgs(workspaceProject.FilePath, ProjectChangeKind.ProjectChanged));
+                    state = entry.State.WithWorkspaceProject(null);
+
+                    var oldSnapshot = entry.GetSnapshot();
+                    entry = new Entry(state);
+                    _projects[workspaceProject.FilePath] = entry;
+                    NotifyListeners(new ProjectChangeEventArgs(oldSnapshot, entry.GetSnapshot(), ProjectChangeKind.ProjectChanged));
                 }
             }
         }
@@ -601,7 +608,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             {
                 throw new ArgumentNullException(nameof(exception));
             }
-            
+
             _errorReporter.ReportError(exception, workspaceProject);
         }
 
@@ -644,13 +651,18 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
         private class Entry
         {
-            public ProjectSnapshot Snapshot;
+            public ProjectSnapshot SnapshotUnsafe;
             public readonly ProjectState State;
 
             public Entry(ProjectState state)
             {
                 State = state;
             }
+
+            public ProjectSnapshot GetSnapshot()
+            {
+                return SnapshotUnsafe ?? (SnapshotUnsafe = new DefaultProjectSnapshot(State));
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentGeneratedOutputTracker.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentGeneratedOutputTracker.cs
deleted file mode 100644
index a3e11da04f..0000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentGeneratedOutputTracker.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-// 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;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.Extensions.Internal;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class DocumentGeneratedOutputTracker
-    {
-        private readonly object _lock;
-
-        private DocumentGeneratedOutputTracker _older;
-        private Task<RazorCodeDocument> _task;
-        
-        private IReadOnlyList<TagHelperDescriptor> _tagHelpers;
-        private IReadOnlyList<ImportItem> _imports;
-
-        public DocumentGeneratedOutputTracker(DocumentGeneratedOutputTracker older)
-        {
-            _older = older;
-
-            _lock = new object();
-        }
-
-        public bool IsResultAvailable => _task?.IsCompleted == true;
-
-        public DocumentGeneratedOutputTracker Older => _older;
-
-        public Task<RazorCodeDocument> GetGeneratedOutputInitializationTask(ProjectSnapshot project, DocumentSnapshot document)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            if (document == null)
-            {
-                throw new ArgumentNullException(nameof(document));
-            }
-
-            if (_task == null)
-            {
-                lock (_lock)
-                {
-                    if (_task == null)
-                    {
-                        _task = GetGeneratedOutputInitializationTaskCore(project, document);
-                    }
-                }
-            }
-
-            return _task;
-        }
-
-        public DocumentGeneratedOutputTracker Fork()
-        {
-            return new DocumentGeneratedOutputTracker(this);
-        }
-
-        private async Task<RazorCodeDocument> GetGeneratedOutputInitializationTaskCore(ProjectSnapshot project, DocumentSnapshot document)
-        {
-            var tagHelpers = await project.GetTagHelpersAsync().ConfigureAwait(false);
-            var imports = await GetImportsAsync(project, document);
-
-            if (_older != null && _older.IsResultAvailable)
-            {
-                var tagHelperDifference = new HashSet<TagHelperDescriptor>(TagHelperDescriptorComparer.Default);
-                tagHelperDifference.UnionWith(_older._tagHelpers);
-                tagHelperDifference.SymmetricExceptWith(tagHelpers);
-
-                var importDifference = new HashSet<ImportItem>();
-                importDifference.UnionWith(_older._imports);
-                importDifference.SymmetricExceptWith(imports);
-
-                if (tagHelperDifference.Count == 0 && importDifference.Count == 0)
-                {
-                    // We can use the cached result.
-                    var result = _older._task.Result;
-
-                    // Drop reference so it can be GC'ed
-                    _older = null;
-
-                    // Cache the tag helpers and imports so the next version can use them
-                    _tagHelpers = tagHelpers;
-                    _imports = imports;
-
-                    return result;
-                }
-            }
-
-            // Drop reference so it can be GC'ed
-            _older = null;
-
-            // Cache the tag helpers and imports so the next version can use them
-            _tagHelpers = tagHelpers;
-            _imports = imports;
-
-            var importSources = new List<RazorSourceDocument>();
-            foreach (var item in imports)
-            {
-                var sourceDocument = await GetRazorSourceDocumentAsync(item.Import);
-                importSources.Add(sourceDocument);
-            }
-
-            var documentSource = await GetRazorSourceDocumentAsync(document);
-
-            var projectEngine = project.GetProjectEngine();
-
-            return projectEngine.ProcessDesignTime(documentSource, importSources, tagHelpers);
-        }
-
-        private async Task<RazorSourceDocument> GetRazorSourceDocumentAsync(DocumentSnapshot document)
-        {
-            var sourceText = await document.GetTextAsync();
-
-            return sourceText.GetRazorSourceDocument(document.FilePath);
-        }
-
-        private async Task<IReadOnlyList<ImportItem>> GetImportsAsync(ProjectSnapshot project, DocumentSnapshot document)
-        {
-            var imports = new List<ImportItem>();
-            foreach (var snapshot in document.GetImports())
-            {
-                var versionStamp = await snapshot.GetTextVersionAsync();
-                imports.Add(new ImportItem(snapshot.FilePath, versionStamp, snapshot));
-            }
-
-            return imports;
-        }
-
-        private struct ImportItem : IEquatable<ImportItem>
-        {
-            public ImportItem(string filePath, VersionStamp versionStamp, DocumentSnapshot import)
-            {
-                FilePath = filePath;
-                VersionStamp = versionStamp;
-                Import = import;
-            }
-
-            public string FilePath { get; }
-
-            public VersionStamp VersionStamp { get; }
-
-            public DocumentSnapshot Import { get; }
-
-            public bool Equals(ImportItem other)
-            {
-                return
-                    FilePathComparer.Instance.Equals(FilePath, other.FilePath) &&
-                    VersionStamp == other.VersionStamp;
-            }
-
-            public override bool Equals(object obj)
-            {
-                return obj is ImportItem item ? Equals(item) : false;
-            }
-
-            public override int GetHashCode()
-            {
-                var hash = new HashCodeCombiner();
-                hash.Add(FilePath, FilePathComparer.Instance);
-                hash.Add(VersionStamp);
-                return hash;
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentImportsTracker.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentImportsTracker.cs
deleted file mode 100644
index 96b927e42f..0000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentImportsTracker.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-// 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;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Text;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class DocumentImportsTracker
-    {
-        private readonly object _lock;
-
-        private IReadOnlyList<DocumentSnapshot> _imports;
-
-        public DocumentImportsTracker()
-        {
-            _lock = new object();
-        }
-
-        public IReadOnlyList<DocumentSnapshot> GetImports(ProjectSnapshot project, DocumentSnapshot document)
-        {
-            if (project == null)
-            {
-                throw new ArgumentNullException(nameof(project));
-            }
-
-            if (document == null)
-            {
-                throw new ArgumentNullException(nameof(document));
-            }
-
-            if (_imports == null)
-            {
-                lock (_lock)
-                {
-                    if (_imports == null)
-                    {
-                        _imports = GetImportsCore(project, document);
-                    }
-                }
-            }
-
-            return _imports;
-        }
-
-        private IReadOnlyList<DocumentSnapshot> GetImportsCore(ProjectSnapshot project, DocumentSnapshot document)
-        {
-            var projectEngine = project.GetProjectEngine();
-            var importFeature = projectEngine.ProjectFeatures.OfType<IImportProjectFeature>().FirstOrDefault();
-            var projectItem = projectEngine.FileSystem.GetItem(document.FilePath);
-            var importItems = importFeature?.GetImports(projectItem).Where(i => i.Exists);
-            if (importItems == null)
-            {
-                return Array.Empty<DocumentSnapshot>();
-            }
-
-            var imports = new List<DocumentSnapshot>();
-            foreach (var item in importItems)
-            {
-                if (item.PhysicalPath == null)
-                {
-                    // This is a default import.
-                    var defaultImport = new DefaultImportDocumentSnapshot(project, item);
-                    imports.Add(defaultImport);
-                }
-                else
-                {
-                    var import = project.GetDocument(item.PhysicalPath);
-                    if (import == null)
-                    {
-                        // We are not tracking this document in this project. So do nothing.
-                        continue;
-                    }
-
-                    imports.Add(import);
-                }
-            }
-
-            return imports;
-        }
-
-        private class DefaultImportDocumentSnapshot : DocumentSnapshot
-        {
-            private ProjectSnapshot _project;
-            private RazorProjectItem _importItem;
-            private SourceText _sourceText;
-            private VersionStamp _version;
-            private DocumentGeneratedOutputTracker _generatedOutput;
-
-            public DefaultImportDocumentSnapshot(ProjectSnapshot project, RazorProjectItem item)
-            {
-                _project = project;
-                _importItem = item;
-                _version = VersionStamp.Default;
-                _generatedOutput = new DocumentGeneratedOutputTracker(null);
-            }
-
-            public override string FilePath => null;
-
-            public override string TargetPath => null;
-
-            public override Task<RazorCodeDocument> GetGeneratedOutputAsync()
-            {
-                return _generatedOutput.GetGeneratedOutputInitializationTask(_project, this);
-            }
-
-            public override IReadOnlyList<DocumentSnapshot> GetImports()
-            {
-                return Array.Empty<DocumentSnapshot>();
-            }
-
-            public async override Task<SourceText> GetTextAsync()
-            {
-                using (var stream = _importItem.Read())
-                using (var reader = new StreamReader(stream))
-                {
-                    var content = await reader.ReadToEndAsync();
-                    _sourceText = SourceText.From(content);
-                }
-
-                return _sourceText;
-            }
-
-            public override Task<VersionStamp> GetTextVersionAsync()
-            {
-                return Task.FromResult(_version);
-            }
-
-            public override bool TryGetText(out SourceText result)
-            {
-                if (_sourceText != null)
-                {
-                    result = _sourceText;
-                    return true;
-                }
-
-                result = null;
-                return false;
-            }
-
-            public override bool TryGetTextVersion(out VersionStamp result)
-            {
-                result = _version;
-                return true;
-            }
-
-            public override bool TryGetGeneratedOutput(out RazorCodeDocument result)
-            {
-                if (_generatedOutput.IsResultAvailable)
-                {
-                    result = GetGeneratedOutputAsync().Result;
-                    return true;
-                }
-
-                result = null;
-                return false;
-            }
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentSnapshot.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentSnapshot.cs
index 0cc9da8f04..7dd8317ef1 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentSnapshot.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentSnapshot.cs
@@ -14,6 +14,10 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
         public abstract string TargetPath { get; }
 
+        public abstract ProjectSnapshot Project { get; }
+
+        public abstract bool SupportsOutput { get; }
+
         public abstract IReadOnlyList<DocumentSnapshot> GetImports();
 
         public abstract Task<SourceText> GetTextAsync();
@@ -22,10 +26,14 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
         public abstract Task<RazorCodeDocument> GetGeneratedOutputAsync();
 
+        public abstract Task<VersionStamp> GetGeneratedOutputVersionAsync();
+
         public abstract bool TryGetText(out SourceText result);
 
         public abstract bool TryGetTextVersion(out VersionStamp result);
 
         public abstract bool TryGetGeneratedOutput(out RazorCodeDocument result);
+
+        public abstract bool TryGetGeneratedOutputVersionAsync(out VersionStamp result);
     }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.cs
index d1fb05b67a..31b9447126 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.cs
@@ -2,7 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Text;
 
@@ -18,14 +21,13 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
         private readonly object _lock;
 
+        private ComputedStateTracker _computedState;
+
         private Func<Task<TextAndVersion>> _loader;
         private Task<TextAndVersion> _loaderTask;
         private SourceText _sourceText;
         private VersionStamp? _version;
 
-        private DocumentGeneratedOutputTracker _generatedOutput;
-        private DocumentImportsTracker _imports;
-
         public static DocumentState Create(
             HostWorkspaceServices services,
             HostDocument hostDocument,
@@ -65,42 +67,37 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
         public HostWorkspaceServices Services { get; }
 
-        public DocumentGeneratedOutputTracker GeneratedOutput
+        public GeneratedCodeContainer GeneratedCodeContainer => HostDocument.GeneratedCodeContainer;
+
+        public bool IsGeneratedOutputResultAvailable => ComputedState.IsResultAvailable == true;
+
+        private ComputedStateTracker ComputedState
         {
             get
             {
-                if (_generatedOutput == null)
+                if (_computedState == null)
                 {
                     lock (_lock)
                     {
-                        if (_generatedOutput == null)
+                        if (_computedState == null)
                         {
-                            _generatedOutput = new DocumentGeneratedOutputTracker(null);
+                            _computedState = new ComputedStateTracker(this);
                         }
                     }
                 }
 
-                return _generatedOutput;
+                return _computedState;
             }
         }
 
-        public DocumentImportsTracker Imports
+        public Task<(RazorCodeDocument output, VersionStamp inputVersion, VersionStamp outputVersion)> GetGeneratedOutputAndVersionAsync(DefaultProjectSnapshot project, DefaultDocumentSnapshot document)
         {
-            get
-            {
-                if (_imports == null)
-                {
-                    lock (_lock)
-                    {
-                        if (_imports == null)
-                        {
-                            _imports = new DocumentImportsTracker();
-                        }
-                    }
-                }
+            return ComputedState.GetGeneratedOutputAndVersionAsync(project, document);
+        }
 
-                return _imports;
-            }
+        public IReadOnlyList<DocumentSnapshot> GetImports(DefaultProjectSnapshot project)
+        {
+            return GetImportsCore(project);
         }
 
         public async Task<SourceText> GetTextAsync()
@@ -178,6 +175,23 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             state._version = _version;
             state._loaderTask = _loaderTask;
 
+            // Do not cache computed state
+
+            return state;
+        }
+
+        public virtual DocumentState WithImportsChange()
+        {
+            var state = new DocumentState(Services, HostDocument, _sourceText, _version, _loader);
+
+            // The source could not have possibly changed.
+            state._sourceText = _sourceText;
+            state._version = _version;
+            state._loaderTask = _loaderTask;
+
+            // Optimisically cache the computed state
+            state._computedState = new ComputedStateTracker(state, _computedState);
+
             return state;
         }
 
@@ -190,8 +204,8 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             state._version = _version;
             state._loaderTask = _loaderTask;
 
-            // Opportunistically cache the generated code
-            state._generatedOutput = _generatedOutput?.Fork();
+            // Optimisically cache the computed state
+            state._computedState = new ComputedStateTracker(state, _computedState);
 
             return state;
         }
@@ -203,6 +217,8 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 throw new ArgumentNullException(nameof(sourceText));
             }
 
+            // Do not cache the computed state
+
             return new DocumentState(Services, HostDocument, sourceText, version, null);
         }
 
@@ -213,7 +229,239 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 throw new ArgumentNullException(nameof(loader));
             }
 
+            // Do not cache the computed state
+
             return new DocumentState(Services, HostDocument, null, null, loader);
         }
+
+        private IReadOnlyList<DocumentSnapshot> GetImportsCore(DefaultProjectSnapshot project)
+        {
+            var projectEngine = project.GetProjectEngine();
+            var importFeature = projectEngine.ProjectFeatures.OfType<IImportProjectFeature>().FirstOrDefault();
+            var projectItem = projectEngine.FileSystem.GetItem(HostDocument.FilePath);
+            var importItems = importFeature?.GetImports(projectItem);
+            if (importItems == null)
+            {
+                return Array.Empty<DocumentSnapshot>();
+            }
+
+            var imports = new List<DocumentSnapshot>();
+            foreach (var item in importItems)
+            {
+                if (item.PhysicalPath == null)
+                {
+                    // This is a default import.
+                    var defaultImport = new DefaultImportDocumentSnapshot(project, item);
+                    imports.Add(defaultImport);
+                }
+                else
+                {
+                    var import = project.GetDocument(item.PhysicalPath);
+                    if (import == null)
+                    {
+                        // We are not tracking this document in this project. So do nothing.
+                        continue;
+                    }
+
+                    imports.Add(import);
+                }
+            }
+
+            return imports;
+        }
+
+        // See design notes on ProjectState.ComputedStateTracker.
+        private class ComputedStateTracker
+        {
+            private readonly object _lock;
+
+            private ComputedStateTracker _older;
+            public Task<(RazorCodeDocument, VersionStamp, VersionStamp)> TaskUnsafe;
+
+            public ComputedStateTracker(DocumentState state, ComputedStateTracker older = null)
+            {
+                _lock = state._lock;
+                _older = older;
+            }
+
+            public bool IsResultAvailable => TaskUnsafe?.IsCompleted == true;
+
+            public Task<(RazorCodeDocument, VersionStamp, VersionStamp)> GetGeneratedOutputAndVersionAsync(DefaultProjectSnapshot project, DocumentSnapshot document)
+            {
+                if (project == null)
+                {
+                    throw new ArgumentNullException(nameof(project));
+                }
+
+                if (document == null)
+                {
+                    throw new ArgumentNullException(nameof(document));
+                }
+
+                if (TaskUnsafe == null)
+                {
+                    lock (_lock)
+                    {
+                        if (TaskUnsafe == null)
+                        {
+                            TaskUnsafe = GetGeneratedOutputAndVersionCoreAsync(project, document);
+                        }
+                    }
+                }
+
+                return TaskUnsafe;
+            }
+
+            private async Task<(RazorCodeDocument, VersionStamp, VersionStamp)> GetGeneratedOutputAndVersionCoreAsync(DefaultProjectSnapshot project, DocumentSnapshot document)
+            {
+                // We only need to produce the generated code if any of our inputs is newer than the
+                // previously cached output.
+                //
+                // First find the versions that are the inputs:
+                // - The project + computed state
+                // - The imports
+                // - This document
+                //
+                // All of these things are cached, so no work is wasted if we do need to generate the code.
+                var computedStateVersion = await project.State.GetComputedStateVersionAsync(project).ConfigureAwait(false);
+                var documentCollectionVersion = project.State.DocumentCollectionVersion;
+                var imports = await GetImportsAsync(project, document).ConfigureAwait(false);
+                var documentVersion = await document.GetTextVersionAsync().ConfigureAwait(false);
+
+                // OK now that have the previous output and all of the versions, we can see if anything
+                // has changed that would require regenerating the code.
+                var inputVersion = documentVersion;
+                if (inputVersion.GetNewerVersion(computedStateVersion) == computedStateVersion)
+                {
+                    inputVersion = computedStateVersion;
+                }
+
+                if (inputVersion.GetNewerVersion(documentCollectionVersion) == documentCollectionVersion)
+                {
+                    inputVersion = documentCollectionVersion;
+                }
+
+                for (var i = 0; i < imports.Count; i++)
+                {
+                    var importVersion = imports[i].Version;
+                    if (inputVersion.GetNewerVersion(importVersion) == importVersion)
+                    {
+                        inputVersion = importVersion;
+                    }
+                }
+
+                RazorCodeDocument olderOutput = null;
+                var olderInputVersion = default(VersionStamp);
+                var olderOutputVersion = default(VersionStamp);
+                if (_older?.TaskUnsafe != null)
+                {
+                    (olderOutput, olderInputVersion, olderOutputVersion) = await _older.TaskUnsafe.ConfigureAwait(false);
+                    if (inputVersion.GetNewerVersion(olderInputVersion) == olderInputVersion)
+                    {
+                        // Nothing has changed, we can use the cached result.
+                        lock (_lock)
+                        {
+                            TaskUnsafe = _older.TaskUnsafe;
+                            _older = null;
+                            return (olderOutput, olderInputVersion, olderOutputVersion);
+                        }
+                    }
+                }
+
+                // OK we have to generate the code.
+                var tagHelpers = await project.GetTagHelpersAsync().ConfigureAwait(false);
+                var importSources = new List<RazorSourceDocument>();
+                foreach (var item in imports)
+                {
+                    var sourceDocument = await GetRazorSourceDocumentAsync(item.Document).ConfigureAwait(false);
+                    importSources.Add(sourceDocument);
+                }
+
+                var documentSource = await GetRazorSourceDocumentAsync(document).ConfigureAwait(false);
+
+                var projectEngine = project.GetProjectEngine();
+
+                var codeDocument = projectEngine.ProcessDesignTime(documentSource, importSources, tagHelpers);
+                var csharpDocument = codeDocument.GetCSharpDocument();
+
+                // OK now we've generated the code. Let's check if the output is actually different. This is
+                // a valuable optimization for our use cases because lots of changes you could make require
+                // us to run code generation, but don't change the result.
+                //
+                // Note that we're talking about the effect on the generated C# code here (not the other artifacts).
+                // This is the reason why we have two versions associated with the output. 
+                //
+                // The INPUT version is related the .cshtml files and tag helpers
+                // The OUTPUT version is related to the generated C#.
+                //
+                // Examples: 
+                // 
+                // A change to a tag helper not used by this document - updates the INPUT version, but not 
+                // the OUTPUT version.
+                //
+                // A change in the HTML - updates the INPUT version, but not the OUTPUT version.
+                //
+                //
+                // Razor IDE features should always retrieve the output and party on it regardless. Depending
+                // on the use cases we may or may not need to synchronize the output.
+
+                var outputVersion = inputVersion;
+                if (olderOutput != null)
+                {
+                    if (string.Equals(
+                        olderOutput.GetCSharpDocument().GeneratedCode, 
+                        csharpDocument.GeneratedCode, 
+                        StringComparison.Ordinal))
+                    {
+                        outputVersion = olderOutputVersion;
+                    }
+                }
+
+                if (document is DefaultDocumentSnapshot defaultDocument)
+                {
+                    defaultDocument.State.HostDocument.GeneratedCodeContainer.SetOutput(
+                        defaultDocument,
+                        csharpDocument,
+                        inputVersion,
+                        outputVersion);
+                }
+
+                return (codeDocument, inputVersion, outputVersion);
+            }
+
+            private async Task<RazorSourceDocument> GetRazorSourceDocumentAsync(DocumentSnapshot document)
+            {
+                var sourceText = await document.GetTextAsync();
+                return sourceText.GetRazorSourceDocument(document.FilePath);
+            }
+
+            private async Task<IReadOnlyList<ImportItem>> GetImportsAsync(ProjectSnapshot project, DocumentSnapshot document)
+            {
+                var imports = new List<ImportItem>();
+                foreach (var snapshot in document.GetImports())
+                {
+                    var versionStamp = await snapshot.GetTextVersionAsync();
+                    imports.Add(new ImportItem(snapshot.FilePath, versionStamp, snapshot));
+                }
+
+                return imports;
+            }
+
+            private readonly struct ImportItem
+            {
+                public ImportItem(string filePath, VersionStamp version, DocumentSnapshot document)
+                {
+                    FilePath = filePath;
+                    Version = version;
+                    Document = document;
+                }
+
+                public string FilePath { get; }
+
+                public VersionStamp Version { get; }
+
+                public DocumentSnapshot Document { get; }
+            }
+        }
     }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/EmptyTextLoader.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/EmptyTextLoader.cs
new file mode 100644
index 0000000000..765523fcf8
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/EmptyTextLoader.cs
@@ -0,0 +1,26 @@
+// 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.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
+{
+    internal class EmptyTextLoader : TextLoader
+    {
+        private readonly string _filePath;
+        private readonly VersionStamp _version;
+
+        public EmptyTextLoader(string filePath)
+        {
+            _filePath = filePath;
+            _version = VersionStamp.Create(); // Version will never change so this can be reused.
+        }
+
+        public override Task<TextAndVersion> LoadTextAndVersionAsync(Workspace workspace, DocumentId documentId, CancellationToken cancellationToken)
+        {
+            return Task.FromResult(TextAndVersion.Create(SourceText.From(""), _version, _filePath));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/EphemeralProjectSnapshot.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/EphemeralProjectSnapshot.cs
index cd87c074de..82f9a93196 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/EphemeralProjectSnapshot.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/EphemeralProjectSnapshot.cs
@@ -56,6 +56,26 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             return null;
         }
 
+        public override bool IsImportDocument(DocumentSnapshot document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            return false;
+        }
+
+        public override IEnumerable<DocumentSnapshot> GetRelatedDocuments(DocumentSnapshot document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            return Array.Empty<DocumentSnapshot>();
+        }
+
         public override RazorProjectEngine GetProjectEngine()
         {
             return _projectEngine.Value;
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/GeneratedCodeContainer.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/GeneratedCodeContainer.cs
new file mode 100644
index 0000000000..dec2a48d4a
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/GeneratedCodeContainer.cs
@@ -0,0 +1,184 @@
+// 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;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
+{
+    internal class GeneratedCodeContainer
+    {
+        public event EventHandler<TextChangeEventArgs> GeneratedCodeChanged;
+
+        private SourceText _source;
+        private VersionStamp? _inputVersion;
+        private VersionStamp? _outputVersion;
+        private RazorCSharpDocument _output;
+        private DocumentSnapshot _latestDocument;
+
+        private readonly object _setOutputLock = new object();
+        private readonly TextContainer _textContainer;
+
+        public GeneratedCodeContainer()
+        {
+            _textContainer = new TextContainer(_setOutputLock);
+            _textContainer.TextChanged += TextContainer_TextChanged;
+        }
+
+        public SourceText Source
+        {
+            get
+            {
+                lock (_setOutputLock)
+                {
+                    return _source;
+                }
+            }
+        }
+
+        public VersionStamp InputVersion
+        {
+            get
+            {
+                lock (_setOutputLock)
+                {
+                    return _inputVersion.Value;
+                }
+            }
+        }
+
+        public VersionStamp OutputVersion
+        {
+            get
+            {
+                lock (_setOutputLock)
+                {
+                    return _outputVersion.Value;
+                }
+            }
+        }
+
+        public RazorCSharpDocument Output
+        {
+            get
+            {
+                lock (_setOutputLock)
+                {
+                    return _output;
+                }
+            }
+        }
+
+        public DocumentSnapshot LatestDocument
+        {
+            get
+            {
+                lock (_setOutputLock)
+                {
+                    return _latestDocument;
+                }
+            }
+        }
+
+        public SourceTextContainer SourceTextContainer
+        {
+            get
+            {
+                lock (_setOutputLock)
+                {
+                    return _textContainer;
+                }
+            }
+        }
+
+        public void SetOutput(
+            DefaultDocumentSnapshot document, 
+            RazorCSharpDocument output,
+            VersionStamp inputVersion,
+            VersionStamp outputVersion)
+        {
+            lock (_setOutputLock)
+            {
+                if (_inputVersion.HasValue &&
+                    _inputVersion != inputVersion &&
+                    _inputVersion == _inputVersion.Value.GetNewerVersion(inputVersion))
+                {
+                    // Latest document is newer than the provided document.
+                    return;
+                }
+
+                if (!document.TryGetText(out var source))
+                {
+                    Debug.Fail("The text should have already been evaluated.");
+                    return;
+                }
+
+                _source = source;
+                _inputVersion = inputVersion;
+                _outputVersion = outputVersion;
+                _output = output;
+                _latestDocument = document;
+                _textContainer.SetText(SourceText.From(_output.GeneratedCode));
+            }
+        }
+
+        private void TextContainer_TextChanged(object sender, TextChangeEventArgs args)
+        {
+            GeneratedCodeChanged?.Invoke(this, args);
+        }
+
+        private class TextContainer : SourceTextContainer
+        {
+            public override event EventHandler<TextChangeEventArgs> TextChanged;
+
+            private readonly object _outerLock;
+            private SourceText _currentText;
+
+            public TextContainer(object outerLock)
+                : this(SourceText.From(string.Empty))
+            {
+                _outerLock = outerLock;
+            }
+
+            public TextContainer(SourceText sourceText)
+            {
+                if (sourceText == null)
+                {
+                    throw new ArgumentNullException(nameof(sourceText));
+                }
+
+                _currentText = sourceText;
+            }
+
+            public override SourceText CurrentText
+            {
+                get
+                {
+                    lock (_outerLock)
+                    {
+                        return _currentText;
+                    }
+                }
+            }
+
+            public void SetText(SourceText sourceText)
+            {
+                if (sourceText == null)
+                {
+                    throw new ArgumentNullException(nameof(sourceText));
+                }
+
+                lock (_outerLock)
+                {
+
+                    var e = new TextChangeEventArgs(_currentText, sourceText);
+                    _currentText = sourceText;
+
+                    TextChanged?.Invoke(this, e);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/GeneratedOutputTextLoader.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/GeneratedOutputTextLoader.cs
new file mode 100644
index 0000000000..8ca7821b63
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/GeneratedOutputTextLoader.cs
@@ -0,0 +1,36 @@
+// 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;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
+{
+    internal class GeneratedOutputTextLoader : TextLoader
+    {
+        private readonly DocumentSnapshot _document;
+        private readonly string _filePath;
+        private readonly VersionStamp _version;
+
+        public GeneratedOutputTextLoader(DocumentSnapshot document, string filePath)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            _document = document;
+            _filePath = filePath;
+            _version = VersionStamp.Create(); // Version will never change so this can be reused.
+        }
+
+        public override async Task<TextAndVersion> LoadTextAndVersionAsync(Workspace workspace, DocumentId documentId, CancellationToken cancellationToken)
+        {
+            var output = await _document.GetGeneratedOutputAsync().ConfigureAwait(false);
+            return TextAndVersion.Create(SourceText.From(output.GetCSharpDocument().GeneratedCode), _version, _filePath);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/HostDocument.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/HostDocument.cs
index 859cc0df32..77d62eb854 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/HostDocument.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/HostDocument.cs
@@ -21,10 +21,13 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             FilePath = filePath;
             TargetPath = targetPath;
+            GeneratedCodeContainer = new GeneratedCodeContainer();
         }
 
         public string FilePath { get; }
 
         public string TargetPath { get; }
+
+        public GeneratedCodeContainer GeneratedCodeContainer { get; }
     }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/LiveShareProjectSnapshotBase.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/LiveShareProjectSnapshotBase.cs
index f03a31b0ae..ae13f49735 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/LiveShareProjectSnapshotBase.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/LiveShareProjectSnapshotBase.cs
@@ -27,6 +27,10 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces.ProjectSystem
 
         public override DocumentSnapshot GetDocument(string filePath) => throw new NotImplementedException();
 
+        public override bool IsImportDocument(DocumentSnapshot document) => throw new NotImplementedException();
+
+        public override IEnumerable<DocumentSnapshot> GetRelatedDocuments(DocumentSnapshot document) => throw new NotImplementedException();
+
         public override RazorProjectEngine GetProjectEngine() => throw new NotImplementedException();
 
         public override Task<IReadOnlyList<TagHelperDescriptor>> GetTagHelpersAsync() => throw new NotImplementedException();
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectChangeEventArgs.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectChangeEventArgs.cs
index a163ba5f1b..3e0dd3ff68 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectChangeEventArgs.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectChangeEventArgs.cs
@@ -7,29 +7,39 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 {
     internal class ProjectChangeEventArgs : EventArgs
     {
-        public ProjectChangeEventArgs(string projectFilePath, ProjectChangeKind kind)
+        public ProjectChangeEventArgs(ProjectSnapshot older, ProjectSnapshot newer, ProjectChangeKind kind)
         {
-            if (projectFilePath == null)
+            if (older == null && newer == null)
             {
-                throw new ArgumentNullException(nameof(projectFilePath));
+                throw new ArgumentException("Both projects cannot be null.");
             }
 
-            ProjectFilePath = projectFilePath;
+            Older = older;
+            Newer = newer;
             Kind = kind;
+
+            ProjectFilePath = older?.FilePath ?? newer.FilePath;
         }
 
-        public ProjectChangeEventArgs(string projectFilePath, string documentFilePath, ProjectChangeKind kind)
+        public ProjectChangeEventArgs(ProjectSnapshot older, ProjectSnapshot newer, string documentFilePath, ProjectChangeKind kind)
         {
-            if (projectFilePath == null)
+            if (older == null && newer == null)
             {
-                throw new ArgumentNullException(nameof(projectFilePath));
+                throw new ArgumentException("Both projects cannot be null.");
             }
 
-            ProjectFilePath = projectFilePath;
+            Older = older;
+            Newer = newer;
             DocumentFilePath = documentFilePath;
             Kind = kind;
+
+            ProjectFilePath = older?.FilePath ?? newer.FilePath;
         }
 
+        public ProjectSnapshot Older { get; }
+
+        public ProjectSnapshot Newer { get; }
+
         public string ProjectFilePath { get; }
 
         public string DocumentFilePath { get; }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectEngineTracker.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectEngineTracker.cs
deleted file mode 100644
index 6e54daed0b..0000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectEngineTracker.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// 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;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Host;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class ProjectEngineTracker
-    {
-        private const ProjectDifference Mask = ProjectDifference.ConfigurationChanged;
-
-        private readonly object _lock = new object();
-
-        private readonly HostWorkspaceServices _services;
-        private RazorProjectEngine _projectEngine;
-
-        public ProjectEngineTracker(ProjectState state)
-        {
-            if (state == null)
-            {
-                throw new ArgumentNullException(nameof(state));
-            }
-
-            _services = state.Services;
-        }
-
-        public ProjectEngineTracker ForkFor(ProjectState state, ProjectDifference difference)
-        {
-            if (state == null)
-            {
-                throw new ArgumentNullException(nameof(state));
-            }
-
-            if ((difference & Mask) != 0)
-            {
-                return null;
-            }
-
-            return this;
-        }
-
-        public RazorProjectEngine GetProjectEngine(ProjectSnapshot snapshot)
-        {
-            if (snapshot == null)
-            {
-                throw new ArgumentNullException(nameof(snapshot));
-            }
-
-            if (_projectEngine == null)
-            {
-                lock (_lock)
-                {
-                    if (_projectEngine == null)
-                    {
-                        var factory = _services.GetRequiredService<ProjectSnapshotProjectEngineFactory>();
-                        _projectEngine = factory.Create(snapshot);
-                    }
-                }
-            }
-
-            return _projectEngine;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshot.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshot.cs
index 418d117ff2..cf091a4f19 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshot.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshot.cs
@@ -25,6 +25,17 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
         public abstract DocumentSnapshot GetDocument(string filePath);
 
+        public abstract bool IsImportDocument(DocumentSnapshot document);
+
+        /// <summary>
+        /// If the provided document is an import document, gets the other documents in the project
+        /// that include directives specified by the provided document. Otherwise returns an empty
+        /// list.
+        /// </summary>
+        /// <param name="document">The document.</param>
+        /// <returns>A list of related documents.</returns>
+        public abstract IEnumerable<DocumentSnapshot> GetRelatedDocuments(DocumentSnapshot document);
+
         public abstract Task<IReadOnlyList<TagHelperDescriptor>> GetTagHelpersAsync();
 
         public abstract bool TryGetTagHelpers(out IReadOnlyList<TagHelperDescriptor> result);
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectState.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectState.cs
index 6670ba55a2..7708b0c709 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectState.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectState.cs
@@ -3,7 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Text;
 
@@ -12,12 +16,24 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
     // Internal tracker for DefaultProjectSnapshot
     internal class ProjectState
     {
-        private static readonly IReadOnlyDictionary<string, DocumentState> EmptyDocuments = new Dictionary<string, DocumentState>();
+        private const ProjectDifference ClearComputedStateMask = ProjectDifference.ConfigurationChanged;
 
+        private const ProjectDifference ClearCachedTagHelpersMask =
+            ProjectDifference.ConfigurationChanged |
+            ProjectDifference.WorkspaceProjectAdded |
+            ProjectDifference.WorkspaceProjectChanged |
+            ProjectDifference.WorkspaceProjectRemoved;
+
+        private const ProjectDifference ClearDocumentCollectionVersionMask =
+            ProjectDifference.ConfigurationChanged |
+            ProjectDifference.DocumentAdded |
+            ProjectDifference.DocumentRemoved;
+
+        private static readonly ImmutableDictionary<string, DocumentState> EmptyDocuments = ImmutableDictionary.Create<string, DocumentState>(FilePathComparer.Instance);
+        private static readonly ImmutableDictionary<string, ImmutableArray<string>> EmptyImportsToRelatedDocuments = ImmutableDictionary.Create<string, ImmutableArray<string>>(FilePathComparer.Instance);
         private readonly object _lock;
 
-        private ProjectEngineTracker _projectEngine;
-        private ProjectTagHelperTracker _tagHelpers;
+        private ComputedStateTracker _computedState;
 
         public static ProjectState Create(HostWorkspaceServices services, HostProject hostProject, Project workspaceProject = null)
         {
@@ -33,7 +49,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             return new ProjectState(services, hostProject, workspaceProject);
         }
-        
+
         private ProjectState(
             HostWorkspaceServices services,
             HostProject hostProject,
@@ -43,7 +59,9 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             HostProject = hostProject;
             WorkspaceProject = workspaceProject;
             Documents = EmptyDocuments;
+            ImportsToRelatedDocuments = EmptyImportsToRelatedDocuments;
             Version = VersionStamp.Create();
+            DocumentCollectionVersion = Version;
 
             _lock = new object();
         }
@@ -53,7 +71,8 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             ProjectDifference difference,
             HostProject hostProject,
             Project workspaceProject,
-            IReadOnlyDictionary<string, DocumentState> documents)
+            ImmutableDictionary<string, DocumentState> documents,
+            ImmutableDictionary<string, ImmutableArray<string>> importsToRelatedDocuments)
         {
             if (older == null)
             {
@@ -70,21 +89,49 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 throw new ArgumentNullException(nameof(documents));
             }
 
+            if (importsToRelatedDocuments == null)
+            {
+                throw new ArgumentNullException(nameof(importsToRelatedDocuments));
+            }
+
             Services = older.Services;
             Version = older.Version.GetNewerVersion();
 
             HostProject = hostProject;
             WorkspaceProject = workspaceProject;
             Documents = documents;
+            ImportsToRelatedDocuments = importsToRelatedDocuments;
 
             _lock = new object();
 
-            _projectEngine = older._projectEngine?.ForkFor(this, difference);
-            _tagHelpers = older._tagHelpers?.ForkFor(this, difference);
+            if ((difference & ClearDocumentCollectionVersionMask) == 0)
+            {
+                // Document collection hasn't changed
+                DocumentCollectionVersion = older.DocumentCollectionVersion;
+            }
+            else
+            {
+                DocumentCollectionVersion = Version;
+            }
+
+            if ((difference & ClearComputedStateMask) == 0 && older._computedState != null)
+            {
+                // Optimistically cache the RazorProjectEngine.
+                _computedState = new ComputedStateTracker(this, older._computedState);
+            }
+
+            if ((difference & ClearCachedTagHelpersMask) == 0 && _computedState != null)
+            {
+                // It's OK to keep the computed Tag Helpers.
+                _computedState.TaskUnsafe = older._computedState?.TaskUnsafe;
+            }
         }
 
         // Internal set for testing.
-        public IReadOnlyDictionary<string, DocumentState> Documents { get; internal set; }
+        public ImmutableDictionary<string, DocumentState> Documents { get; internal set; }
+
+        // Internal set for testing.
+        public ImmutableDictionary<string, ImmutableArray<string>> ImportsToRelatedDocuments { get; internal set; }
 
         public HostProject HostProject { get; }
 
@@ -92,46 +139,68 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
         public Project WorkspaceProject { get; }
 
+        /// <summary>
+        /// Gets the version of this project, INCLUDING content changes. The <see cref="Version"/> is
+        /// incremented for each new <see cref="ProjectState"/> instance created.
+        /// </summary>
         public VersionStamp Version { get; }
 
-        // Computed State
-        public ProjectEngineTracker ProjectEngine
+        /// <summary>
+        /// Gets the version of this project, NOT INCLUDING computed or content changes. The
+        /// <see cref="DocumentCollectionVersion"/> is incremented each time the configuration changes or
+        /// a document is added or removed.
+        /// </summary>
+        public VersionStamp DocumentCollectionVersion { get; }
+
+        public RazorProjectEngine ProjectEngine => ComputedState.ProjectEngine;
+
+        public bool IsTagHelperResultAvailable => ComputedState.TaskUnsafe?.IsCompleted == true;
+
+        private ComputedStateTracker ComputedState
         {
             get
             {
-                if (_projectEngine == null)
+                if (_computedState == null)
                 {
                     lock (_lock)
                     {
-                        if (_projectEngine == null)
+                        if (_computedState == null)
                         {
-                            _projectEngine = new ProjectEngineTracker(this);
+                            _computedState = new ComputedStateTracker(this);
                         }
                     }
                 }
 
-                return _projectEngine;
+                return _computedState;
             }
         }
 
-        // Computed State
-        public ProjectTagHelperTracker TagHelpers
+        /// <summary>
+        /// Gets the version of this project based on the computed state, NOT INCLUDING content
+        /// changes. The computed state is guaranteed to change when the configuration or tag helpers
+        /// change.
+        /// </summary>
+        /// <returns>Asynchronously returns the computed version.</returns>
+        public async Task<VersionStamp> GetComputedStateVersionAsync(ProjectSnapshot snapshot)
         {
-            get
+            if (snapshot == null)
             {
-                if (_tagHelpers == null)
-                {
-                    lock (_lock)
-                    {
-                        if (_tagHelpers == null)
-                        {
-                            _tagHelpers = new ProjectTagHelperTracker(this);
-                        }
-                    }
-                }
-
-                return _tagHelpers;
+                throw new ArgumentNullException(nameof(snapshot));
             }
+
+            var (_, version) = await ComputedState.GetTagHelpersAndVersionAsync(snapshot).ConfigureAwait(false);
+            return version;
+        }
+
+        public async Task<IReadOnlyList<TagHelperDescriptor>> GetTagHelpersAsync(ProjectSnapshot snapshot)
+        {
+            if (snapshot == null)
+            {
+                throw new ArgumentNullException(nameof(snapshot));
+            }
+
+            var (tagHelpers, _) = await ComputedState.GetTagHelpersAndVersionAsync(snapshot).ConfigureAwait(false);
+            return tagHelpers;
         }
 
         public ProjectState WithAddedHostDocument(HostDocument hostDocument, Func<Task<TextAndVersion>> loader)
@@ -153,16 +222,23 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 return this;
             }
 
-            var documents = new Dictionary<string, DocumentState>(FilePathComparer.Instance);
-            foreach (var kvp in Documents)
-            {
-                documents.Add(kvp.Key, kvp.Value);
-            }
-            
-            documents.Add(hostDocument.FilePath, DocumentState.Create(Services, hostDocument, loader));
+            var documents = Documents.Add(hostDocument.FilePath, DocumentState.Create(Services, hostDocument, loader));
 
-            var difference = ProjectDifference.DocumentAdded;
-            var state = new ProjectState(this, difference, HostProject, WorkspaceProject, documents);
+            // Compute the effect on the import map
+            var importTargetPaths = GetImportDocumentTargetPaths(hostDocument.TargetPath);
+            var importsToRelatedDocuments = AddToImportsToRelatedDocuments(ImportsToRelatedDocuments, hostDocument, importTargetPaths);
+
+            // Now check if the updated document is an import - it's important this this happens after
+            // updating the imports map.
+            if (importsToRelatedDocuments.TryGetValue(hostDocument.TargetPath, out var relatedDocuments))
+            {
+                foreach (var relatedDocument in relatedDocuments)
+                {
+                    documents = documents.SetItem(relatedDocument, documents[relatedDocument].WithImportsChange());
+                }
+            }
+
+            var state = new ProjectState(this, ProjectDifference.DocumentAdded, HostProject, WorkspaceProject, documents, importsToRelatedDocuments);
             return state;
         }
 
@@ -178,16 +254,23 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 return this;
             }
 
-            var documents = new Dictionary<string, DocumentState>(FilePathComparer.Instance);
-            foreach (var kvp in Documents)
+            var documents = Documents.Remove(hostDocument.FilePath);
+
+            // First check if the updated document is an import - it's important that this happens
+            // before updating the imports map.
+            if (ImportsToRelatedDocuments.TryGetValue(hostDocument.TargetPath, out var relatedDocuments))
             {
-                documents.Add(kvp.Key, kvp.Value);
+                foreach (var relatedDocument in relatedDocuments)
+                {
+                    documents = documents.SetItem(relatedDocument, documents[relatedDocument].WithImportsChange());
+                }
             }
 
-            documents.Remove(hostDocument.FilePath);
+            // Compute the effect on the import map
+            var importTargetPaths = GetImportDocumentTargetPaths(hostDocument.TargetPath);
+            var importsToRelatedDocuments = RemoveFromImportsToRelatedDocuments(ImportsToRelatedDocuments, hostDocument, importTargetPaths);
 
-            var difference = ProjectDifference.DocumentRemoved;
-            var state = new ProjectState(this, difference, HostProject, WorkspaceProject, documents);
+            var state = new ProjectState(this, ProjectDifference.DocumentRemoved, HostProject, WorkspaceProject, documents, importsToRelatedDocuments);
             return state;
         }
 
@@ -198,23 +281,22 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 throw new ArgumentNullException(nameof(hostDocument));
             }
 
-            if (!Documents.ContainsKey(hostDocument.FilePath))
+            if (!Documents.TryGetValue(hostDocument.FilePath, out var document))
             {
                 return this;
             }
 
-            var documents = new Dictionary<string, DocumentState>(FilePathComparer.Instance);
-            foreach (var kvp in Documents)
+            var documents = Documents.SetItem(hostDocument.FilePath, document.WithText(sourceText, version));
+
+            if (ImportsToRelatedDocuments.TryGetValue(hostDocument.TargetPath, out var relatedDocuments))
             {
-                documents.Add(kvp.Key, kvp.Value);
+                foreach (var relatedDocument in relatedDocuments)
+                {
+                    documents = documents.SetItem(relatedDocument, documents[relatedDocument].WithImportsChange());
+                }
             }
 
-            if (documents.TryGetValue(hostDocument.FilePath, out var document))
-            {
-                documents[hostDocument.FilePath] = document.WithText(sourceText, version);
-            }
-
-            var state = new ProjectState(this, ProjectDifference.DocumentChanged, HostProject, WorkspaceProject, documents);
+            var state = new ProjectState(this, ProjectDifference.DocumentChanged, HostProject, WorkspaceProject, documents, ImportsToRelatedDocuments);
             return state;
         }
 
@@ -225,23 +307,22 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 throw new ArgumentNullException(nameof(hostDocument));
             }
 
-            if (!Documents.ContainsKey(hostDocument.FilePath))
+            if (!Documents.TryGetValue(hostDocument.FilePath, out var document))
             {
                 return this;
             }
 
-            var documents = new Dictionary<string, DocumentState>(FilePathComparer.Instance);
-            foreach (var kvp in Documents)
+            var documents = Documents.SetItem(hostDocument.FilePath, document.WithTextLoader(loader));
+
+            if (ImportsToRelatedDocuments.TryGetValue(hostDocument.TargetPath, out var relatedDocuments))
             {
-                documents.Add(kvp.Key, kvp.Value);
+                foreach (var relatedDocument in relatedDocuments)
+                {
+                    documents = documents.SetItem(relatedDocument, documents[relatedDocument].WithImportsChange());
+                }
             }
 
-            if (documents.TryGetValue(hostDocument.FilePath, out var document))
-            {
-                documents[hostDocument.FilePath] = document.WithTextLoader(loader);
-            }
-
-            var state = new ProjectState(this, ProjectDifference.DocumentChanged, HostProject, WorkspaceProject, documents);
+            var state = new ProjectState(this, ProjectDifference.DocumentChanged, HostProject, WorkspaceProject, documents, ImportsToRelatedDocuments);
             return state;
         }
 
@@ -257,14 +338,18 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 return this;
             }
 
-            var difference = ProjectDifference.ConfigurationChanged;
-            var documents = new Dictionary<string, DocumentState>(FilePathComparer.Instance);
-            foreach (var kvp in Documents)
+            var documents = Documents.ToImmutableDictionary(kvp => kvp.Key, kvp => kvp.Value.WithConfigurationChange(), FilePathComparer.Instance);
+
+            // If the host project has changed then we need to recompute the imports map
+            var importsToRelatedDocuments = EmptyImportsToRelatedDocuments;
+
+            foreach (var document in documents)
             {
-                documents.Add(kvp.Key, kvp.Value.WithConfigurationChange());
+                var importTargetPaths = GetImportDocumentTargetPaths(document.Value.HostDocument.TargetPath);
+                importsToRelatedDocuments = AddToImportsToRelatedDocuments(ImportsToRelatedDocuments, document.Value.HostDocument, importTargetPaths);
             }
 
-            var state = new ProjectState(this, difference, hostProject, WorkspaceProject, documents);
+            var state = new ProjectState(this, ProjectDifference.ConfigurationChanged, hostProject, WorkspaceProject, documents, importsToRelatedDocuments);
             return state;
         }
 
@@ -291,14 +376,161 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 return this;
             }
 
-            var documents = new Dictionary<string, DocumentState>(FilePathComparer.Instance);
-            foreach (var kvp in Documents)
+            var documents = Documents.ToImmutableDictionary(kvp => kvp.Key, kvp => kvp.Value.WithWorkspaceProjectChange(), FilePathComparer.Instance);
+            var state = new ProjectState(this, difference, HostProject, workspaceProject, documents, ImportsToRelatedDocuments);
+            return state;
+        }
+
+        private static ImmutableDictionary<string, ImmutableArray<string>> AddToImportsToRelatedDocuments(
+            ImmutableDictionary<string, ImmutableArray<string>> importsToRelatedDocuments,
+            HostDocument hostDocument,
+            List<string> importTargetPaths)
+        {
+            foreach (var importTargetPath in importTargetPaths)
             {
-                documents.Add(kvp.Key, kvp.Value.WithWorkspaceProjectChange());
+                if (!importsToRelatedDocuments.TryGetValue(importTargetPath, out var relatedDocuments))
+                {
+                    relatedDocuments = ImmutableArray.Create<string>();
+                }
+
+                relatedDocuments = relatedDocuments.Add(hostDocument.FilePath);
+                importsToRelatedDocuments = importsToRelatedDocuments.SetItem(importTargetPath, relatedDocuments);
             }
 
-            var state = new ProjectState(this, difference, HostProject, workspaceProject, documents);
-            return state;
+            return importsToRelatedDocuments;
+        }
+
+        private static ImmutableDictionary<string, ImmutableArray<string>> RemoveFromImportsToRelatedDocuments(
+            ImmutableDictionary<string, ImmutableArray<string>> importsToRelatedDocuments,
+            HostDocument hostDocument,
+            List<string> importTargetPaths)
+        {
+            foreach (var importTargetPath in importTargetPaths)
+            {
+                if (importsToRelatedDocuments.TryGetValue(importTargetPath, out var relatedDocuments))
+                {
+                    relatedDocuments = relatedDocuments.Remove(hostDocument.FilePath);
+                    if (relatedDocuments.Length > 0)
+                    {
+                        importsToRelatedDocuments = importsToRelatedDocuments.SetItem(importTargetPath, relatedDocuments);
+                    }
+                    else
+                    {
+                        importsToRelatedDocuments = importsToRelatedDocuments.Remove(importTargetPath);
+                    }
+                }
+            }
+
+            return importsToRelatedDocuments;
+        }
+
+        private RazorProjectEngine CreateProjectEngine()
+        {
+            var factory = Services.GetRequiredService<ProjectSnapshotProjectEngineFactory>();
+            return factory.Create(HostProject.Configuration, Path.GetDirectoryName(HostProject.FilePath), configure: null);
+        }
+
+        public List<string> GetImportDocumentTargetPaths(string targetPath)
+        {
+            var projectEngine = ComputedState.ProjectEngine;
+            var importFeature = projectEngine.ProjectFeatures.OfType<IImportProjectFeature>().FirstOrDefault();
+            var projectItem = projectEngine.FileSystem.GetItem(targetPath);
+            var importItems = importFeature?.GetImports(projectItem).Where(i => i.FilePath != null);
+
+            // Target path looks like `Foo\\Bar.cshtml`
+            var targetPaths = new List<string>();
+            foreach (var importItem in importItems)
+            {
+                var itemTargetPath = importItem.FilePath.Replace('/', '\\').TrimStart('\\');
+                targetPaths.Add(itemTargetPath);
+            }
+
+            return targetPaths;
+        }
+
+        // ComputedStateTracker is the 'holder' of all of the state that can be cached based on
+        // the data in a ProjectState. It should not hold onto a ProjectState directly
+        // as that could lead to things being in memory longer than we want them to.
+        //
+        // Rather, a ComputedStateTracker instance can hold on to a previous instance from an older
+        // version of the same project. 
+        private class ComputedStateTracker
+        {
+            // ProjectState.Version 
+            private readonly VersionStamp _projectStateVersion;
+            private readonly object _lock;
+
+            private ComputedStateTracker _older; // We be set to null when state is computed
+            public Task<(IReadOnlyList<TagHelperDescriptor>, VersionStamp)> TaskUnsafe;
+
+            public ComputedStateTracker(ProjectState state, ComputedStateTracker older = null)
+            {
+                _projectStateVersion = state.Version;
+                _lock = state._lock;
+                _older = older;
+
+                ProjectEngine = _older?.ProjectEngine;
+                if (ProjectEngine == null)
+                {
+                    ProjectEngine = state.CreateProjectEngine();
+                }
+            }
+
+            public RazorProjectEngine ProjectEngine { get; }
+
+            public Task<(IReadOnlyList<TagHelperDescriptor>, VersionStamp)> GetTagHelpersAndVersionAsync(ProjectSnapshot snapshot)
+            {
+                if (TaskUnsafe == null)
+                {
+                    lock (_lock)
+                    {
+                        if (TaskUnsafe == null)
+                        {
+                            TaskUnsafe = GetTagHelpersAndVersionCoreAsync(snapshot);
+                        }
+                    }
+                }
+
+                return TaskUnsafe;
+            }
+
+            private async Task<(IReadOnlyList<TagHelperDescriptor>, VersionStamp)> GetTagHelpersAndVersionCoreAsync(ProjectSnapshot snapshot)
+            {
+                // Don't allow synchronous execution - we expect this to always be called with the lock.
+                await Task.Yield();
+
+                var services = ((DefaultProjectSnapshot)snapshot).State.Services;
+                var resolver = services.GetLanguageServices(RazorLanguage.Name).GetRequiredService<TagHelperResolver>();
+
+                var tagHelpers = (await resolver.GetTagHelpersAsync(snapshot).ConfigureAwait(false)).Descriptors;
+                if (_older?.TaskUnsafe != null)
+                {
+                    // We have something to diff against.
+                    var (olderTagHelpers, olderVersion) = await _older.TaskUnsafe.ConfigureAwait(false);
+
+                    var difference = new HashSet<TagHelperDescriptor>(TagHelperDescriptorComparer.Default);
+                    difference.UnionWith(olderTagHelpers);
+                    difference.SymmetricExceptWith(tagHelpers);
+
+                    if (difference.Count == 0)
+                    {
+                        lock (_lock)
+                        {
+
+                            // Everything is the same. Return the cached version.
+                            TaskUnsafe = _older.TaskUnsafe;
+                            _older = null;
+                            return (olderTagHelpers, olderVersion);
+                        }
+                    }
+                }
+
+                lock (_lock)
+                {
+                    _older = null;
+                    return (tagHelpers, _projectStateVersion);
+                }
+            }
         }
     }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectTagHelperTracker.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectTagHelperTracker.cs
deleted file mode 100644
index 0c3be4ddec..0000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectTagHelperTracker.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// 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;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Host;
-
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
-{
-    internal class ProjectTagHelperTracker
-    {
-        private const ProjectDifference Mask =
-            ProjectDifference.ConfigurationChanged |
-            ProjectDifference.WorkspaceProjectAdded |
-            ProjectDifference.WorkspaceProjectChanged |
-            ProjectDifference.WorkspaceProjectRemoved;
-
-        private readonly object _lock = new object();
-        private readonly HostWorkspaceServices _services;
-
-        private Task<IReadOnlyList<TagHelperDescriptor>> _task;
-
-        public ProjectTagHelperTracker(ProjectState state)
-        {
-            if (state == null)
-            {
-                throw new ArgumentNullException(nameof(state));
-            }
-
-            _services = state.Services;
-        }
-
-        public bool IsResultAvailable => _task?.IsCompleted == true;
-
-        public ProjectTagHelperTracker ForkFor(ProjectState state, ProjectDifference difference)
-        {
-            if (state == null)
-            {
-                throw new ArgumentNullException(nameof(state));
-            }
-
-            if ((difference & Mask) != 0)
-            {
-                return null;
-            }
-
-            return this;
-        }
-
-        public Task<IReadOnlyList<TagHelperDescriptor>> GetTagHelperInitializationTask(ProjectSnapshot snapshot)
-        {
-            if (snapshot == null)
-            {
-                throw new ArgumentNullException(nameof(snapshot));
-            }
-
-            if (_task == null)
-            {
-                lock (_lock)
-                {
-                    if (_task == null)
-                    {
-                        _task = GetTagHelperInitializationTaskCore(snapshot);
-                    }
-                }
-            }
-
-            return _task;
-        }
-
-        private async Task<IReadOnlyList<TagHelperDescriptor>> GetTagHelperInitializationTaskCore(ProjectSnapshot snapshot)
-        {
-            var resolver = _services.GetLanguageServices(RazorLanguage.Name).GetRequiredService<TagHelperResolver>();
-            return (await resolver.GetTagHelpersAsync(snapshot)).Descriptors;
-        }
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Properties/AssemblyInfo.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Properties/AssemblyInfo.cs
index fefb5cd1de..905e1822ed 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Properties/AssemblyInfo.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Properties/AssemblyInfo.cs
@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Runtime.CompilerServices;
+[assembly: InternalsVisibleTo("rzls, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorCompletionFactsService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorCompletionFactsService.cs
new file mode 100644
index 0000000000..f5051dd536
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorCompletionFactsService.cs
@@ -0,0 +1,13 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal abstract class RazorCompletionFactsService
+    {
+        public abstract IReadOnlyList<RazorCompletionItem> GetCompletionItems(RazorSyntaxTree syntaxTree, SourceSpan location);
+    }
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorCompletionItem.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorCompletionItem.cs
new file mode 100644
index 0000000000..87bf19c858
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorCompletionItem.cs
@@ -0,0 +1,45 @@
+// 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;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal sealed class RazorCompletionItem
+    {
+        public RazorCompletionItem(
+            string displayText, 
+            string insertText, 
+            string description, 
+            RazorCompletionItemKind kind)
+        {
+            if (displayText == null)
+            {
+                throw new ArgumentNullException(nameof(displayText));
+            }
+
+            if (insertText == null)
+            {
+                throw new ArgumentNullException(nameof(insertText));
+            }
+
+            if (description == null)
+            {
+                throw new ArgumentNullException(nameof(description));
+            }
+
+            DisplayText = displayText;
+            InsertText = insertText;
+            Description = description;
+            Kind = kind;
+        }
+
+        public string DisplayText { get; }
+
+        public string InsertText { get; }
+
+        public string Description { get; }
+
+        public RazorCompletionItemKind Kind { get; }
+    }
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorCompletionItemKind.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorCompletionItemKind.cs
new file mode 100644
index 0000000000..64d2e1ccca
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorCompletionItemKind.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal enum RazorCompletionItemKind
+    {
+        Directive
+    }
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorDocumentExcerptService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorDocumentExcerptService.cs
new file mode 100644
index 0000000000..bb3ba757cc
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorDocumentExcerptService.cs
@@ -0,0 +1,267 @@
+// 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;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Classification;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal class RazorDocumentExcerptService : IDocumentExcerptService
+    {
+        private readonly DocumentSnapshot _document;
+        private readonly ISpanMappingService _mapper;
+
+        public RazorDocumentExcerptService(DocumentSnapshot document, ISpanMappingService mapper)
+        {
+            if (mapper == null)
+            {
+                throw new ArgumentNullException(nameof(mapper));
+            }
+
+            _document = document;
+            _mapper = mapper;
+        }
+
+        public async Task<ExcerptResult?> TryExcerptAsync(
+            Document document,
+            TextSpan span,
+            ExcerptMode mode,
+            CancellationToken cancellationToken)
+        {
+            var result = await TryGetExcerptInternalAsync(document, span, (ExcerptModeInternal)mode, cancellationToken).ConfigureAwait(false);
+            return result?.ToExcerptResult();
+        }
+
+        public async Task<ExcerptResultInternal?> TryGetExcerptInternalAsync(
+            Document document,
+            TextSpan span,
+            ExcerptModeInternal mode,
+            CancellationToken cancellationToken)
+        { 
+            if (_document == null)
+            {
+                return null;
+            }
+
+            var mapped = await _mapper.MapSpansAsync(document, new[] { span }, cancellationToken).ConfigureAwait(false);
+            if (mapped.Length == 0 || mapped[0].Equals(default(MappedSpanResult)))
+            {
+                return null;
+            }
+
+            var project = _document.Project;
+            var primaryDocument = project.GetDocument(mapped[0].FilePath);
+            if (primaryDocument == null)
+            {
+                return null;
+            }
+
+            var primaryText = await primaryDocument.GetTextAsync().ConfigureAwait(false);
+            var primarySpan = primaryText.Lines.GetTextSpan(mapped[0].LinePositionSpan);
+
+            var secondaryDocument = document;
+            var secondarySpan = span;
+
+            // First compute the range of text we want to we to display relative to the primary document.
+            var excerptSpan = ChooseExcerptSpan(primaryText, primarySpan, mode);
+
+            // Then we'll classify the spans based on the primary document, since that's the coordinate
+            // space that our output mappings use.
+            var output = await _document.GetGeneratedOutputAsync().ConfigureAwait(false);
+            var mappings = output.GetCSharpDocument().SourceMappings;
+            var classifiedSpans = await ClassifyPreviewAsync(
+                primaryText, 
+                excerptSpan, 
+                secondaryDocument, 
+                mappings,
+                cancellationToken).ConfigureAwait(false);
+
+            // Now translate everything to be relative to the excerpt
+            var offset = 0 - excerptSpan.Start;
+            var excerptText = primaryText.GetSubText(excerptSpan);
+            excerptSpan = new TextSpan(0, excerptSpan.Length);
+            primarySpan = new TextSpan(primarySpan.Start + offset, primarySpan.Length);
+
+            for (var i = 0; i < classifiedSpans.Count; i++)
+            {
+                var classifiedSpan = classifiedSpans[i];
+                var updated = new TextSpan(classifiedSpan.TextSpan.Start + offset, classifiedSpan.TextSpan.Length);
+                Debug.Assert(excerptSpan.Contains(updated));
+
+                classifiedSpans[i] = new ClassifiedSpan(classifiedSpan.ClassificationType, updated);
+            }
+
+            return new ExcerptResultInternal(excerptText, primarySpan, classifiedSpans.ToImmutable(), document, span);
+        }
+        
+        private TextSpan ChooseExcerptSpan(SourceText primaryText, TextSpan primarySpan, ExcerptModeInternal mode)
+        {
+            var startLine = primaryText.Lines.GetLineFromPosition(primarySpan.Start);
+            var endLine = primaryText.Lines.GetLineFromPosition(primarySpan.End);
+
+            // If we're showing a single line then this will do. Otherwise expand the range by 3 in
+            // each direction (if possible).
+            if (mode == ExcerptModeInternal.Tooltip)
+            {
+                var index = Math.Max(startLine.LineNumber - 3, 0);
+                startLine = primaryText.Lines[index];
+            }
+
+            if (mode == ExcerptModeInternal.Tooltip)
+            {
+                var index = Math.Min(endLine.LineNumber + 3, primaryText.Lines.Count - 1);
+                endLine = primaryText.Lines[index];
+            }
+
+            return new TextSpan(startLine.Start, endLine.End - startLine.Start);
+        }
+
+        private async Task<ImmutableArray<ClassifiedSpan>.Builder> ClassifyPreviewAsync(
+            SourceText primaryText,
+            TextSpan excerptSpan,
+            Document secondaryDocument,
+            IReadOnlyList<SourceMapping> mappings,
+            CancellationToken cancellationToken)
+        {
+            var builder = ImmutableArray.CreateBuilder<ClassifiedSpan>();
+
+            var sorted = new List<SourceMapping>(mappings);
+            sorted.Sort((x, y) => x.OriginalSpan.AbsoluteIndex.CompareTo(y.OriginalSpan.AbsoluteIndex));
+
+            // The algorithm here is to iterate through the source mappings (sorted) and use the C# classifier
+            // on the spans that are known to the C#. For the spans that are not known to be C# then 
+            // we just treat them as text since we'd don't currently have our own classifications.
+
+            var remainingSpan = excerptSpan;
+            for (var i = 0; i < sorted.Count && excerptSpan.Length > 0; i++)
+            {
+                var primarySpan = sorted[i].OriginalSpan.AsTextSpan();
+                var intersection = primarySpan.Intersection(remainingSpan);
+                if (intersection == null)
+                {
+                    // This span is outside the area we're interested in.
+                    continue;
+                }
+
+                // OK this span intersects with the excerpt span, so we will process it. Let's compute
+                // the secondary span that matches the intersection.
+                var secondarySpan = sorted[i].GeneratedSpan.AsTextSpan();
+                secondarySpan = new TextSpan(secondarySpan.Start + intersection.Value.Start - primarySpan.Start, intersection.Value.Length);
+                primarySpan = intersection.Value;
+                
+                if (remainingSpan.Start < primarySpan.Start)
+                {
+                    // The position is before the next C# span. Classify everything up to the C# start
+                    // as text.
+                    builder.Add(new ClassifiedSpan(ClassificationTypeNames.Text, new TextSpan(remainingSpan.Start, primarySpan.Start - remainingSpan.Start)));
+
+                    // Advance to the start of the C# span.
+                    remainingSpan = new TextSpan(primarySpan.Start, remainingSpan.Length - (primarySpan.Start - remainingSpan.Start));
+                }
+
+                // We should be able to process this whole span as C#, so classify it.
+                //
+                // However, we'll have to translate it to the the secondary document's coordinates to do that.
+                Debug.Assert(remainingSpan.Contains(primarySpan) && remainingSpan.Start == primarySpan.Start);
+                var classifiedSecondarySpans = await Classifier.GetClassifiedSpansAsync(
+                    secondaryDocument, 
+                    secondarySpan, 
+                    cancellationToken);
+
+                // NOTE: The Classifier will only returns spans for things that it understands. That means
+                // that whitespace is not classified. The preview expects us to provide contiguous spans, 
+                // so we are going to have to fill in the gaps.
+                
+                // Now we have to translate back to the primary document's coordinates.
+                var offset = primarySpan.Start - secondarySpan.Start;
+                foreach (var classifiedSecondarySpan in classifiedSecondarySpans)
+                {
+                    Debug.Assert(secondarySpan.Contains(classifiedSecondarySpan.TextSpan));
+                    
+                    var updated = new TextSpan(classifiedSecondarySpan.TextSpan.Start + offset, classifiedSecondarySpan.TextSpan.Length);
+                    Debug.Assert(primarySpan.Contains(updated));
+
+                    // Make sure that we're not introducing a gap. Remember, we need to fill in the whitespace.
+                    if (remainingSpan.Start < updated.Start)
+                    {
+                        builder.Add(new ClassifiedSpan(
+                            ClassificationTypeNames.Text,
+                            new TextSpan(remainingSpan.Start, updated.Start - remainingSpan.Start)));
+                        remainingSpan = new TextSpan(updated.Start, remainingSpan.Length - (updated.Start - remainingSpan.Start));
+                    }
+                    
+                    builder.Add(new ClassifiedSpan(classifiedSecondarySpan.ClassificationType, updated));
+                    remainingSpan = new TextSpan(updated.End, remainingSpan.Length - (updated.End - remainingSpan.Start));
+                }
+
+                // Make sure that we're not introducing a gap. Remember, we need to fill in the whitespace.
+                if (remainingSpan.Start < primarySpan.End)
+                {
+                    builder.Add(new ClassifiedSpan(
+                        ClassificationTypeNames.Text,
+                        new TextSpan(remainingSpan.Start, primarySpan.End - remainingSpan.Start)));
+                    remainingSpan = new TextSpan(primarySpan.End, remainingSpan.Length - (primarySpan.End - remainingSpan.Start));
+                }
+
+            }
+
+            // Deal with residue
+            if (remainingSpan.Length > 0)
+            {
+                // Trailing Razor/markup text.
+                builder.Add(new ClassifiedSpan(ClassificationTypeNames.Text, remainingSpan));
+            }
+
+            return builder;
+        }
+
+        // We have IVT access to the Roslyn APIs for product code, but not for testing.
+        public enum ExcerptModeInternal
+        {
+            SingleLine = ExcerptMode.SingleLine,
+            Tooltip = ExcerptMode.Tooltip,
+        }
+
+        // We have IVT access to the Roslyn APIs for product code, but not for testing.
+        public readonly struct ExcerptResultInternal
+        {
+            public readonly SourceText Content;
+
+            public readonly TextSpan MappedSpan;
+
+            public readonly ImmutableArray<ClassifiedSpan> ClassifiedSpans;
+
+            public readonly Document Document;
+
+            public readonly TextSpan Span;
+
+            public ExcerptResultInternal(
+                SourceText content,
+                TextSpan mappedSpan,
+                ImmutableArray<ClassifiedSpan> classifiedSpans,
+                Document document,
+                TextSpan span)
+            {
+                Content = content;
+                MappedSpan = mappedSpan;
+                ClassifiedSpans = classifiedSpans;
+                Document = document;
+                Span = span;
+            }
+
+            public ExcerptResult ToExcerptResult()
+            {
+                return new ExcerptResult(Content, MappedSpan, ClassifiedSpans, Document, Span);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorDocumentServiceProvider.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorDocumentServiceProvider.cs
new file mode 100644
index 0000000000..68a38f1c08
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorDocumentServiceProvider.cs
@@ -0,0 +1,71 @@
+// 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;
+using Microsoft.CodeAnalysis.Razor;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+
+namespace Microsoft.CodeAnalysis.Host
+{
+    internal class RazorDocumentServiceProvider : IDocumentServiceProvider, IDocumentOperationService
+    {
+        private readonly DocumentSnapshot _document;
+        private readonly object _lock;
+
+        private RazorSpanMappingService _spanMappingService;
+        private RazorDocumentExcerptService _excerptService;
+
+        public RazorDocumentServiceProvider()
+            : this(null)
+        {
+        }
+
+        public RazorDocumentServiceProvider(DocumentSnapshot document)
+        {
+            _document = document;
+
+            _lock = new object();
+        }
+
+        public bool CanApplyChange => false;
+
+        public bool SupportDiagnostics => false;
+
+        public TService GetService<TService>() where TService : class, IDocumentService
+        {
+            if (typeof(TService) == typeof(ISpanMappingService))
+            {
+                if (_spanMappingService == null)
+                {
+                    lock (_lock)
+                    {
+                        if (_spanMappingService == null)
+                        {
+                            _spanMappingService = new RazorSpanMappingService(_document);
+                        }
+                    }
+                }
+
+                return (TService)(object)_spanMappingService; 
+            }
+
+            if (typeof(TService) == typeof(IDocumentExcerptService))
+            {
+                if (_excerptService == null)
+                {
+                    lock (_lock)
+                    {
+                        if (_excerptService == null)
+                        {
+                            _excerptService = new RazorDocumentExcerptService(_document, GetService<ISpanMappingService>());
+                        }
+                    }
+                }
+
+                return (TService)(object)_excerptService;
+            }
+
+            return this as TService;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorSpanMappingService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorSpanMappingService.cs
new file mode 100644
index 0000000000..7303d8a69a
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorSpanMappingService.cs
@@ -0,0 +1,102 @@
+// 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;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal class RazorSpanMappingService: ISpanMappingService
+    {
+        private readonly DocumentSnapshot _document;
+
+        public RazorSpanMappingService(DocumentSnapshot document)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            _document = document;
+        }
+
+        public async Task<ImmutableArray<MappedSpanResult>> MapSpansAsync(
+            Document document, 
+            IEnumerable<TextSpan> spans, 
+            CancellationToken cancellationToken)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            if (spans == null)
+            {
+                throw new ArgumentNullException(nameof(spans));
+            }
+
+            // Called on an uninitialized document.
+            if (_document == null)
+            {
+                return ImmutableArray.Create<MappedSpanResult>();
+            }
+
+            var source = await _document.GetTextAsync().ConfigureAwait(false);
+            var output = await _document.GetGeneratedOutputAsync().ConfigureAwait(false);
+
+            var results = ImmutableArray.CreateBuilder<MappedSpanResult>();
+            foreach (var span in spans)
+            {
+                if (TryGetLinePositionSpan(span, source, output.GetCSharpDocument(), out var linePositionSpan))
+                {
+                    results.Add(new MappedSpanResult(output.Source.FilePath, linePositionSpan, span));
+                }
+                else
+                {
+                    results.Add(default);
+                }
+            }
+
+            return results.ToImmutable();
+        }
+
+        // Internal for testing.
+        internal static bool TryGetLinePositionSpan(TextSpan span, SourceText source, RazorCSharpDocument output, out LinePositionSpan linePositionSpan)
+        {
+            var mappings = output.SourceMappings;
+            for (var i = 0; i < mappings.Count; i++)
+            {
+                var mapping = mappings[i];
+                var original = mapping.OriginalSpan.AsTextSpan();
+                var generated = mapping.GeneratedSpan.AsTextSpan();
+
+                if (!generated.Contains(span))
+                {
+                    // If the search span isn't contained within the generated span, it is not a match. 
+                    // A C# identifier won't cover multiple generated spans.
+                    continue;
+                }
+
+                var leftOffset = span.Start - generated.Start;
+                var rightOffset = span.End - generated.End;
+                if (leftOffset >= 0 && rightOffset <= 0)
+                {
+                    // This span mapping contains the span.
+                    var adjusted = new TextSpan(original.Start + leftOffset, (original.End + rightOffset) - (original.Start + leftOffset));
+                    linePositionSpan = source.Lines.GetLinePositionSpan(adjusted);
+                    return true;
+                }
+            }
+
+            linePositionSpan = default;
+            return false;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/TagHelperResolutionResult.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/TagHelperResolutionResult.cs
index 0e8c7b19ef..581892a9fb 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/TagHelperResolutionResult.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/TagHelperResolutionResult.cs
@@ -7,9 +7,9 @@ using Microsoft.AspNetCore.Razor.Language;
 
 namespace Microsoft.CodeAnalysis.Razor
 {
-    public sealed class TagHelperResolutionResult
+    internal sealed class TagHelperResolutionResult
     {
-        internal static TagHelperResolutionResult Empty = new TagHelperResolutionResult(Array.Empty<TagHelperDescriptor>(), Array.Empty<RazorDiagnostic>());
+        internal static readonly TagHelperResolutionResult Empty = new TagHelperResolutionResult(Array.Empty<TagHelperDescriptor>(), Array.Empty<RazorDiagnostic>());
 
         public TagHelperResolutionResult(IReadOnlyList<TagHelperDescriptor> descriptors, IReadOnlyList<RazorDiagnostic> diagnostics)
         {
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/ComponentTagHelperDescriptorProvider.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor/ComponentTagHelperDescriptorProvider.cs
new file mode 100644
index 0000000000..def7c30ac0
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor/ComponentTagHelperDescriptorProvider.cs
@@ -0,0 +1,132 @@
+// 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;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public class ComponentTagHelperDescriptorProvider : RazorEngineFeatureBase, ITagHelperDescriptorProvider
+    {
+        public int Order { get; set; }
+
+        public void Execute(TagHelperDescriptorProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var compilation = context.GetCompilation();
+            if (compilation == null)
+            {
+                // No compilation, nothing to do.
+                return;
+            }
+
+            var componentSymbol = compilation.GetTypeByMetadataName(TagHelperTypes.IComponent);
+            if (componentSymbol == null || componentSymbol.TypeKind == TypeKind.Error)
+            {
+                // Could not find attributes we care about in the compilation. Nothing to do.
+                return;
+            }
+
+            var types = new List<INamedTypeSymbol>();
+            var visitor = new ComponentTypeVisitor(componentSymbol, types);
+
+            // We always visit the global namespace.
+            visitor.Visit(compilation.Assembly.GlobalNamespace);
+
+            foreach (var reference in compilation.References)
+            {
+                if (compilation.GetAssemblyOrModuleSymbol(reference) is IAssemblySymbol assembly)
+                {
+                    if (IsTagHelperAssembly(assembly))
+                    {
+                        visitor.Visit(assembly.GlobalNamespace);
+                    }
+                }
+            }
+
+            for (var i = 0; i < types.Count; i++)
+            {
+                var type = types[i];
+                var descriptor = CreateDescriptor(type);
+
+                if (descriptor != null)
+                {
+                    context.Results.Add(descriptor);
+                }
+            }
+        }
+
+        private static TagHelperDescriptor CreateDescriptor(INamedTypeSymbol type)
+        {
+            var typeName = type.ToDisplayString(DefaultTagHelperDescriptorFactory.FullNameTypeDisplayFormat);
+            var assemblyName = type.ContainingAssembly.Identity.Name;
+
+            var descriptorBuilder = TagHelperDescriptorBuilder.Create(TagHelperConventions.ComponentKind, typeName, assemblyName);
+            descriptorBuilder.SetTypeName(typeName);
+            descriptorBuilder.Metadata[TagHelperMetadata.Runtime.Name] = TagHelperConventions.ComponentKind;
+
+            // Components have very simple matching rules. The type name (short) matches the tag name.
+            descriptorBuilder.TagMatchingRule(r => r.TagName = type.Name);
+
+            var descriptor = descriptorBuilder.Build();
+            return descriptor;
+        }
+
+        private bool IsTagHelperAssembly(IAssemblySymbol assembly)
+        {
+            return assembly.Name != null && !assembly.Name.StartsWith("System.", StringComparison.Ordinal);
+        }
+
+        // Visits top-level types and finds interface implementations.
+        internal class ComponentTypeVisitor : SymbolVisitor
+        {
+            private readonly INamedTypeSymbol _componentSymbol;
+            private readonly List<INamedTypeSymbol> _results;
+
+            public ComponentTypeVisitor(INamedTypeSymbol componentSymbol, List<INamedTypeSymbol> results)
+            {
+                _componentSymbol = componentSymbol;
+                _results = results;
+            }
+
+            public override void VisitNamedType(INamedTypeSymbol symbol)
+            {
+                if (IsComponent(symbol))
+                {
+                    _results.Add(symbol);
+                }
+            }
+
+            public override void VisitNamespace(INamespaceSymbol symbol)
+            {
+                foreach (var member in symbol.GetMembers())
+                {
+                    Visit(member);
+                }
+            }
+
+            public override void VisitAssembly(IAssemblySymbol symbol)
+            {
+                // This as a simple yet high-value optimization that excludes the vast majority of
+                // assemblies that (by definition) can't contain a component.
+                if (symbol.Name != null && !symbol.Name.StartsWith("System.", StringComparison.Ordinal))
+                {
+                    Visit(symbol.GlobalNamespace);
+                }
+            }
+
+            internal bool IsComponent(INamedTypeSymbol symbol)
+            {
+                return
+                    symbol.DeclaredAccessibility == Accessibility.Public &&
+                    !symbol.IsAbstract &&
+                    symbol.AllInterfaces.Contains(_componentSymbol);
+            }
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/DefaultTagHelperDescriptorFactory.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor/DefaultTagHelperDescriptorFactory.cs
index 9b6b07f639..333003f5b2 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor/DefaultTagHelperDescriptorFactory.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor/DefaultTagHelperDescriptorFactory.cs
@@ -23,7 +23,7 @@ namespace Microsoft.CodeAnalysis.Razor
         private readonly INamedTypeSymbol _restrictChildrenAttributeSymbol;
         private readonly INamedTypeSymbol _editorBrowsableAttributeSymbol;
 
-        private static readonly SymbolDisplayFormat FullNameTypeDisplayFormat =
+        internal static readonly SymbolDisplayFormat FullNameTypeDisplayFormat =
             SymbolDisplayFormat.FullyQualifiedFormat
                 .WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted)
                 .WithMiscellaneousOptions(SymbolDisplayFormat.FullyQualifiedFormat.MiscellaneousOptions & (~SymbolDisplayMiscellaneousOptions.UseSpecialTypes));
@@ -434,6 +434,6 @@ namespace Microsoft.CodeAnalysis.Razor
             return false;
         }
 
-        private static string GetFullName(ITypeSymbol type) => type.ToDisplayString(FullNameTypeDisplayFormat);
+        protected static string GetFullName(ITypeSymbol type) => type.ToDisplayString(FullNameTypeDisplayFormat);
     }
 }
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj b/src/Razor/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj
index 4391fc3cdf..e1efe71870 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure.</Description>
-    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,9 +13,4 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(MicrosoftCodeAnalysisCommonPackageVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="$(SystemRuntimeInteropServicesRuntimeInformationPackageVersion)" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/Properties/AssemblyInfo.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor/Properties/AssemblyInfo.cs
index 0de18b91dc..2da745cbad 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor/Properties/AssemblyInfo.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor/Properties/AssemblyInfo.cs
@@ -2,7 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Runtime.CompilerServices;
-
+[assembly: InternalsVisibleTo("rzls, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/SourceSpanExtensions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor/SourceSpanExtensions.cs
new file mode 100644
index 0000000000..51fd517024
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor/SourceSpanExtensions.cs
@@ -0,0 +1,16 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal static class SourceSpanExtensions
+    {
+        public static TextSpan AsTextSpan(this SourceSpan sourceSpan)
+        {
+            return new TextSpan(sourceSpan.AbsoluteIndex, sourceSpan.Length);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/TagHelperTypes.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor/TagHelperTypes.cs
index d2ea2e3507..c0989576c7 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor/TagHelperTypes.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor/TagHelperTypes.cs
@@ -7,6 +7,8 @@ namespace Microsoft.CodeAnalysis.Razor
     {
         public const string ITagHelper = "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper";
 
+        public const string IComponent = "Microsoft.AspNetCore.Components.IComponent";
+
         public const string IDictionary = "System.Collections.Generic.IDictionary`2";
 
         public const string HtmlAttributeNameAttribute = "Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNameAttribute";
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj
index 369dd82020..74ac5b3583 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure.</Description>
-    <TargetFrameworks>net46</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <EnableApiCheck>false</EnableApiCheck>
   </PropertyGroup>
 
@@ -25,4 +25,8 @@
     <PackageReference Include="StreamJsonRpc" Version="$(StreamJsonRpcPackageVersion)" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' ">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssemblies)" PrivateAssets="All" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RazorServiceBase.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RazorServiceBase.cs
index 289d75cc0f..32e8e3bcb6 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RazorServiceBase.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RazorServiceBase.cs
@@ -76,6 +76,16 @@ namespace Microsoft.CodeAnalysis.Remote.Razor
                 return null;
             }
 
+            public override bool IsImportDocument(DocumentSnapshot document)
+            {
+                throw new NotImplementedException();
+            }
+
+            public override IEnumerable<DocumentSnapshot> GetRelatedDocuments(DocumentSnapshot document)
+            {
+                throw new NotImplementedException();
+            }
+
             public override RazorProjectEngine GetProjectEngine()
             {
                 throw new NotImplementedException();
diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/DotnetToolTask.cs b/src/Razor/src/Microsoft.NET.Sdk.Razor/DotnetToolTask.cs
index d0ec48f2b2..79694479a4 100644
--- a/src/Razor/src/Microsoft.NET.Sdk.Razor/DotnetToolTask.cs
+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/DotnetToolTask.cs
@@ -124,7 +124,7 @@ namespace Microsoft.AspNetCore.Razor.Tasks
             string commandLineCommands,
             out int result)
         {
-#if !NET46
+#if !NETFRAMEWORK
             if (!SuppressCurrentUserOnlyPipeOptions && !Enum.IsDefined(typeof(PipeOptions), PipeOptionCurrentUserOnly))
             {
                 // For security reasons, we don't want to spin up a server that doesn't
diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
index a835c5d06a..6f6d4be734 100644
--- a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
@@ -1,30 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains MSBuild support for Razor.</Description>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;netstandard2.0;net46</TargetFrameworks>
 
     <TargetName>Microsoft.NET.Sdk.Razor.Tasks</TargetName>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-
+    <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
+    <Serviceable>true</Serviceable>
+    <SdkOutputPath>bin\$(Configuration)\sdk-output\</SdkOutputPath>
     <!-- Do not disable ApiCheck. We need to be aware of when we make changes to the Tasks sicne they need to be backwards compatible. -->
   </PropertyGroup>
 
-   <ItemGroup>
-    <None Include="Sdk\*" Pack="true" PackagePath="Sdk\" />
-    <None Include="build\**\*" Pack="true" PackagePath="build" />
-    <None Include="buildMultiTargeting\**\*" Pack="true" PackagePath="buildMultiTargeting" />
-    <None Include="bin\$(Configuration)\net46\$(TargetName).*" Pack="true" PackagePath="tasks\net46" />
-    <None Include="bin\$(Configuration)\netstandard2.0\$(TargetName).*" Pack="true" PackagePath="tasks\netstandard2.0" />
-  </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" PrivateAssets="All" />
-  </ItemGroup>
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
 
-   <ItemGroup>
-    <SignedPackageFile Include="$(TargetPath)" PackagePath="tasks/$(TargetFramework)/$(TargetFileName)" Certificate="$(AssemblySigningCertName)" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)'=='netstandard2.0'" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)'=='netcoreapp3.0'" />
   </ItemGroup>
 
   <ItemGroup>
@@ -41,4 +33,64 @@
       <Link>Shared\Client.cs</Link>
     </Compile>
   </ItemGroup>
+
+  <Target Name="LayoutDependencies" BeforeTargets="Build" Condition="'$(IsInnerBuild)' != 'true'">
+    <!-- Layout tasks, compiler, and extensions in the sdk-output folder. The entire folder structure gets packaged as-is into the SDK -->
+    <MSBuild
+      Projects="..\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj"
+      Properties="PublishDir=$(MSBuildProjectDirectory)\$(SdkOutputPath)tools\netcoreapp3.0;TargetFramework=netcoreapp3.0"
+      Targets="Publish" />
+
+    <ItemGroup>
+      <MvcRazorExtenionOutput Include="..\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(MvcRazorExtenionOutput)" DestinationFolder="$(SdkOutputPath)extensions\mvc-3-0\" />
+
+    <ItemGroup>
+      <ProjectOutput Include="..\Microsoft.NET.Sdk.Razor\bin\$(Configuration)\net46*\Microsoft.NET.Sdk.Razor.Tasks.*" />
+      <ProjectOutput Include="..\Microsoft.NET.Sdk.Razor\bin\$(Configuration)\netstandard2.0*\Microsoft.NET.Sdk.Razor.Tasks.*" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(ProjectOutput)" DestinationFiles="$(SdkOutputPath)tasks\%(RecursiveDir)%(FileName)%(Extension)" />
+  </Target>
+
+  <ItemGroup>
+    <SignedPackageFile Include="$(SdkOutputPath)tasks\net46\$(TargetName).dll" Certificate="$(AssemblySigningCertName)"  />
+    <SignedPackageFile Include="$(SdkOutputPath)tasks\netstandard2.0\$(TargetName).dll" Certificate="$(AssemblySigningCertName)"  />
+    <SignedPackageFile Include="$(SdkOutputPath)extensions\**\*.dll" Certificate="$(AssemblySigningCertName)"  />
+
+    <SignedPackageFile Include="$(SdkOutputPath)tools\netcoreapp3.0\rzc.dll" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="$(SdkOutputPath)tools\netcoreapp3.0\Newtonsoft.Json.dll" Certificate="$(AssemblySigning3rdPartyCertName)" />
+
+    <!-- Binaries that should be signed by corefx/roslyn -->
+    <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\Microsoft.CodeAnalysis.dll" />
+    <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\Microsoft.CodeAnalysis.CSharp.dll" />
+    <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\runtimes\unix\lib\netstandard1.3\System.Text.Encoding.CodePages.dll" />
+    <ExcludePackageFileFromSigning Include="$(SdkOutputPath)tools\netcoreapp3.0\runtimes\win\lib\netstandard1.3\System.Text.Encoding.CodePages.dll" />
+  </ItemGroup>
+
+  <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="LayoutDependencies">
+
+    <PropertyGroup>
+      <!-- Make sure we create a symbols.nupkg -->
+      <IncludeSymbols>true</IncludeSymbols>
+      <NuspecProperties>
+        id=$(MSBuildProjectName);
+        version=$(PackageVersion);
+        authors=$(Authors);
+        licenseUrl=$(PackageLicenseUrl);
+        projectUrl=$(PackageProjectUrl);
+        iconUrl=$(PackageIconUrl);
+        copyright=$(Copyright);
+        description=$(Description);
+        tags=$([MSBuild]::Escape($(PackageTags)));
+        serviceable=$(Serviceable);
+        repositoryUrl=$(RepositoryUrl);
+        repositoryCommit=$(RepositoryCommit);
+        targetframework=$(TargetFramework);
+        outputpath=$(OutputPath)\sdk-output;
+      </NuspecProperties>
+    </PropertyGroup>
+  </Target>
 </Project>
diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec
new file mode 100644
index 0000000000..8593fba340
--- /dev/null
+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <authors>$authors$</authors>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <licenseUrl>$licenseUrl$</licenseUrl>
+    <projectUrl>$projectUrl$</projectUrl>
+    <iconUrl>$iconUrl$</iconUrl>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+    <tags>$tags$</tags>
+    <serviceable>$serviceable$</serviceable>
+    <repository type="git" url="$repositoryUrl$" commit="$repositoryCommit$" />
+  </metadata>
+
+  <files>
+    <file src="Sdk\*" target="Sdk" />
+    <file src="build\**" target="build" />
+    <file src="buildMultiTargeting\**" target="buildMultiTargeting" />
+
+    <file src="$outputpath$\**" target="\" />
+  </files>
+</package>
diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/RazorGenerate.cs b/src/Razor/src/Microsoft.NET.Sdk.Razor/RazorGenerate.cs
index 0ed71d0ada..61246c8484 100644
--- a/src/Razor/src/Microsoft.NET.Sdk.Razor/RazorGenerate.cs
+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/RazorGenerate.cs
@@ -17,6 +17,7 @@ namespace Microsoft.AspNetCore.Razor.Tasks
         };
 
         private const string GeneratedOutput = "GeneratedOutput";
+        private const string DocumentKind = "DocumentKind";
         private const string TargetPath = "TargetPath";
         private const string FullPath = "FullPath";
         private const string Identity = "Identity";
@@ -41,6 +42,8 @@ namespace Microsoft.AspNetCore.Razor.Tasks
         [Required]
         public string TagHelperManifest { get; set; }
 
+        public bool GenerateDeclaration { get; set; }
+
         internal override string Command => "generate";
 
         protected override bool ValidateParameters()
@@ -99,6 +102,13 @@ namespace Microsoft.AspNetCore.Razor.Tasks
                 builder.AppendLine("-o");
                 var outputPath = Path.Combine(ProjectRoot, input.GetMetadata(GeneratedOutput));
                 builder.AppendLine(outputPath);
+
+                var kind = input.GetMetadata(DocumentKind);
+                if (!string.IsNullOrEmpty(kind))
+                {
+                    builder.AppendLine("-k");
+                    builder.AppendLine(kind);
+                }
             }
 
             builder.AppendLine("-p");
@@ -113,6 +123,11 @@ namespace Microsoft.AspNetCore.Razor.Tasks
             builder.AppendLine("-c");
             builder.AppendLine(Configuration[0].GetMetadata(Identity));
 
+            if (GenerateDeclaration)
+            {
+                builder.AppendLine("--generate-declaration");
+            }
+
             for (var i = 0; i < Extensions.Length; i++)
             {
                 builder.AppendLine("-n");
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.CodeGeneration.targets b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
similarity index 80%
rename from src/Razor/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.CodeGeneration.targets
rename to src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
index c81d741e1f..72d170a7d2 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.CodeGeneration.targets
+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.CodeGeneration.targets
@@ -1,3 +1,15 @@
+<!--
+***********************************************************************************************
+Microsoft.NET.Sdk.Razor.CodeGeneration
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+
 <Project ToolsVersion="14.0">
   <!--
     Targets used for Razor SDK code generation. Support for the RazorCoreGenerate target.
@@ -14,18 +26,20 @@
     AssemblyFile="$(RazorSdkBuildTasksAssembly)"
     Condition="'$(RazorSdkBuildTasksAssembly)' != ''" />
 
-  <!-- 
+  <!--
     Consider these properties to be private to this targets file. The main Razor SDK should define all of the properties
-    that we use to pass data back and forth. 
+    that we use to pass data back and forth.
   -->
   <PropertyGroup>
     <!-- Used for tag helper discovery -->
     <_RazorTagHelperInputCache>$(IntermediateOutputPath)$(TargetName).TagHelpers.input.cache</_RazorTagHelperInputCache>
     <_RazorTagHelperOutputCache>$(IntermediateOutputPath)$(TargetName).TagHelpers.output.cache</_RazorTagHelperOutputCache>
-    
+
     <!-- Used to hash file inputs for RazorGenerate -->
     <_RazorGenerateInputsHash></_RazorGenerateInputsHash>
     <_RazorGenerateInputsHashFile>$(IntermediateOutputPath)$(MSBuildProjectName).RazorCoreGenerate.cache</_RazorGenerateInputsHashFile>
+
+    <_RazorToolAssembly Condition="'$(_RazorToolAssembly)'==''">$(RazorSdkDirectoryRoot)tools\netcoreapp3.0\rzc.dll</_RazorToolAssembly>
   </PropertyGroup>
 
   <!--
@@ -33,8 +47,8 @@
 
     This is part of the chain of targets that are called once we've actually committed to generating code.
   -->
-  <Target 
-    Name="_HashRazorGenerateInputs" 
+  <Target
+    Name="_HashRazorGenerateInputs"
     Condition="'@(RazorGenerateWithTargetPath)' != ''">
 
     <Hash ItemsToHash="@(RazorGenerateWithTargetPath)">
@@ -56,14 +70,19 @@
     </ItemGroup>
   </Target>
 
+  <Target
+    Name="_RazorEnsureCompiled"
+    Condition="!Exists('$(_RazorGenerateTargetReferenceAssembly)')"
+    DependsOnTargets="Compile" />
+
   <Target
     Name="ResolveTagHelperRazorGenerateInputs"
-    DependsOnTargets="_EnsureRazorTasksAssemblyDefined;Compile"
-    Inputs="$(MSBuildAllProjects);@(RazorReferencePath)"
+    Inputs="$(MSBuildAllProjects);@(RazorReferencePath);$(_RazorGenerateTargetReferenceAssembly)"
+    DependsOnTargets="_RazorEnsureCompiled"
     Outputs="$(_RazorTagHelperInputCache)"
     Condition="'@(RazorGenerateWithTargetPath)' != ''">
 
-    <!-- 
+    <!--
       We're manipulating our output directly here because we want to separate the actual up-to-date check
       of RazorCoreGenerate from the output of this target. Many times the set of tag helpers doesn't change
       so we don't need to regenerate the code.
@@ -86,7 +105,7 @@
       Version="$(RazorLangVersion)"
       Configuration="@(ResolvedRazorConfiguration)"
       Extensions="@(ResolvedRazorExtension)"
-      Assemblies="@(RazorReferencePath)"
+      Assemblies="@(RazorReferencePath);$(_RazorGenerateTargetReferenceAssembly)"
       ProjectRoot="$(MSBuildProjectDirectory)"
       TagHelperManifest="$(_RazorTagHelperOutputCache)">
       <Output
@@ -107,7 +126,6 @@
 
   <PropertyGroup>
     <RazorCoreGenerateDependsOn>
-      _EnsureRazorTasksAssemblyDefined;
       _HashRazorGenerateInputs;
       _ResolveRazorGenerateOutputs;
     </RazorCoreGenerateDependsOn>
@@ -153,14 +171,10 @@
 
   <Target Name="_ResolveGeneratedRazorCompileInputs">
     <ItemGroup>
-      <RazorCompile Include="@(_RazorGenerateOutput)" />
+      <RazorCompile 
+        Include="%(RazorGenerateWithTargetPath.GeneratedOutput)" 
+        Condition="'%(RazorGenerateWithTargetPath.DocumentKind)'=='mvc'" />
     </ItemGroup>
   </Target>
 
-  <Target Name="_EnsureRazorTasksAssemblyDefined">
-    <Error 
-      Text="Assembly location for Razor SDK Tasks was not specified. The most likely cause is an older incompatible version of Microsoft.NET.Sdk.Razor, or Microsoft.NET.Sdk.Web used by this project. Please target a newer version of the .NET Core SDK." 
-      Condition="'$(RazorSdkBuildTasksAssembly)' == ''" />
-  </Target>
-
 </Project>
diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
index 102315ebc4..bf20970c29 100644
--- a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets
@@ -54,6 +54,7 @@ Copyright (c) .NET Foundation. All rights reserved.
           Inputs="$(MSBuildAllProjects);
                   @(RazorCompile);
                   $(AssemblyOriginatorKeyFile);
+                  $(_RazorCompileTargetReferenceAssembly);
                   @(RazorReferencePath);
                   @(CompiledLicenseFile);
                   @(LinkResource);
@@ -147,7 +148,7 @@ Copyright (c) .NET Foundation. All rights reserved.
          Prefer32Bit="$(Prefer32Bit)"
          PreferredUILang="$(PreferredUILang)"
          ProvideCommandLineArgs="$(ProvideCommandLineArgs)"
-         References="@(RazorReferencePath)"
+         References="@(RazorReferencePath);$(_RazorCompileTargetReferenceAssembly)"
          ReportAnalyzer="$(ReportAnalyzer)"
          Resources="@(_RazorCoreCompileResourceInputs);@(CompiledLicenseFile)"
          ResponseFiles="$(CompilerResponseFile)"
diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
new file mode 100644
index 0000000000..15593fa737
--- /dev/null
+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Component.targets
@@ -0,0 +1,285 @@
+<!--
+***********************************************************************************************
+Microsoft.NET.Sdk.Razor.Component.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+
+<Project ToolsVersion="14.0">
+
+  <PropertyGroup>
+    <!-- Used for tracking inputs to component generation -->
+    <_RazorComponentInputHash></_RazorComponentInputHash>
+    <_RazorComponentInputCacheFile>$(IntermediateOutputPath)$(MSBuildProjectName).RazorComponent.input.cache</_RazorComponentInputCacheFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Path used for the temporary compilation we produce for component discovery -->
+    <_RazorComponentDeclarationAssembly Include="$(_RazorComponentDeclarationOutputPath)$(TargetName).dll" />
+  </ItemGroup>
+
+  <Target Name="_HashRazorComponentInputs" Condition="'@(RazorComponentWithTargetPath->Count())'!='0'">
+    <Hash ItemsToHash="@(RazorComponentWithTargetPath)">
+      <Output TaskParameter="HashResult" PropertyName="_RazorComponentInputHash" />
+    </Hash>
+
+    <MakeDir
+      Directories="$(IntermediateOutputPath)"
+      Condition="!Exists('$(IntermediateOutputPath)')" />
+
+    <WriteLinesToFile
+      Lines="$(_RazorComponentInputHash)"
+      File="$(_RazorComponentInputCacheFile)"
+      Overwrite="True"
+      WriteOnlyWhenDifferent="True" />
+
+    <ItemGroup>
+      <FileWrites Include="$(_RazorComponentInputCacheFile)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_ResolveRazorComponentOutputs" Condition="'@(RazorComponentWithTargetPath->Count())'!='0'">
+    <Error
+      Text="RazorComponentWithTargetPath item '%(RazorComponentWithTargetPath.Identity)' does not specify required metadata 'GeneratedDeclaration'."
+      Condition="'%(RazorComponentWithTargetPath.GeneratedDeclaration)' == ''" />
+
+    <ItemGroup>
+      <_RazorComponentDeclaration Include="%(RazorComponentWithTargetPath.GeneratedDeclaration)" />
+      <_RazorComponentDefinition Include="%(RazorComponentWithTargetPath.GeneratedOutput)" />
+    </ItemGroup>
+  </Target>
+
+  <PropertyGroup>
+    <RazorGenerateComponentDeclarationDependsOn>
+      _HashRazorComponentInputs;
+      _ResolveRazorComponentOutputs;
+    </RazorGenerateComponentDeclarationDependsOn>
+  </PropertyGroup>
+
+  <!--
+    Generates 'declaration' files for each component, that only have that class and member declarations.
+    These files participate in the design-time-build for intellisense, and are used at build-time
+    when discovering components for a 'real' build.
+  -->
+  <Target
+    Name="RazorGenerateComponentDeclaration"
+    DependsOnTargets="$(RazorGenerateComponentDeclarationDependsOn)"
+    Inputs="$(MSBuildAllProjects);@(RazorComponentWithTargetPath);$(_RazorComponentInputCacheFile)"
+    Outputs="@(_RazorComponentDeclaration)"
+    Condition="'@(RazorComponentWithTargetPath->Count())'!='0'">
+
+    <ItemGroup>
+      <_RazorComponentDeclarationSources Include="@(RazorComponentWithTargetPath)">
+        <GeneratedOutput>%(RazorComponentWithTargetPath.GeneratedDeclaration)</GeneratedOutput>
+      </_RazorComponentDeclarationSources>
+    </ItemGroup>
+
+    <MakeDir
+      Directories="%(_RazorComponentDeclaration.RelativeDir)"
+      Condition="!Exists('%(_RazorComponentDeclaration.RelativeDir)')" />
+
+    <PropertyGroup>
+      <!-- This file will not exist, but we need some value -->
+      <_RazorComponentDeclarationManifest>$(IntermediateOutputPath)$(MSBuildProjectName).RazorComponents.declaration.json</_RazorComponentDeclarationManifest>
+    </PropertyGroup>
+
+    <RazorGenerate
+      Debug="$(_RazorDebugGenerateCodeTask)"
+      DebugTool="$(_RazorDebugGenerateCodeTool)"
+      ToolAssembly="$(_RazorToolAssembly)"
+      UseServer="$(UseRazorBuildServer)"
+      ForceServer="$(_RazorForceBuildServer)"
+      PipeName="$(_RazorBuildServerPipeName)"
+      Version="$(RazorLangVersion)"
+      Configuration="@(ResolvedRazorConfiguration)"
+      Extensions="@(ResolvedRazorExtension)"
+      Sources="@(_RazorComponentDeclarationSources)"
+      ProjectRoot="$(MSBuildProjectDirectory)"
+      TagHelperManifest="$(_RazorComponentDeclarationManifest)"
+      GenerateDeclaration="true" />
+
+    <ItemGroup>
+      <FileWrites Include="@(_RazorComponentDeclaration)" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(DesignTimeBuild)'=='true'">
+      <Compile Include="@(_RazorComponentDeclaration)" />
+    </ItemGroup>
+  </Target>
+
+  <Target
+    Name="RazorCompileComponentDeclaration"
+    Inputs="
+      $(MSBuildAllProjects);
+      @(_RazorComponentDeclaration);
+      @(Compile);
+      $(AssemblyOriginatorKeyFile);
+      @(ReferencePathWithRefAssemblies);
+      @(CompiledLicenseFile);
+      @(LinkResource);
+      $(ResolvedCodeAnalysisRuleSet);
+      @(AdditionalFiles)"
+    Outputs="@(_RazorComponentDeclarationAssembly);$(NonExistentFile)"
+    Condition="'$(DesignTimeBuild)'!='true' AND '$(Language)'=='C#' AND '@(_RazorComponentDeclaration)' != ''">
+
+    <MakeDir Directories="%(_RazorComponentDeclarationAssembly.RelativeDir)" />
+
+    <!-- These two compiler warnings are raised when a reference is bound to a different version
+             than specified in the assembly reference version number.  MSBuild raises the same warning in this case,
+             so the compiler warning would be redundant. -->
+    <PropertyGroup Condition="('$(TargetFrameworkVersion)' != 'v1.0') and ('$(TargetFrameworkVersion)' != 'v1.1')">
+      <NoWarn>$(NoWarn);1701;1702</NoWarn>
+    </PropertyGroup>
+
+    <PropertyGroup>
+      <!-- To match historical behavior, when inside VS11+ disable the warning from csc.exe indicating that no sources were passed in-->
+      <NoWarn Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(VisualStudioVersion)' != '' AND '$(VisualStudioVersion)' &gt; '10.0'">$(NoWarn);2008</NoWarn>
+    </PropertyGroup>
+
+    <ItemGroup Condition="'$(TargetingClr2Framework)' == 'true'">
+      <ReferencePathWithRefAssemblies>
+        <EmbedInteropTypes />
+      </ReferencePathWithRefAssemblies>
+    </ItemGroup>
+
+    <PropertyGroup>
+      <!-- If the user has specified AppConfigForCompiler, we'll use it. If they have not, but they set UseAppConfigForCompiler,
+                 then we'll use AppConfig -->
+      <AppConfigForCompiler Condition="'$(AppConfigForCompiler)' == '' AND '$(UseAppConfigForCompiler)' == 'true'">$(AppConfig)</AppConfigForCompiler>
+    </PropertyGroup>
+
+    <!-- Prefer32Bit was introduced in .NET 4.5. Set it to false if we are targeting 4.0 -->
+    <PropertyGroup Condition="('$(TargetFrameworkVersion)' == 'v4.0')">
+      <Prefer32Bit>false</Prefer32Bit>
+    </PropertyGroup>
+
+    <!-- TODO: Remove this ItemGroup once it has been moved to "_GenerateCompileInputs" target in Microsoft.Common.CurrentVersion.targets.
+         https://github.com/dotnet/roslyn/issues/12223 -->
+    <ItemGroup Condition="('$(AdditionalFileItemNames)' != '')">
+      <AdditionalFileItems Include="$(AdditionalFileItemNames)" />
+      <AdditionalFiles Include="@(%(AdditionalFileItems.Identity))" />
+    </ItemGroup>
+
+    <PropertyGroup Condition="'$(UseSharedCompilation)' == ''">
+      <UseSharedCompilation>true</UseSharedCompilation>
+    </PropertyGroup>
+
+    <Csc
+         AdditionalLibPaths="$(AdditionalLibPaths)"
+         AddModules="@(AddModules)"
+         AdditionalFiles="@(AdditionalFiles)"
+         AllowUnsafeBlocks="$(AllowUnsafeBlocks)"
+         Analyzers="@(Analyzer)"
+         ApplicationConfiguration="$(AppConfigForCompiler)"
+         BaseAddress="$(BaseAddress)"
+         CheckForOverflowUnderflow="$(CheckForOverflowUnderflow)"
+         ChecksumAlgorithm="$(ChecksumAlgorithm)"
+         CodeAnalysisRuleSet="$(ResolvedCodeAnalysisRuleSet)"
+         CodePage="$(CodePage)"
+         DebugType="$(DebugType)"
+         DefineConstants="$(DefineConstants)"
+         DelaySign="$(DelaySign)"
+         DisabledWarnings="$(NoWarn)"
+         EmitDebugInformation="$(DebugSymbols)"
+         EnvironmentVariables="$(CscEnvironment)"
+         ErrorEndLocation="$(ErrorEndLocation)"
+         ErrorLog="$(ErrorLog)"
+         ErrorReport="$(ErrorReport)"
+         Features="$(Features)"
+         FileAlignment="$(FileAlignment)"
+         GenerateFullPaths="$(GenerateFullPaths)"
+         HighEntropyVA="$(HighEntropyVA)"
+         Instrument="$(Instrument)"
+         KeyContainer="$(KeyContainerName)"
+         KeyFile="$(KeyOriginatorFile)"
+         LangVersion="$(LangVersion)"
+         LinkResources="@(LinkResource)"
+         MainEntryPoint="$(StartupObject)"
+         ModuleAssemblyName="$(ModuleAssemblyName)"
+         NoConfig="true"
+         NoLogo="$(NoLogo)"
+         NoStandardLib="$(NoCompilerStandardLib)"
+         NoWin32Manifest="$(NoWin32Manifest)"
+         Optimize="$(Optimize)"
+         Deterministic="$(Deterministic)"
+         PublicSign="$(PublicSign)"
+         OutputAssembly="@(_RazorComponentDeclarationAssembly)"
+         Platform="$(PlatformTarget)"
+         Prefer32Bit="$(Prefer32Bit)"
+         PreferredUILang="$(PreferredUILang)"
+         ProvideCommandLineArgs="$(ProvideCommandLineArgs)"
+         References="@(ReferencePathWithRefAssemblies)"
+         ReportAnalyzer="$(ReportAnalyzer)"
+         Resources="@(CompiledLicenseFile)"
+         ResponseFiles="$(CompilerResponseFile)"
+         RuntimeMetadataVersion="$(RuntimeMetadataVersion)"
+         SharedCompilationId="$(SharedCompilationId)"
+         SkipCompilerExecution="$(SkipCompilerExecution)"
+         Sources="@(_RazorComponentDeclaration);@(Compile)"
+         SubsystemVersion="$(SubsystemVersion)"
+         TargetType="$(OutputType)"
+         ToolExe="$(CscToolExe)"
+         ToolPath="$(CscToolPath)"
+         TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
+         UseHostCompilerIfAvailable="$(UseHostCompilerIfAvailable)"
+         UseSharedCompilation="$(UseSharedCompilation)"
+         Utf8Output="$(Utf8Output)"
+         VsSessionGuid="$(VsSessionGuid)"
+         WarningLevel="$(WarningLevel)"
+         WarningsAsErrors="$(WarningsAsErrors)"
+         WarningsNotAsErrors="$(WarningsNotAsErrors)"
+         PathMap="$(PathMap)"
+         SourceLink="$(SourceLink)">
+      <Output TaskParameter="CommandLineArgs" ItemName="CscCommandLineArgs" />
+    </Csc>
+
+    <ItemGroup>
+      <FileWrites Include="@(_RazorComponentDeclarationAssembly)" Condition="Exists('@(_RazorComponentDeclarationAssembly)')" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_ResolveComponentRazorGenerateInputs">
+    <ItemGroup>
+      <!-- Add RazorComponent files to the set of files to be code-gened. -->
+      <RazorGenerateWithTargetPath Include="@(RazorComponentWithTargetPath)" />
+    </ItemGroup>
+
+    <!-- Point to the declaration assembly to perform taghelper discovery -->
+    <PropertyGroup>
+      <_RazorGenerateTargetReferenceAssembly>@(_RazorComponentDeclarationAssembly->Metadata('FullPath'))</_RazorGenerateTargetReferenceAssembly>
+    </PropertyGroup>
+  </Target>
+
+  <!-- 
+    Once RazorCompileComponentDeclaration is completed, we have all the inputs required for code generation of
+    RazorComponents and RazorGenerate items. We'll initialize the inputs for RazorGenerate and invoke it.
+    This should result in RazorGenerate \ RazorTagHelper targets no-oping when it get invoked as 
+    part of PrepareForRun \ PrepareForPublish for non-components (.cshtml) files.
+   -->
+  <Target
+    Name="RazorGenerateComponentDefinition"
+    DependsOnTargets="_ResolveComponentRazorGenerateInputs;RazorGenerate"
+    Condition="'$(DesignTimeBuild)' != 'true' AND '@(_RazorComponentDefinition->Count())' != '0' AND Exists('@(_RazorComponentDeclarationAssembly)')">
+
+    <ItemGroup Condition="'$(DesignTimeBuild)' != 'true'">
+      <Compile Include="@(_RazorComponentDefinition)" />
+    </ItemGroup>
+  </Target>
+
+  <PropertyGroup>
+    <RazorComponentGenerateCoreDependsOn>
+      RazorGenerateComponentDeclaration;
+      RazorCompileComponentDeclaration;
+      RazorGenerateComponentDefinition;
+    </RazorComponentGenerateCoreDependsOn>
+  </PropertyGroup>
+
+  <Target Name="RazorComponentGenerateCore" DependsOnTargets="$(RazorComponentGenerateCoreDependsOn)">
+  </Target>
+
+</Project>
diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
new file mode 100644
index 0000000000..995cb2cd90
--- /dev/null
+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
@@ -0,0 +1,92 @@
+<!--
+***********************************************************************************************
+Microsoft.Net.Sdk.Razor.Versions.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+<Project ToolsVersion="14.0">
+  <!--
+      Initialize properties and items inferred using the project version. This file is not imported in projects referencing
+      MVC \ Razor 2.2 or earlier since values specified here are provided via targets and props imported from NuGet packages
+      such as Microsoft.AspNetCore.Razor.Design.
+
+      The properties and items here are designed to be read by CPS so they should be just simple evaluation-time values
+      and should not require targets to initialize.
+  -->
+  <PropertyGroup>
+    <!--
+      MVC uses a ProvideApplicationPartFactoryAttribute on the generated assembly to load compiled views from assembly. Set this to false, to prevent generating this attribute.
+    -->
+    <GenerateProvideApplicationPartFactoryAttribute Condition="'$(GenerateProvideApplicationPartFactoryAttribute)'==''">true</GenerateProvideApplicationPartFactoryAttribute>
+
+    <!--
+      Determines if the Sdk is allowed to add additional attributes to the project assembly.
+      For instance, MVC will generally want to add attributes to support view discovery and runtime compilation.
+    -->
+    <GenerateRazorAssemblyInfo Condition="'$(GenerateRazorAssemblyInfo)'==''">true</GenerateRazorAssemblyInfo>
+
+    <!--
+      MVC will generally want to add support for runtime compilation, but only for applications.
+    -->
+    <GenerateRazorHostingAssemblyInfo Condition="'$(GenerateRazorHostingAssemblyInfo)'=='' AND '$(OutputType)'=='exe'">$(GenerateRazorAssemblyInfo)</GenerateRazorHostingAssemblyInfo>
+
+    <!--
+      The type name of the ApplicationPartFactory applied to the generated Razor file.
+    -->
+    <ProvideApplicationPartFactoryAttributeTypeName Condition="'$(ProvideApplicationPartFactoryAttributeTypeName)' == ''">Microsoft.AspNetCore.Mvc.ApplicationParts.CompiledRazorAssemblyApplicationPartFactory, Microsoft.AspNetCore.Mvc.Razor</ProvideApplicationPartFactoryAttributeTypeName>
+
+    <!-- Continue setting this property to maintain compat with legacy Razor.Design -->
+    <IsRazorCompilerReferenced Condition="'$(IsRazorCompilerReferenced)'==''">true</IsRazorCompilerReferenced>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <_TargetingNETCoreApp30OrLater Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(_TargetFrameworkVersionWithoutV)' &gt; '2.9'">true</_TargetingNETCoreApp30OrLater>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RazorLangVersion)'==''">
+    <RazorLangVersion Condition="'$(_TargetingNETCoreApp30OrLater)' == 'true'">3.0</RazorLangVersion>
+  </PropertyGroup>
+
+  <!--
+    Set the primary configuration supported by this SDK as the default configuration for Razor.
+  -->
+  <PropertyGroup Condition="'$(RazorDefaultConfiguration)'==''">
+    <RazorDefaultConfiguration Condition="'$(_TargetingNETCoreApp30OrLater)' == 'true'">MVC-3.0</RazorDefaultConfiguration>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!--
+      While technically the assembly in this package can provide support for the MVC-2.X, don't declare
+      it here. The IDE is hardcoded to inject 2.0 support when needed. The settings flowing through MSBuild should reflect
+      the project's runtime.
+    -->
+    <RazorConfiguration Include="MVC-3.0">
+      <Extensions>MVC-3.0;$(CustomRazorExtension)</Extensions>
+    </RazorConfiguration>
+  </ItemGroup>
+
+  <ItemGroup>
+    <RazorExtension Include="MVC-3.0">
+      <AssemblyName>Microsoft.AspNetCore.Mvc.Razor.Extensions</AssemblyName>
+      <AssemblyFilePath>$(RazorSdkDirectoryRoot)extensions\mvc-3-0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll</AssemblyFilePath>
+    </RazorExtension>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(GenerateRazorAssemblyInfo)'=='true' AND '$(ResolvedRazorCompileToolset)'=='RazorSdk' AND ('$(RazorCompileOnBuild)' == 'true' OR '$(RazorCompileOnPublish)' == 'true')">
+    <_RazorAssemblyAttribute Include="Microsoft.AspNetCore.Mvc.ApplicationParts.RelatedAssemblyAttribute">
+      <_Parameter1>$(RazorTargetName)</_Parameter1>
+    </_RazorAssemblyAttribute>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(GenerateProvideApplicationPartFactoryAttribute)' == 'true' AND '$(ProvideApplicationPartFactoryAttributeTypeName)'!=''">
+    <RazorTargetAssemblyAttribute Include="Microsoft.AspNetCore.Mvc.ApplicationParts.ProvideApplicationPartFactoryAttribute">
+      <_Parameter1>$(ProvideApplicationPartFactoryAttributeTypeName)</_Parameter1>
+    </RazorTargetAssemblyAttribute>
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index 64c5d8f61a..6df58f657e 100644
--- a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -21,6 +21,12 @@ Copyright (c) .NET Foundation. All rights reserved.
       we use the lack of the capability to detect downlevel scenarios.
     -->
     <ProjectCapability Include="DotNetCoreRazor"/>
+
+    <!--
+      Defines the ability to understand the configuration for the Razor language service provided by
+      the runtime/toolset packages. Introduced in 2.1
+    -->
+    <ProjectCapability Include="DotNetCoreRazorConfiguration"/>
   </ItemGroup>
 
   <!--
@@ -43,6 +49,9 @@ Copyright (c) .NET Foundation. All rights reserved.
     <PropertyPageSchema Include="$(MSBuildThisFileDirectory)Rules\RazorGeneral.xaml">
       <Context>Project</Context>
     </PropertyPageSchema>
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)Rules\RazorGenerateWithTargetPath.xaml">
+      <Context>Project</Context>
+    </PropertyPageSchema>
   </ItemGroup>
 
   <Target Name="RazorGenerateDesignTime" DependsOnTargets="ResolveRazorGenerateInputs;AssignRazorGenerateTargetPaths" Returns="@(RazorGenerateWithTargetPath)">
diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.props b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
index 2ac65f5424..673a61d3da 100644
--- a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
@@ -29,6 +29,11 @@ Copyright (c) .NET Foundation. All rights reserved.
     -->
     <EnableDefaultRazorGenerateItems Condition="'$(EnableDefaultRazorGenerateItems)'==''">true</EnableDefaultRazorGenerateItems>
 
+    <!--
+      Set to true to automatically include Razor (.razor) files in @(RazorComponent) from @(Content).
+    -->
+    <EnableDefaultRazorComponentItems Condition="'$(EnableDefaultRazorComponentItems)'==''">true</EnableDefaultRazorComponentItems>
+
     <!--
       Set to true to copy RazorGenerate items (.cshtml) to the publish directory.
 
@@ -61,14 +66,21 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!--
     Configures the file extension used for generated C# files.
     -->
-    <RazorGenerateOutputFileExtension>.g.cshtml.cs</RazorGenerateOutputFileExtension>
+    <RazorGenerateOutputFileExtension>.g.cs</RazorGenerateOutputFileExtension>
+
+    <!--
+    Configures the file extension used for the generated C# definition files.
+    -->
+    <RazorGenerateOutputDefinitionFileExtension>.g.i.cs</RazorGenerateOutputDefinitionFileExtension>
 
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(EnableDefaultItems)' == 'true' And '$(EnableDefaultContentItems)' == 'true'">
     <Content Include="**\*.cshtml" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
+    <Content Include="**\*.razor" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
     <None Remove="**\*.cshtml" />
+    <None Remove="**\*.razor" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 1790ba588d..704b14d22a 100644
--- a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -22,10 +22,15 @@ Copyright (c) .NET Foundation. All rights reserved.
   <Import Project="$(CustomBeforeRazorSdkTargets)" Condition="'$(CustomBeforeRazorSdkTargets)' != '' and Exists('$(CustomBeforeRazorSdkTargets)')"/>
 
   <PropertyGroup>
-    <RazorSdkBuildTasksDirectoryRoot Condition="'$(RazorSdkBuildTasksDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\..\tasks\</RazorSdkBuildTasksDirectoryRoot>
+    <!-- Paths to tools, tasks, and extensions are calculated relative to the RazorSdkDirectoryRoot. This can be modified to test a local build. -->
+    <RazorSdkDirectoryRoot Condition="'$(RazorSdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\..\</RazorSdkDirectoryRoot>
+    <RazorSdkBuildTasksDirectoryRoot Condition="'$(RazorSdkBuildTasksDirectoryRoot)'==''">$(RazorSdkDirectoryRoot)tasks\</RazorSdkBuildTasksDirectoryRoot>
     <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">netstandard2.0</_RazorSdkTasksTFM>
     <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net46</_RazorSdkTasksTFM>
     <RazorSdkBuildTasksAssembly>$(RazorSdkBuildTasksDirectoryRoot)$(_RazorSdkTasksTFM)\Microsoft.NET.Sdk.Razor.Tasks.dll</RazorSdkBuildTasksAssembly>
+
+    <_TargetFrameworkVersionWithoutV>$(TargetFrameworkVersion.TrimStart('vV'))</_TargetFrameworkVersionWithoutV>
+    <_EnableAllInclusiveRazorSdk Condition="'$(_EnableInclusiveRazorSdk)' == '' AND '$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(_TargetFrameworkVersionWithoutV)' &gt; '2.9'">true</_EnableAllInclusiveRazorSdk>
   </PropertyGroup>
 
   <!--
@@ -45,12 +50,23 @@ Copyright (c) .NET Foundation. All rights reserved.
       ResolveTagHelperRazorGenerateInputs
     </PrepareForRazorGenerateDependsOn>
 
+    <PrepareForRazorComponentGenerateDependsOn>
+      ResolveRazorConfiguration;
+      ResolveRazorComponentInputs;
+      AssignRazorComponentTargetPaths;
+    </PrepareForRazorComponentGenerateDependsOn>
+
     <RazorGenerateDependsOn>
       PrepareForRazorGenerate;
       _CheckForMissingRazorCompiler;
       RazorCoreGenerate
     </RazorGenerateDependsOn>
-  
+
+    <RazorComponentGenerateDependsOn>
+      PrepareForRazorComponentGenerate;
+      RazorComponentGenerateCore
+    </RazorComponentGenerateDependsOn>
+
     <PrepareForRazorCompileDependsOn>
       RazorGenerate;
       ResolveRazorCompileInputs;
@@ -76,6 +92,11 @@ Copyright (c) .NET Foundation. All rights reserved.
       _RazorAddDebugSymbolsProjectOutputGroupOutput
     </DebugSymbolsProjectOutputGroupDependsOn>
 
+    <CoreCompileDependsOn>
+      RazorComponentGenerate;
+      $(CoreCompileDependsOn)
+    </CoreCompileDependsOn>
+
     <PrepareForBuildDependsOn>
       $(PrepareForBuildDependsOn);
       ResolveRazorGenerateInputs
@@ -123,13 +144,20 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!-- Output directory used for generated files -->
     <RazorGenerateIntermediateOutputPath Condition="'$(RazorGenerateIntermediateOutputPath)'==''">$(IntermediateOutputPath)Razor\</RazorGenerateIntermediateOutputPath>
 
+    <_RazorComponentDeclarationOutputPath Condition="'$(_RazorComponentDeclarationOutputPath)'==''">$(IntermediateOutputPath)RazorDeclaration\</_RazorComponentDeclarationOutputPath>
+
+    <!--
+      Use the suffix .Views when producing compiled view assemblies. This matches the requirements for Mvc's ViewsFeatureProvider.
+    -->
+    <RazorTargetNameSuffix Condition="'$(_EnableInclusiveRazorSdk)' == '' AND '$(RazorTargetNameSuffix)'==''">.Views</RazorTargetNameSuffix>
+
     <!-- Suffix appended to $(TargetName) to produce $(RazorTargetName), the name of the assembly produced by Razor -->
     <RazorTargetNameSuffix Condition="'$(RazorTargetNameSuffix)' == ''">.Razor</RazorTargetNameSuffix>
-    
+
     <!-- File name (without extension) of the assembly produced by Razor -->
     <RazorTargetName Condition="'$(RazorTargetName)'==''">$(TargetName)$(RazorTargetNameSuffix)</RazorTargetName>
 
-   <!--
+    <!--
       The compatibility zone - these properties were provided by the MVC Precompilation tool and they
       map to supported settings in Razor SDK.
 
@@ -187,8 +215,8 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ResolvedRazorCompileToolset Condition="'$(MvcRazorCompileOnPublish)' == '' AND '$(RazorCompileToolset)' == 'PrecompilationTool'">$(RazorCompileToolset)</ResolvedRazorCompileToolset>
     <ResolvedRazorCompileToolset Condition="'$(MvcRazorCompileOnPublish)' == '' AND '$(RazorCompileToolset)' == 'RazorSdk'">$(RazorCompileToolset)</ResolvedRazorCompileToolset>
 
-    <!-- If RazorSdk is not referenced, fall-back to Precompilation tool -->
-    <ResolvedRazorCompileToolset Condition="'$(ResolvedRazorCompileToolset)' == 'RazorSdk' And '$(IsRazorCompilerReferenced)' != 'true'">PrecompilationTool</ResolvedRazorCompileToolset>
+    <!-- If RazorSdk is not referenced, fall-back to Precompilation tool when referenced by a 2.2 or earlier targeting project. -->
+    <ResolvedRazorCompileToolset Condition="'$(ResolvedRazorCompileToolset)' == 'RazorSdk' And '$(IsRazorCompilerReferenced)' != 'true' AND '$(_EnableAllInclusiveRazorSdk)' != 'true'">PrecompilationTool</ResolvedRazorCompileToolset>
 
     <!-- Previous versions of the precompilation tool still depends on the msbuild property 'MvcRazorCompileOnPublish'. Hence, setting it to the old default value -->
     <MvcRazorCompileOnPublish Condition="'$(MvcRazorCompileOnPublish)' == ''">true</MvcRazorCompileOnPublish>
@@ -200,7 +228,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <ItemGroup>
     <!-- Used to creating the final compiled Razor dll -->
     <RazorIntermediateAssembly Condition="'$(RazorIntermediateAssembly)'==''" Include="$(IntermediateOutputPath)$(RazorTargetName).dll" />
-    <!-- Used in Compilation.targets -->   
+    <!-- Used in Compilation.targets -->
     <_RazorDebugSymbolsIntermediatePath Condition="'$(_RazorDebugSymbolsProduced)'=='true'" Include="$(IntermediateOutputPath)$(RazorTargetName).pdb" />
   </ItemGroup>
 
@@ -219,13 +247,24 @@ Copyright (c) .NET Foundation. All rights reserved.
       Condition="'$(RazorCompileOnBuild)'=='true' AND '@(Content->WithMetadataValue('Extension', '.cshtml'))' != ''" />
   </ItemGroup>
 
-
   <!--
     These are the targets that generate code using Razor, separated from the main file for ease of maintenance.
     Most targets related to Razor code generation are defined there.
   -->
+
+  <!-- Determine what compiler and versions of the language to target. For 2.x targeting projects, these are carried by packages referenced by the project. Use this -->
+
+  <!-- Use the 2.x compiler if we're building an application that references Microsoft.AspNetCore.Razor.Design. -->
   <Import Project="$(RazorCodeGenerationTargetsPath)"
-    Condition="'$(RazorCodeGenerationTargetsPath)' != '' AND Exists('$(RazorCodeGenerationTargetsPath)')" />
+    Condition="'$(IsRazorCompilerReferenced)' == 'true' AND '$(RazorCodeGenerationTargetsPath)' != '' AND Exists('$(RazorCodeGenerationTargetsPath)')" />
+
+  <!-- When targeting 3.x and later projects, we have to infer configuration by inspecting the project. -->
+  <Import Project="Microsoft.NET.Sdk.Razor.Configuration.targets" Condition="'$(_EnableAllInclusiveRazorSdk)' == 'true'" />
+
+  <!-- For projects targeting 3.x and later, use the compiler that ships in the Sdk -->
+  <Import Project="Microsoft.NET.Sdk.Razor.CodeGeneration.targets" Condition="'$(_EnableAllInclusiveRazorSdk)' == 'true'" />
+
+  <Import Project="Microsoft.NET.Sdk.Razor.Component.targets" />
 
   <Import Project="Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets" />
 
@@ -239,9 +278,15 @@ Copyright (c) .NET Foundation. All rights reserved.
   <Target Name="PrepareForRazorGenerate" DependsOnTargets="$(PrepareForRazorGenerateDependsOn)">
   </Target>
 
+  <Target Name="PrepareForRazorComponentGenerate" DependsOnTargets="$(PrepareForRazorComponentGenerateDependsOn)">
+  </Target>
+
   <Target Name="RazorGenerate" DependsOnTargets="$(RazorGenerateDependsOn)">
   </Target>
 
+  <Target Name="RazorComponentGenerate" DependsOnTargets="$(RazorComponentGenerateDependsOn)">
+  </Target>
+
   <Target Name="PrepareForRazorCompile" DependsOnTargets="$(PrepareForRazorCompileDependsOn)">
   </Target>
 
@@ -252,15 +297,15 @@ Copyright (c) .NET Foundation. All rights reserved.
     Computes the applicable @(ResolvedRazorConfiguration) and @(ResolvedRazorExtension) items that match the project's
     configuration. 
   -->
-  <Target 
+  <Target
     Name="ResolveRazorConfiguration"
     Condition="'$(RazorDefaultConfiguration)'!=''">
 
     <ItemGroup>
-      <ResolvedRazorConfiguration Include="@(RazorConfiguration)" Condition="'%(RazorConfiguration.Identity)'=='$(RazorDefaultConfiguration)'" />
+      <ResolvedRazorConfiguration Include="@(RazorConfiguration->WithMetadataValue('Identity', '$(RazorDefaultConfiguration)')->Distinct())" />
     </ItemGroup>
 
-    <FindInList List="@(RazorExtension)" ItemSpecToFind="@(RazorConfiguration->Metadata('Extensions'))">
+    <FindInList List="@(RazorExtension)" ItemSpecToFind="@(ResolvedRazorConfiguration->Metadata('Extensions'))">
       <Output TaskParameter="ItemFound" ItemName="ResolvedRazorExtension" />
     </FindInList>
   </Target>
@@ -280,7 +325,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <_GenerateRazorAssemblyInfoDependsOn>RazorGetAssemblyAttributes;$(_GenerateRazorAssemblyInfoDependsOn)</_GenerateRazorAssemblyInfoDependsOn>
   </PropertyGroup>
 
-  <Target 
+  <Target
     Name="RazorGetAssemblyAttributes"
     Condition="'$(GenerateRazorHostingAssemblyInfo)'=='true' and '$(RazorDefaultConfiguration)'!=''"
     DependsOnTargets="ResolveRazorConfiguration">
@@ -335,7 +380,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       '$(CopyRazorGenerateFilesToPublishDirectory)'=='false' and 
       '$(ResolvedRazorCompileToolset)'=='RazorSdk' and 
       '$(RazorCompileOnPublish)'=='true'">
-      
+
       <Content Condition="'%(Content.Extension)'=='.cshtml'" CopyToPublishDirectory="Never" />
     </ItemGroup>
 
@@ -347,6 +392,40 @@ Copyright (c) .NET Foundation. All rights reserved.
     </ItemGroup>
   </Target>
 
+  <Target Name="ResolveRazorComponentInputs">
+    <!--
+    Gathers input source files for Razor component generation. This is a separate target so that we can avoid
+    lots of work when there are no inputs for code generation.
+
+    NOTE: This target is called as part of an incremental build scenario in VS. Do not perform any work
+    outside of calculating RazorComponent items in this target.
+    -->
+
+    <ItemGroup Condition="'$(EnableDefaultRazorComponentItems)'=='true'">
+      <RazorComponent Include="@(Content)" Condition="'%(Content.Extension)'=='.razor'" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="AssignRazorComponentTargetPaths" Condition="'@(RazorComponent)' != ''">
+    <AssignTargetPath Files="@(RazorComponent)" RootFolder="$(MSBuildProjectDirectory)">
+      <Output TaskParameter="AssignedFiles" ItemName="RazorComponentWithTargetPath" />
+    </AssignTargetPath>
+
+    <ItemGroup>
+      <RazorComponentWithTargetPath Condition="'%(RazorComponentWithTargetPath.GeneratedOutput)' == ''">
+        <GeneratedOutput>$(RazorGenerateIntermediateOutputPath)%(RazorComponentWithTargetPath.TargetPath)$(RazorGenerateOutputFileExtension)</GeneratedOutput>
+      </RazorComponentWithTargetPath>
+
+      <RazorComponentWithTargetPath Condition="'%(RazorComponentWithTargetPath.GeneratedDeclaration)' == ''">
+        <GeneratedDeclaration>$(_RazorComponentDeclarationOutputPath)%(RazorComponentWithTargetPath.TargetPath)$(RazorGenerateOutputFileExtension)</GeneratedDeclaration>
+      </RazorComponentWithTargetPath>
+
+      <RazorComponentWithTargetPath Condition="'%(RazorComponentWithTargetPath.DocumentKind)' == ''">
+        <DocumentKind>component</DocumentKind>
+      </RazorComponentWithTargetPath>
+    </ItemGroup>
+  </Target>
+
   <Target Name="AssignRazorGenerateTargetPaths" Condition="'@(RazorGenerate)' != ''">
     <AssignTargetPath Files="@(RazorGenerate)" RootFolder="$(MSBuildProjectDirectory)">
       <Output TaskParameter="AssignedFiles" ItemName="RazorGenerateWithTargetPath" />
@@ -354,7 +433,11 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <ItemGroup>
       <RazorGenerateWithTargetPath Condition="'%(RazorGenerateWithTargetPath.GeneratedOutput)' == ''">
-        <GeneratedOutput>$(RazorGenerateIntermediateOutputPath)$([System.IO.Path]::ChangeExtension('%(RazorGenerateWithTargetPath.TargetPath)', '$(RazorGenerateOutputFileExtension)'))</GeneratedOutput>
+        <GeneratedOutput>$(RazorGenerateIntermediateOutputPath)%(RazorGenerateWithTargetPath.TargetPath)$(RazorGenerateOutputFileExtension)</GeneratedOutput>
+      </RazorGenerateWithTargetPath>
+
+      <RazorGenerateWithTargetPath Condition="'%(RazorGenerateWithTargetPath.DocumentKind)' == ''">
+        <DocumentKind>mvc</DocumentKind>
       </RazorGenerateWithTargetPath>
     </ItemGroup>
   </Target>
@@ -367,8 +450,20 @@ Copyright (c) .NET Foundation. All rights reserved.
     DependsOnTargets="ResolveReferences">
     <ItemGroup>
       <RazorReferencePath Include="@(ReferencePath)"/>
-      <RazorReferencePath Include="$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)$(TargetName)$(TargetExt)'))"/>
     </ItemGroup>
+
+    <PropertyGroup>
+      <!--
+        Assembly of the project used as input in RazorGenerate. This property is overwritten to point to the definition assembly when components are present.
+      -->
+      <_RazorGenerateTargetReferenceAssembly Condition="'$(_RazorGenerateTargetReferenceAssembly)'==''">
+        @(IntermediateAssembly->Metadata('FullPath'))
+      </_RazorGenerateTargetReferenceAssembly>
+
+      <_RazorCompileTargetReferenceAssembly Condition="'$(_RazorCompileTargetReferenceAssembly)'==''">
+        @(IntermediateAssembly->Metadata('FullPath'))
+      </_RazorCompileTargetReferenceAssembly>
+    </PropertyGroup>
   </Target>
 
   <!--
@@ -399,7 +494,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     This target just hooks up other targets since Publish and PrepareForPublish don't have a DependsOnTargets
     property we can use. 
   -->
-  <Target 
+  <Target
     Name="_RazorPrepareForPublish"
     AfterTargets="PrepareForPublish"
     DependsOnTargets="RazorCompile"
@@ -409,7 +504,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <!--
     This target adds the Razor assembly to the BuiltProjectOutputGroupOutput - which is used as input to the Pack target.
   -->
-  <Target 
+  <Target
     Name="_RazorAddBuiltProjectOutputGroupOutput"
     DependsOnTargets="_ResolveRazorTargetPath;ResolveRazorGenerateInputs"
     Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnBuild)'=='true'">
@@ -428,7 +523,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ItemGroup Condition="Exists('@(_RazorDebugSymbolsIntermediatePath)')">
       <DebugSymbolsProjectOutputGroupOutput Include="%(_RazorDebugSymbolsIntermediatePath.FullPath)" FinalOutputPath="$(RazorTargetDir)$(RazorTargetName).pdb" />
     </ItemGroup>
-    
+
   </Target>
 
   <!--
@@ -444,7 +539,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     Called as part of GetCopyToOutputDirectoryItems - this target populates the list of items that get
     copied to the output directory when building as a project reference.
   -->
-  <Target 
+  <Target
     Name="_RazorGetCopyToOutputDirectoryItems"
     DependsOnTargets="ResolveRazorGenerateInputs"
     Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnBuild)'=='true'">
@@ -500,8 +595,8 @@ Copyright (c) .NET Foundation. All rights reserved.
     Called as part of CopyFilesToOutputDirectory - this target is called when building the project to copy
     files to the output directory.
   -->
-  <Target 
-    Name="_RazorCopyFilesToOutputDirectory" 
+  <Target
+    Name="_RazorCopyFilesToOutputDirectory"
     DependsOnTargets="_ResolveRazorTargetPath;RazorCompile"
     AfterTargets="CopyFilesToOutputDirectory"
     Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnBuild)'=='true'">
@@ -522,9 +617,9 @@ Copyright (c) .NET Foundation. All rights reserved.
       <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
     </Copy>
 
-    <Message 
-      Importance="High" 
-      Text="$(MSBuildProjectName) -&gt; @(_RazorAssembly->'%(FullPath)')" 
+    <Message
+      Importance="High"
+      Text="$(MSBuildProjectName) -&gt; @(_RazorAssembly->'%(FullPath)')"
       Condition="Exists('@(RazorIntermediateAssembly)') and '$(CopyBuildOutputToOutputDirectory)' == 'true' and '$(SkipCopyBuildProduct)'!='true'" />
 
     <!-- Copy the Razor debug information file (.pdb), if any -->
@@ -550,7 +645,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <Touch Files="@(CopyUpToDateMarker)" AlwaysCreate="true" Condition="'@(_RazorAssembly)' != ''">
       <Output TaskParameter="TouchedFiles" ItemName="FileWrites" />
     </Touch>
-    
+
   </Target>
 
   <!--
@@ -590,7 +685,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       most usages of Razor. There's no setting that excludes just the ref assemblies, so we do it ourselves. 
     -->
     <ItemGroup>
-      <ResolvedFileToPublish 
+      <ResolvedFileToPublish
         Remove="%(ResolvedFileToPublish.Identity)"
         Condition="'%(ResolvedFileToPublish.RelativePath)'=='$(RefAssembliesFolderName)\%(Filename)%(Extension)'"/>
     </ItemGroup>
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BraceSmartIndenter.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BraceSmartIndenter.cs
index 4de857b966..1c04b06710 100644
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BraceSmartIndenter.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/BraceSmartIndenter.cs
@@ -5,12 +5,12 @@ using System;
 using System.Text;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Operations;
 using ITextBuffer = Microsoft.VisualStudio.Text.ITextBuffer;
-using Span = Microsoft.AspNetCore.Razor.Language.Legacy.Span;
 
 namespace Microsoft.VisualStudio.Editor.Razor
 {
@@ -274,13 +274,15 @@ namespace Microsoft.VisualStudio.Editor.Razor
         }
 
         // Internal for testing
-        internal static bool ContainsInvalidContent(Span owner)
+        internal static bool ContainsInvalidContent(SyntaxNode owner)
         {
-            // We only support whitespace based content. Any non-whitespace content is an unkonwn to us
+            // We only support whitespace based content. Any non-whitespace content is an unknown to us
             // in regards to indentation.
-            for (var i = 0; i < owner.Tokens.Count; i++)
+            var children = owner.ChildNodes();
+            for (var i = 0; i < children.Count; i++)
             {
-                if (!string.IsNullOrWhiteSpace(owner.Tokens[i].Content))
+                if (!(children[i] is SyntaxToken token) ||
+                    !string.IsNullOrWhiteSpace(token.Content))
                 {
                     return true;
                 }
@@ -290,18 +292,18 @@ namespace Microsoft.VisualStudio.Editor.Razor
         }
 
         // Internal for testing
-        internal static bool IsUnlinkedSpan(Span owner)
+        internal static bool IsUnlinkedSpan(SyntaxNode owner)
         {
             return owner == null ||
-                owner.Next == null ||
-                owner.Previous == null;
+                owner.NextSpan() == null ||
+                owner.PreviousSpan() == null;
         }
 
         // Internal for testing
-        internal static bool SurroundedByInvalidContent(Span owner)
+        internal static bool SurroundedByInvalidContent(SyntaxNode owner)
         {
-            return owner.Next.Kind != SpanKindInternal.MetaCode ||
-                owner.Previous.Kind != SpanKindInternal.MetaCode;
+            return !owner.NextSpan().IsMetaCodeSpanKind() ||
+                !owner.PreviousSpan().IsMetaCodeSpanKind();
         }
 
         internal static bool BeforeClosingBrace(int linePosition, ITextSnapshotLine lineSnapshot)
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorIndentationFactsService.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorIndentationFactsService.cs
index f69274fa15..8b460df9c0 100644
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorIndentationFactsService.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorIndentationFactsService.cs
@@ -5,8 +5,8 @@ using System;
 using System.ComponentModel.Composition;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Microsoft.VisualStudio.Text;
-using Span = Microsoft.AspNetCore.Razor.Language.Legacy.Span;
 
 namespace Microsoft.VisualStudio.Editor.Razor
 {
@@ -63,8 +63,8 @@ namespace Microsoft.VisualStudio.Editor.Razor
 
             var previousLineEndIndex = GetPreviousLineEndIndex(syntaxTreeSnapshot, line);
             var simulatedChange = new SourceChange(previousLineEndIndex, 0, string.Empty);
-            var owningSpan = syntaxTree.Root.LocateOwner(simulatedChange);
-            if (owningSpan == null || owningSpan.Kind == SpanKindInternal.Code)
+            var owner = syntaxTree.Root.LocateOwner(simulatedChange);
+            if (owner == null || owner.IsCodeSpanKind())
             {
                 // Example,
                 // @{\n
@@ -74,20 +74,19 @@ namespace Microsoft.VisualStudio.Editor.Razor
             }
 
             int? desiredIndentation = null;
-            SyntaxTreeNode owningChild = owningSpan;
-            while (owningChild.Parent != null)
+            while (owner.Parent != null)
             {
-                var owningParent = owningChild.Parent;
-                for (var i = 0; i < owningParent.Children.Count; i++)
+                var children = owner.Parent.ChildNodes();
+                for (var i = 0; i < children.Count; i++)
                 {
-                    var currentChild = owningParent.Children[i];
+                    var currentChild = children[i];
                     if (IsCSharpOpenCurlyBrace(currentChild))
                     {
-                        var lineText = line.Snapshot.GetLineFromLineNumber(currentChild.Start.LineIndex).GetText();
+                        var lineText = line.Snapshot.GetLineFromLineNumber(currentChild.GetSourceLocation(syntaxTree.Source).LineIndex).GetText();
                         desiredIndentation = GetIndentLevelOfLine(lineText, tabSize) + indentSize;
                     }
 
-                    if (currentChild == owningChild)
+                    if (currentChild == owner)
                     {
                         break;
                     }
@@ -98,7 +97,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
                     return desiredIndentation;
                 }
 
-                owningChild = owningParent;
+                owner = owner.Parent;
             }
 
             // Couldn't determine indentation
@@ -139,12 +138,12 @@ namespace Microsoft.VisualStudio.Editor.Razor
         }
 
         // Internal for testing
-        internal static bool IsCSharpOpenCurlyBrace(SyntaxTreeNode currentChild)
+        internal static bool IsCSharpOpenCurlyBrace(SyntaxNode node)
         {
-            return currentChild is Span currentSpan &&
-                currentSpan.Tokens.Count == 1 &&
-                currentSpan.Tokens[0] is CSharpToken symbol &&
-                symbol.Type == CSharpTokenType.LeftBrace;
+            var children = node.ChildNodes();
+            return children.Count == 1 &&
+                children[0].IsToken &&
+                children[0].Kind == SyntaxKind.LeftBrace;
         }
     }
 }
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_2_0.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_2_0.cs
index ebf9e144f5..ef3c1779f0 100644
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_2_0.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_2_0.cs
@@ -11,7 +11,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
     [ExportCustomProjectEngineFactory("MVC-2.0", SupportsSerialization = true)]
     internal class LegacyProjectEngineFactory_2_0 : IProjectEngineFactory
     {
-        private const string AssemblyName = "Microsoft.AspNetCore.Mvc.Razor.Extensions";
+        private const string AssemblyName = "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X";
         public RazorProjectEngine Create(RazorConfiguration configuration, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure)
         {
             // Rewrite the assembly name into a full name just like this one, but with the name of the MVC design time assembly.
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_2_1.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_2_1.cs
index df8d04667c..35ec395c2e 100644
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_2_1.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_2_1.cs
@@ -13,7 +13,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
     [ExportCustomProjectEngineFactory("MVC-2.1", SupportsSerialization = true)]
     internal class LegacyProjectEngineFactory_2_1 : IProjectEngineFactory
     {
-        private const string AssemblyName = "Microsoft.AspNetCore.Mvc.Razor.Extensions";
+        private const string AssemblyName = "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X";
         public RazorProjectEngine Create(RazorConfiguration configuration, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure)
         {
             // Rewrite the assembly name into a full name just like this one, but with the name of the MVC design time assembly.
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_3_0.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_3_0.cs
new file mode 100644
index 0000000000..afdb06b05d
--- /dev/null
+++ b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/LegacyProjectEngineFactory_3_0.cs
@@ -0,0 +1,31 @@
+// 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;
+using System.Reflection;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Razor;
+
+namespace Microsoft.VisualStudio.Editor.Razor
+{
+    [ExportCustomProjectEngineFactory("MVC-3.0", SupportsSerialization = true)]
+    internal class LegacyProjectEngineFactory_3_0 : IProjectEngineFactory
+    {
+        private const string AssemblyName = "Microsoft.AspNetCore.Mvc.Razor.Extensions";
+        public RazorProjectEngine Create(RazorConfiguration configuration, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure)
+        {
+            // Rewrite the assembly name into a full name just like this one, but with the name of the MVC design time assembly.
+            var assemblyName = new AssemblyName(typeof(LegacyProjectEngineFactory_3_0).Assembly.FullName);
+            assemblyName.Name = AssemblyName;
+
+            var extension = new AssemblyExtension(configuration.ConfigurationName, Assembly.Load(assemblyName));
+            var initializer = extension.CreateInitializer();
+
+            return RazorProjectEngine.Create(configuration, fileSystem, b =>
+            {
+                initializer.Initialize(b);
+                configure?.Invoke(b);
+            });
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj
index aa50d39965..7ae2c1ff0a 100644
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj
+++ b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Microsoft.VisualStudio.Editor.Razor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Visual Studio agnostic Razor design-time infrastructure.</Description>
     <EnableApiCheck>false</EnableApiCheck>
   </PropertyGroup>
@@ -9,7 +9,10 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="$(MicrosoftVisualStudioTextUIPackageVersion)" />
+    <PackageReference Include="Microsoft.VisualStudio.ImageCatalog" Version="$(MicrosoftVisualStudioImageCatalogPackageVersion)" />
+    <PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="$(MicrosoftVisualStudioLanguageIntellisensePackageVersion)" />
+    <PackageReference Include="Microsoft.VisualStudio.Language" Version="$(MicrosoftVisualStudioLanguagePackageVersion)" />
+    <PackageReference Include="StreamJsonRpc" Version="$(StreamJsonRpcPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Properties/AssemblyInfo.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Properties/AssemblyInfo.cs
index 47ff95c911..1099d78d69 100644
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Properties/AssemblyInfo.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Properties/AssemblyInfo.cs
@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Runtime.CompilerServices;
+[assembly: InternalsVisibleTo("rzls, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionProvider.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionProvider.cs
index 6a2d017716..89d723159c 100644
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionProvider.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionProvider.cs
@@ -16,6 +16,7 @@ using Microsoft.CodeAnalysis.Completion;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Tags;
 using Microsoft.CodeAnalysis.Text;
+using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Projection;
 
@@ -36,16 +37,33 @@ namespace Microsoft.VisualStudio.Editor.Razor
             CSharpCodeParser.TagHelperPrefixDirectiveDescriptor,
         };
         private readonly Lazy<RazorCodeDocumentProvider> _codeDocumentProvider;
+        private readonly Lazy<CompletionProviderDependencies> _dependencies;
+        private readonly RazorTextBufferProvider _textBufferProvider;
 
         [ImportingConstructor]
-        public RazorDirectiveCompletionProvider([Import(typeof(RazorCodeDocumentProvider))] Lazy<RazorCodeDocumentProvider> codeDocumentProvider)
+        public RazorDirectiveCompletionProvider(
+            [Import(typeof(RazorCodeDocumentProvider))] Lazy<RazorCodeDocumentProvider> codeDocumentProvider,
+            [Import(typeof(CompletionProviderDependencies))] Lazy<CompletionProviderDependencies> dependencies,
+            RazorTextBufferProvider textBufferProvider)
         {
             if (codeDocumentProvider == null)
             {
                 throw new ArgumentNullException(nameof(codeDocumentProvider));
             }
 
+            if (dependencies == null)
+            {
+                throw new ArgumentNullException(nameof(dependencies));
+            }
+
+            if (textBufferProvider == null)
+            {
+                throw new ArgumentNullException(nameof(textBufferProvider));
+            }
+
             _codeDocumentProvider = codeDocumentProvider;
+            _dependencies = dependencies;
+            _textBufferProvider = textBufferProvider;
         }
 
         public override Task<CompletionDescription> GetDescriptionAsync(Document document, CompletionItem item, CancellationToken cancellationToken)
@@ -96,6 +114,13 @@ namespace Microsoft.VisualStudio.Editor.Razor
         [MethodImpl(MethodImplOptions.NoInlining)]
         private Task AddCompletionItems(CompletionContext context)
         {
+            if (!_textBufferProvider.TryGetFromDocument(context.Document, out var textBuffer) ||
+                _dependencies.Value.AsyncCompletionBroker.IsCompletionSupported(textBuffer.ContentType))
+            {
+                // Async completion is supported that code path will handle completion.
+                return Task.CompletedTask;
+            }
+
             if (!_codeDocumentProvider.Value.TryGetFromDocument(context.Document, out var codeDocument))
             {
                 // A Razor code document has not yet been associated with the document.
@@ -109,70 +134,41 @@ namespace Microsoft.VisualStudio.Editor.Razor
                 return Task.CompletedTask;
             }
 
-            if (!AtDirectiveCompletionPoint(syntaxTree, context))
+            if (!TryGetRazorSnapshotPoint(context, out var razorSnapshotPoint))
             {
-                // Can't have a valid directive at the current location.
+                // Could not find associated Razor location.
                 return Task.CompletedTask;
             }
 
-            var completionItems = GetCompletionItems(syntaxTree);
-            context.AddItems(completionItems);
+            var location = new SourceSpan(razorSnapshotPoint.Position, 0);
+            var razorCompletionItems = _dependencies.Value.CompletionFactsService.GetCompletionItems(syntaxTree, location);
 
-            return Task.CompletedTask;
-        }
-
-        // Internal virtual for testing
-        internal virtual IEnumerable<CompletionItem> GetCompletionItems(RazorSyntaxTree syntaxTree)
-        {
-            var directives = syntaxTree.Options.Directives.Concat(DefaultDirectives);
-            var completionItems = new List<CompletionItem>();
-            foreach (var directive in directives)
+            foreach (var razorCompletionItem in razorCompletionItems)
             {
-                var propertyDictionary = new Dictionary<string, string>(StringComparer.Ordinal);
-
-                if (!string.IsNullOrEmpty(directive.Description))
+                if (razorCompletionItem.Kind != RazorCompletionItemKind.Directive)
                 {
-                    propertyDictionary[DescriptionKey] = directive.Description;
+                    // Don't support any other types of completion kinds other than directives.
+                    continue;
+                }
+
+                var propertyDictionary = new Dictionary<string, string>(StringComparer.Ordinal);
+                if (!string.IsNullOrEmpty(razorCompletionItem.Description))
+                {
+                    propertyDictionary[DescriptionKey] = razorCompletionItem.Description;
                 }
 
                 var completionItem = CompletionItem.Create(
-                    directive.Directive,
+                    razorCompletionItem.InsertText,
                     // This groups all Razor directives together
                     sortText: "_RazorDirective_",
                     rules: CompletionItemRules.Create(formatOnCommit: false),
                     tags: ImmutableArray.Create(WellKnownTags.Intrinsic),
                     properties: propertyDictionary.ToImmutableDictionary());
-                completionItems.Add(completionItem);
+
+                context.AddItem(completionItem);
             }
 
-            return completionItems;
-        }
-
-        // Internal for testing
-        internal bool AtDirectiveCompletionPoint(RazorSyntaxTree syntaxTree, CompletionContext context)
-        {
-            if (TryGetRazorSnapshotPoint(context, out var razorSnapshotPoint))
-            {
-                var change = new SourceChange(razorSnapshotPoint.Position, 0, string.Empty);
-                var owner = syntaxTree.Root.LocateOwner(change);
-
-                if (owner == null)
-                {
-                    return false;
-                }
-
-                if (owner.ChunkGenerator is ExpressionChunkGenerator &&
-                    owner.Tokens.All(IsDirectiveCompletableSymbol) &&
-                    // Do not provide IntelliSense for explicit expressions. Explicit expressions will usually look like:
-                    // [@] [(] [DateTime.Now] [)]
-                    owner.Parent?.Children.Count > 1 &&
-                    owner.Parent.Children[1] == owner)
-                {
-                    return true;
-                }
-            }
-
-            return false;
+            return Task.CompletedTask;
         }
 
         protected virtual bool TryGetRazorSnapshotPoint(CompletionContext context, out SnapshotPoint snapshotPoint)
@@ -203,17 +199,41 @@ namespace Microsoft.VisualStudio.Editor.Razor
 
             return false;
         }
+    }
 
-        private static bool IsDirectiveCompletableSymbol(AspNetCore.Razor.Language.Legacy.IToken symbol)
+    // These types are only for this class to provide indirection for assembly loads.
+    internal abstract class CompletionProviderDependencies
+    {
+        public abstract RazorCompletionFactsService CompletionFactsService { get; }
+
+        public abstract IAsyncCompletionBroker AsyncCompletionBroker { get; }
+    }
+
+    [System.Composition.Shared]
+    [Export(typeof(CompletionProviderDependencies))]
+    internal class DefaultCompletionProviderDependencies : CompletionProviderDependencies
+    {
+        [ImportingConstructor]
+        public DefaultCompletionProviderDependencies(
+            RazorCompletionFactsService completionFactsService,
+            IAsyncCompletionBroker asyncCompletionBroker)
         {
-            if (!(symbol is CSharpToken csharpSymbol))
+            if (completionFactsService == null)
             {
-                return false;
+                throw new ArgumentNullException(nameof(completionFactsService));
             }
 
-            return csharpSymbol.Type == CSharpTokenType.Identifier ||
-                // Marker symbol
-                csharpSymbol.Type == CSharpTokenType.Unknown;
+            if (asyncCompletionBroker == null)
+            {
+                throw new ArgumentNullException(nameof(asyncCompletionBroker));
+            }
+
+            CompletionFactsService = completionFactsService;
+            AsyncCompletionBroker = asyncCompletionBroker;
         }
+
+        public override RazorCompletionFactsService CompletionFactsService { get; }
+
+        public override IAsyncCompletionBroker AsyncCompletionBroker { get; }
     }
 }
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionSource.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionSource.cs
new file mode 100644
index 0000000000..e4170e8acb
--- /dev/null
+++ b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionSource.cs
@@ -0,0 +1,122 @@
+// 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;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Razor;
+using Microsoft.VisualStudio.Core.Imaging;
+using Microsoft.VisualStudio.Imaging;
+using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion;
+using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion.Data;
+using Microsoft.VisualStudio.Text;
+using Microsoft.VisualStudio.Text.Adornments;
+
+namespace Microsoft.VisualStudio.Editor.Razor
+{
+    internal class RazorDirectiveCompletionSource : IAsyncCompletionSource
+    {
+        // Internal for testing
+        internal static readonly object DescriptionKey = new object();
+        // Hardcoding the Guid here to avoid a reference to Microsoft.VisualStudio.ImageCatalog.dll
+        // that is not present in Visual Studio for Mac
+        internal static readonly Guid ImageCatalogGuid = new Guid("{ae27a6b0-e345-4288-96df-5eaf394ee369}");
+        internal static readonly ImageElement DirectiveImageGlyph = new ImageElement(
+            new ImageId(ImageCatalogGuid, 3233), // KnownImageIds.Type = 3233
+            "Razor Directive.");
+        internal static readonly ImmutableArray<CompletionFilter> DirectiveCompletionFilters = new[] {
+            new CompletionFilter("Razor Directive", "r", DirectiveImageGlyph)
+        }.ToImmutableArray();
+
+        // Internal for testing
+        internal readonly VisualStudioRazorParser _parser;
+        private readonly RazorCompletionFactsService _completionFactsService;
+        private readonly ForegroundDispatcher _foregroundDispatcher;
+
+        public RazorDirectiveCompletionSource(
+            ForegroundDispatcher foregroundDispatcher,
+            VisualStudioRazorParser parser,
+            RazorCompletionFactsService completionFactsService)
+        {
+            if (foregroundDispatcher == null)
+            {
+                throw new ArgumentNullException(nameof(foregroundDispatcher));
+            }
+
+            if (parser == null)
+            {
+                throw new ArgumentNullException(nameof(parser));
+            }
+
+            if (completionFactsService == null)
+            {
+                throw new ArgumentNullException(nameof(completionFactsService));
+            }
+
+            _foregroundDispatcher = foregroundDispatcher;
+            _parser = parser;
+            _completionFactsService = completionFactsService;
+        }
+
+        public Task<CompletionContext> GetCompletionContextAsync(
+            IAsyncCompletionSession session,
+            CompletionTrigger trigger,
+            SnapshotPoint triggerLocation,
+            SnapshotSpan applicableSpan,
+            CancellationToken token)
+        {
+            _foregroundDispatcher.AssertBackgroundThread();
+
+            var syntaxTree = _parser.CodeDocument?.GetSyntaxTree();
+            var location = new SourceSpan(applicableSpan.Start.Position, applicableSpan.Length);
+            var razorCompletionItems = _completionFactsService.GetCompletionItems(syntaxTree, location);
+
+            var completionItems = new List<CompletionItem>();
+            foreach (var razorCompletionItem in razorCompletionItems)
+            {
+                if (razorCompletionItem.Kind != RazorCompletionItemKind.Directive)
+                {
+                    // Don't support any other types of completion kinds other than directives.
+                    continue;
+                }
+
+                var completionItem = new CompletionItem(
+                    displayText: razorCompletionItem.DisplayText,
+                    filterText: razorCompletionItem.DisplayText,
+                    insertText: razorCompletionItem.InsertText,
+                    source: this,
+                    icon: DirectiveImageGlyph,
+                    filters: DirectiveCompletionFilters,
+                    suffix: string.Empty,
+                    sortText: razorCompletionItem.DisplayText,
+                    attributeIcons: ImmutableArray<ImageElement>.Empty);
+                completionItem.Properties.AddProperty(DescriptionKey, razorCompletionItem.Description);
+                completionItems.Add(completionItem);
+            }
+            var context = new CompletionContext(completionItems.ToImmutableArray());
+            return Task.FromResult(context);
+        }
+
+        public Task<object> GetDescriptionAsync(IAsyncCompletionSession session, CompletionItem item, CancellationToken token)
+        {
+            if (!item.Properties.TryGetProperty<string>(DescriptionKey, out var directiveDescription))
+            {
+                directiveDescription = string.Empty;
+            }
+
+            return Task.FromResult<object>(directiveDescription);
+        }
+
+        public CompletionStartData InitializeCompletion(CompletionTrigger trigger, SnapshotPoint triggerLocation, CancellationToken token)
+        {
+            // The applicable span for completion is the piece of text a completion is for. For example:
+            //      @Date|Time.Now
+            // If you trigger completion at the | then the applicable span is the region of 'DateTime'; however, Razor
+            // doesn't know this information so we rely on Roslyn to define what the applicable span for a completion is.
+            return CompletionStartData.ParticipatesInCompletionIfAny;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionSourceProvider.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionSourceProvider.cs
new file mode 100644
index 0000000000..e1416c2b6e
--- /dev/null
+++ b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionSourceProvider.cs
@@ -0,0 +1,74 @@
+// 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;
+using System.ComponentModel.Composition;
+using System.Linq;
+using Microsoft.CodeAnalysis.Razor;
+using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion;
+using Microsoft.VisualStudio.Text;
+using Microsoft.VisualStudio.Text.Editor;
+using Microsoft.VisualStudio.Utilities;
+
+namespace Microsoft.VisualStudio.Editor.Razor
+{
+    [System.Composition.Shared]
+    [Export(typeof(IAsyncCompletionSourceProvider))]
+    [Name("Razor directive completion provider.")]
+    [ContentType(RazorLanguage.CoreContentType)]
+    internal class RazorDirectiveCompletionSourceProvider : IAsyncCompletionSourceProvider
+    {
+        private readonly ForegroundDispatcher _foregroundDispatcher;
+        private readonly RazorCompletionFactsService _completionFactsService;
+
+        [ImportingConstructor]
+        public RazorDirectiveCompletionSourceProvider(
+            ForegroundDispatcher foregroundDispatcher, 
+            RazorCompletionFactsService completionFactsService)
+        {
+            if (foregroundDispatcher == null)
+            {
+                throw new ArgumentNullException(nameof(foregroundDispatcher));
+            }
+
+            if (completionFactsService == null)
+            {
+                throw new ArgumentNullException(nameof(completionFactsService));
+            }
+
+            _foregroundDispatcher = foregroundDispatcher;
+            _completionFactsService = completionFactsService;
+        }
+
+        public IAsyncCompletionSource GetOrCreate(ITextView textView)
+        {
+            if (textView == null)
+            {
+                throw new ArgumentNullException(nameof(textView));
+            }
+
+            var razorBuffer = textView.BufferGraph.GetRazorBuffers().FirstOrDefault();
+            if (!razorBuffer.Properties.TryGetProperty(typeof(RazorDirectiveCompletionSource), out IAsyncCompletionSource completionSource) ||
+                completionSource == null)
+            {
+                completionSource = CreateCompletionSource(razorBuffer);
+                razorBuffer.Properties.AddProperty(typeof(RazorDirectiveCompletionSource), completionSource);
+            }
+
+            return completionSource;
+        }
+
+        // Internal for testing
+        internal IAsyncCompletionSource CreateCompletionSource(ITextBuffer razorBuffer)
+        {
+            if (!razorBuffer.Properties.TryGetProperty(typeof(VisualStudioRazorParser), out VisualStudioRazorParser parser))
+            {
+                // Parser hasn't been associated with the text buffer yet.
+                return null;
+            }
+
+            var completionSource = new RazorDirectiveCompletionSource(_foregroundDispatcher, parser, _completionFactsService);
+            return completionSource;
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorSyntaxTreePartialParser.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorSyntaxTreePartialParser.cs
index 377351c959..36b4955e3d 100644
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorSyntaxTreePartialParser.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorSyntaxTreePartialParser.cs
@@ -4,13 +4,13 @@
 using System;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
-using Span = Microsoft.AspNetCore.Razor.Language.Legacy.Span;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.VisualStudio.Editor.Razor
 {
     internal class RazorSyntaxTreePartialParser
     {
-        private Span _lastChangeOwner;
+        private SyntaxNode _lastChangeOwner;
         private bool _lastResultProvisional;
 
         public RazorSyntaxTreePartialParser(RazorSyntaxTree syntaxTree)
@@ -20,13 +20,15 @@ namespace Microsoft.VisualStudio.Editor.Razor
                 throw new ArgumentNullException(nameof(syntaxTree));
             }
 
-            // We mutate the existing syntax tree so we need to clone the one passed in so our mutations don't
-            // impact external state.
-            SyntaxTreeRoot = (Block)syntaxTree.Root.Clone();
+            OriginalSyntaxTree = syntaxTree;
+            ModifiedSyntaxTreeRoot = syntaxTree.Root;
         }
 
         // Internal for testing
-        internal Block SyntaxTreeRoot { get; }
+        internal RazorSyntaxTree OriginalSyntaxTree { get; }
+
+        // Internal for testing
+        internal SyntaxNode ModifiedSyntaxTreeRoot { get; private set; }
 
         public PartialParseResultInternal Parse(SourceChange change)
         {
@@ -43,20 +45,24 @@ namespace Microsoft.VisualStudio.Editor.Razor
             var result = PartialParseResultInternal.Rejected;
 
             // Try the last change owner
-            if (_lastChangeOwner != null && _lastChangeOwner.EditHandler.OwnsChange(_lastChangeOwner, change))
+            if (_lastChangeOwner != null)
             {
-                var editResult = _lastChangeOwner.EditHandler.ApplyChange(_lastChangeOwner, change);
-                result = editResult.Result;
-                if ((editResult.Result & PartialParseResultInternal.Rejected) != PartialParseResultInternal.Rejected)
+                var editHandler = _lastChangeOwner.GetSpanContext()?.EditHandler ?? SpanEditHandler.CreateDefault();
+                if (editHandler.OwnsChange(_lastChangeOwner, change))
                 {
-                    _lastChangeOwner.ReplaceWith(editResult.EditedSpan);
+                    var editResult = editHandler.ApplyChange(_lastChangeOwner, change);
+                    result = editResult.Result;
+                    if ((editResult.Result & PartialParseResultInternal.Rejected) != PartialParseResultInternal.Rejected)
+                    {
+                        ReplaceLastChangeOwner(editResult.EditedNode);
+                    }
                 }
 
                 return result;
             }
 
             // Locate the span responsible for this change
-            _lastChangeOwner = SyntaxTreeRoot.LocateOwner(change);
+            _lastChangeOwner = ModifiedSyntaxTreeRoot.LocateOwner(change);
 
             if (_lastResultProvisional)
             {
@@ -65,15 +71,29 @@ namespace Microsoft.VisualStudio.Editor.Razor
             }
             else if (_lastChangeOwner != null)
             {
-                var editResult = _lastChangeOwner.EditHandler.ApplyChange(_lastChangeOwner, change);
+                var editHandler = _lastChangeOwner.GetSpanContext()?.EditHandler ?? SpanEditHandler.CreateDefault();
+                var editResult = editHandler.ApplyChange(_lastChangeOwner, change);
                 result = editResult.Result;
                 if ((editResult.Result & PartialParseResultInternal.Rejected) != PartialParseResultInternal.Rejected)
                 {
-                    _lastChangeOwner.ReplaceWith(editResult.EditedSpan);
+                    ReplaceLastChangeOwner(editResult.EditedNode);
                 }
             }
 
             return result;
         }
+
+        private void ReplaceLastChangeOwner(SyntaxNode editedNode)
+        {
+            ModifiedSyntaxTreeRoot = ModifiedSyntaxTreeRoot.ReplaceNode(_lastChangeOwner, editedNode);
+            foreach (var node in ModifiedSyntaxTreeRoot.DescendantNodes())
+            {
+                if (node.Green == editedNode.Green)
+                {
+                    _lastChangeOwner = node;
+                    break;
+                }
+            }
+        }
     }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentGenerator/BackgroundDocumentGenerator.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/BackgroundDocumentGenerator.cs
similarity index 77%
rename from src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentGenerator/BackgroundDocumentGenerator.cs
rename to src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/BackgroundDocumentGenerator.cs
index eba3c12e25..947dc1155a 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentGenerator/BackgroundDocumentGenerator.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/BackgroundDocumentGenerator.cs
@@ -12,14 +12,13 @@ using Microsoft.Extensions.Internal;
 
 namespace Microsoft.CodeAnalysis.Razor
 {
-    // Deliberately not exported for now, until this feature is working end to end.
-    // [Export(typeof(ProjectSnapshotChangeTrigger))]
+    [Export(typeof(ProjectSnapshotChangeTrigger))]
     internal class BackgroundDocumentGenerator : ProjectSnapshotChangeTrigger
     {
-        private ForegroundDispatcher _foregroundDispatcher;
+        private readonly ForegroundDispatcher _foregroundDispatcher;
         private ProjectSnapshotManagerBase _projectManager;
 
-        private readonly Dictionary<DocumentKey, DocumentSnapshot> _files;
+        private readonly Dictionary<DocumentKey, DocumentSnapshot> _work;
         private Timer _timer;
 
         [ImportingConstructor]
@@ -31,17 +30,16 @@ namespace Microsoft.CodeAnalysis.Razor
             }
 
             _foregroundDispatcher = foregroundDispatcher;
-
-            _files = new Dictionary<DocumentKey, DocumentSnapshot>();
+            _work = new Dictionary<DocumentKey, DocumentSnapshot>();
         }
 
         public bool HasPendingNotifications
         {
             get
             {
-                lock (_files)
+                lock (_work)
                 {
-                    return _files.Count > 0;
+                    return _work.Count > 0;
                 }
             }
         }
@@ -135,11 +133,11 @@ namespace Microsoft.CodeAnalysis.Razor
 
             _foregroundDispatcher.AssertForegroundThread();
 
-            lock (_files)
+            lock (_work)
             {
                 // We only want to store the last 'seen' version of any given document. That way when we pick one to process
                 // it's always the best version to use.
-                _files[new DocumentKey(project.FilePath, document.FilePath)] = document;
+                _work[new DocumentKey(project.FilePath, document.FilePath)] = document;
 
                 StartWorker();
             }
@@ -172,18 +170,18 @@ namespace Microsoft.CodeAnalysis.Razor
 
                 OnStartingBackgroundWork();
 
-                DocumentSnapshot[] work;
-                lock (_files)
+                KeyValuePair<DocumentKey, DocumentSnapshot>[] work;
+                lock (_work)
                 {
-                    work = _files.Values.ToArray();
-                    _files.Clear();
+                    work = _work.ToArray();
+                    _work.Clear();
                 }
 
                 OnBackgroundCapturedWorkload();
 
                 for (var i = 0; i < work.Length; i++)
                 {
-                    var document = work[i];
+                    var document = work[i].Value;
                     try
                     {
                         await ProcessDocument(document);
@@ -196,14 +194,14 @@ namespace Microsoft.CodeAnalysis.Razor
 
                 OnCompletingBackgroundWork();
 
-                lock (_files)
+                lock (_work)
                 {
                     // Resetting the timer allows another batch of work to start.
                     _timer.Dispose();
                     _timer = null;
 
                     // If more work came in while we were running start the worker again.
-                    if (_files.Count > 0)
+                    if (_work.Count > 0)
                     {
                         StartWorker();
                     }
@@ -238,35 +236,61 @@ namespace Microsoft.CodeAnalysis.Razor
             switch (e.Kind)
             {
                 case ProjectChangeKind.ProjectAdded:
+                    {
+                        var projectSnapshot = e.Newer;
+                        foreach (var documentFilePath in projectSnapshot.DocumentFilePaths)
+                        {
+                            Enqueue(projectSnapshot, projectSnapshot.GetDocument(documentFilePath));
+                        }
+
+                        break;
+                    }
                 case ProjectChangeKind.ProjectChanged:
                     {
-                        var project = _projectManager.GetLoadedProject(e.ProjectFilePath);
-                        foreach (var documentFilePath in project.DocumentFilePaths)
+                        var projectSnapshot = e.Newer;
+                        foreach (var documentFilePath in projectSnapshot.DocumentFilePaths)
                         {
-                            Enqueue(project, project.GetDocument(documentFilePath));
+                            Enqueue(projectSnapshot, projectSnapshot.GetDocument(documentFilePath));
+                        }
+
+                        break;
+                    }
+
+                case ProjectChangeKind.DocumentAdded:
+                case ProjectChangeKind.DocumentChanged:
+                    {
+                        var project = e.Newer;
+                        var document = project.GetDocument(e.DocumentFilePath);
+
+                        Enqueue(project, document);
+                        foreach (var relatedDocument in project.GetRelatedDocuments(document))
+                        {
+                            Enqueue(project, document);
+                        }
+
+                        break;
+                    }
+
+                case ProjectChangeKind.DocumentRemoved:
+                    {
+                        // For removals use the old snapshot to find the removed document, so we can figure out 
+                        // what the imports were in the new snapshot.
+                        var document = e.Older.GetDocument(e.DocumentFilePath);
+
+                        foreach (var relatedDocument in e.Newer.GetRelatedDocuments(document))
+                        {
+                            Enqueue(e.Newer, document);
                         }
 
                         break;
                     }
 
                 case ProjectChangeKind.ProjectRemoved:
-                    // ignore
-                    break;
-
-                case ProjectChangeKind.DocumentAdded:
-                case ProjectChangeKind.DocumentChanged:
                     {
-                        var project = _projectManager.GetLoadedProject(e.ProjectFilePath);
-                        Enqueue(project, project.GetDocument(e.DocumentFilePath));
-
+                        // ignore
                         break;
                     }
 
-                
-                case ProjectChangeKind.DocumentRemoved:
-                    // ignore
-                    break;
-
                 default:
                     throw new InvalidOperationException($"Unknown ProjectChangeKind {e.Kind}");
             }
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj
index 32296b51c6..310b17306b 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46</TargetFrameworks>
+    <TargetFrameworks>net472</TargetFrameworks>
     <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure for Visual Studio.</Description>
     <EnableApiCheck>false</EnableApiCheck>
     <RulesDirectory>..\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Rules\</RulesDirectory>
+    <DefineConstants>$(DefineConstants);WORKSPACE_PROJECT_CONTEXT_FACTORY</DefineConstants>
+    <CodeAnalysisRuleSet>Microsoft.VisualStudio.LanguageServices.Razor.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -16,6 +18,7 @@
     <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="$(MicrosoftVisualStudioComponentModelHostPackageVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Editor" Version="$(MicrosoftVisualStudioEditorPackageVersion)" />
+    <PackageReference Include="Microsoft.VisualStudio.ImageCatalog" Version="$(MicrosoftVisualStudioImageCatalogPackageVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="$(MicrosoftVisualStudioLanguageIntellisensePackageVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient" Version="$(VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.LanguageServices" Version="$(VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion)" />
@@ -30,9 +33,16 @@
     <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.8.0" Version="$(MicrosoftVisualStudioShellInterop80PackageVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.9.0" Version="$(MicrosoftVisualStudioShellInterop90PackageVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.Interop" Version="$(MicrosoftVisualStudioShellInteropPackageVersion)" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingPackageVersion)" />
+
 
     <!-- We need to use this version of Json.Net to maintain consistency with Visual Studio. -->
     <PackageReference Include="Newtonsoft.Json" Version="$(VisualStudio_NewtonsoftJsonPackageVersion)" />
+    <PackageReference Include="StreamJsonRpc" Version="$(StreamJsonRpcPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' ">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssemblies)" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.ruleset b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.ruleset
new file mode 100644
index 0000000000..3f14803c35
--- /dev/null
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.ruleset
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Microsoft Managed Recommended Rules" Description="These rules focus on the most critical problems in your code, including potential security holes, application crashes, and other important logic and design errors. It is recommended to include this rule set in any custom rule set you create for your projects." ToolsVersion="15.0">
+  <Localization ResourceAssembly="Microsoft.VisualStudio.CodeAnalysis.RuleSets.Strings.dll" ResourceBaseName="Microsoft.VisualStudio.CodeAnalysis.RuleSets.Strings.Localized">
+    <Name Resource="MinimumRecommendedRules_Name" />
+    <Description Resource="MinimumRecommendedRules_Description" />
+  </Localization>
+  <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
+    <Rule Id="CA1001" Action="Warning" />
+    <Rule Id="CA1009" Action="Warning" />
+    <Rule Id="CA1016" Action="Warning" />
+    <Rule Id="CA1033" Action="Warning" />
+    <Rule Id="CA1049" Action="Warning" />
+    <Rule Id="CA1060" Action="Warning" />
+    <Rule Id="CA1061" Action="Warning" />
+    <Rule Id="CA1063" Action="Warning" />
+    <Rule Id="CA1065" Action="Warning" />
+    <Rule Id="CA1301" Action="Warning" />
+    <Rule Id="CA1400" Action="Warning" />
+    <Rule Id="CA1401" Action="Warning" />
+    <Rule Id="CA1403" Action="Warning" />
+    <Rule Id="CA1404" Action="Warning" />
+    <Rule Id="CA1405" Action="Warning" />
+    <Rule Id="CA1410" Action="Warning" />
+    <Rule Id="CA1415" Action="Warning" />
+    <Rule Id="CA1821" Action="Warning" />
+    <Rule Id="CA1900" Action="Warning" />
+    <Rule Id="CA1901" Action="Warning" />
+    <Rule Id="CA2002" Action="Warning" />
+    <Rule Id="CA2100" Action="Warning" />
+    <Rule Id="CA2101" Action="Warning" />
+    <Rule Id="CA2108" Action="Warning" />
+    <Rule Id="CA2111" Action="Warning" />
+    <Rule Id="CA2112" Action="Warning" />
+    <Rule Id="CA2114" Action="Warning" />
+    <Rule Id="CA2116" Action="Warning" />
+    <Rule Id="CA2117" Action="Warning" />
+    <Rule Id="CA2122" Action="Warning" />
+    <Rule Id="CA2123" Action="Warning" />
+    <Rule Id="CA2124" Action="Warning" />
+    <Rule Id="CA2126" Action="Warning" />
+    <Rule Id="CA2131" Action="Warning" />
+    <Rule Id="CA2132" Action="Warning" />
+    <Rule Id="CA2133" Action="Warning" />
+    <Rule Id="CA2134" Action="Warning" />
+    <Rule Id="CA2137" Action="Warning" />
+    <Rule Id="CA2138" Action="Warning" />
+    <Rule Id="CA2140" Action="Warning" />
+    <Rule Id="CA2141" Action="Warning" />
+    <Rule Id="CA2146" Action="Warning" />
+    <Rule Id="CA2147" Action="Warning" />
+    <Rule Id="CA2149" Action="Warning" />
+    <Rule Id="CA2200" Action="Warning" />
+    <Rule Id="CA2202" Action="Warning" />
+    <Rule Id="CA2207" Action="Warning" />
+    <Rule Id="CA2212" Action="Warning" />
+    <Rule Id="CA2213" Action="Warning" />
+    <Rule Id="CA2214" Action="Warning" />
+    <Rule Id="CA2216" Action="Warning" />
+    <Rule Id="CA2220" Action="Warning" />
+    <Rule Id="CA2229" Action="Warning" />
+    <Rule Id="CA2231" Action="Warning" />
+    <Rule Id="CA2232" Action="Warning" />
+    <Rule Id="CA2235" Action="Warning" />
+    <Rule Id="CA2236" Action="Warning" />
+    <Rule Id="CA2237" Action="Warning" />
+    <Rule Id="CA2238" Action="Warning" />
+    <Rule Id="CA2240" Action="Warning" />
+    <Rule Id="CA2241" Action="Warning" />
+    <Rule Id="CA2242" Action="Warning" />
+  </Rules>
+  <Rules AnalyzerId="Microsoft.VisualStudio.Threading.Analyzers" RuleNamespace="Microsoft.VisualStudio.Threading.Analyzers">
+    <Rule Id="VSTHRD001" Action="Info" />
+    <Rule Id="VSTHRD002" Action="Info" />
+    <Rule Id="VSTHRD003" Action="Info" />
+    <Rule Id="VSTHRD004" Action="Info" />
+    <Rule Id="VSTHRD010" Action="Info" />
+    <Rule Id="VSTHRD011" Action="Info" />
+    <Rule Id="VSTHRD012" Action="Info" />
+    <Rule Id="VSTHRD100" Action="Info" />
+    <Rule Id="VSTHRD101" Action="Info" />
+    <Rule Id="VSTHRD102" Action="Info" />
+    <Rule Id="VSTHRD103" Action="Info" />
+    <Rule Id="VSTHRD104" Action="Info" />
+    <Rule Id="VSTHRD105" Action="Info" />
+    <Rule Id="VSTHRD106" Action="Info" />
+    <Rule Id="VSTHRD107" Action="Info" />
+    <Rule Id="VSTHRD108" Action="Info" />
+    <Rule Id="VSTHRD109" Action="Info" />
+    <Rule Id="VSTHRD110" Action="Info" />
+    <Rule Id="VSTHRD111" Action="Info" />
+    <Rule Id="VSTHRD200" Action="Info" />
+  </Rules>
+</RuleSet>
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/DefaultRazorProjectHost.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/DefaultRazorProjectHost.cs
index 68dfc4312a..97978c18cd 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/DefaultRazorProjectHost.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/DefaultRazorProjectHost.cs
@@ -7,15 +7,22 @@ using System.Collections.Immutable;
 using System.ComponentModel.Composition;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
 using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.LanguageServices;
 using Microsoft.VisualStudio.ProjectSystem;
 using Microsoft.VisualStudio.ProjectSystem.Properties;
+using Microsoft.VisualStudio.TextManager.Interop;
 using Item = System.Collections.Generic.KeyValuePair<string, System.Collections.Immutable.IImmutableDictionary<string, string>>;
 
+#if WORKSPACE_PROJECT_CONTEXT_FACTORY
+using IWorkspaceProjectContextFactory = Microsoft.VisualStudio.LanguageServices.ProjectSystem.IWorkspaceProjectContextFactory2;
+#endif
+
 namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 {
     // Somewhat similar to https://github.com/dotnet/project-system/blob/fa074d228dcff6dae9e48ce43dd4a3a5aa22e8f0/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/LanguageServices/LanguageServiceHost.cs
@@ -23,16 +30,18 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
     // This class is responsible for intializing the Razor ProjectSnapshotManager for cases where
     // MSBuild provides configuration support (>= 2.1).
     [AppliesTo("DotNetCoreRazor & DotNetCoreRazorConfiguration")]
+    [ExportVsProfferedProjectService(typeof(IVsContainedLanguageProjectNameProvider))]
     [Export(ExportContractNames.Scopes.UnconfiguredProject, typeof(IProjectDynamicLoadComponent))]
-    internal class DefaultRazorProjectHost : RazorProjectHostBase
+    internal class DefaultRazorProjectHost : RazorProjectHostBase, IVsContainedLanguageProjectNameProvider
     {
         private IDisposable _subscription;
 
         [ImportingConstructor]
         public DefaultRazorProjectHost(
             IUnconfiguredProjectCommonServices commonServices,
-            [Import(typeof(VisualStudioWorkspace))] Workspace workspace)
-            : base(commonServices, workspace)
+            [Import(typeof(VisualStudioWorkspace))] Workspace workspace,
+            Lazy<IWorkspaceProjectContextFactory> projectContextFactory)
+            : base(commonServices, workspace, projectContextFactory)
         {
         }
 
@@ -68,6 +77,9 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                     Rules.RazorConfiguration.SchemaName,
                     Rules.RazorExtension.SchemaName,
                     Rules.RazorGenerateWithTargetPath.SchemaName,
+                    ManagedProjectSystemSchema.CompilerCommandLineArgs.SchemaName,
+                    ManagedProjectSystemSchema.ConfigurationGeneral.SchemaName,
+                    ManagedProjectSystemSchema.ResolvedCompilationReference.SchemaName,
                 });
         }
 
@@ -107,9 +119,14 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                         var documents = GetCurrentDocuments(update.Value);
                         var changedDocuments = GetChangedAndRemovedDocuments(update.Value);
 
+                        var references = GetReferences(update.Value);
+                        TryGetCommandLineOptions(update.Value.CurrentState, out var commandLineOptions);
+
                         await UpdateAsync(() =>
                         {
                             UpdateProjectUnsafe(hostProject);
+                            UpdateWorkspaceProjectOptionsUnsafe(commandLineOptions);
+                            UpdateWorkspaceProjectReferencesUnsafe(references);
 
                             for (var i = 0; i < changedDocuments.Length; i++)
                             {
@@ -302,6 +319,77 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             return true;
         }
 
+
+        // This is temporary code for initializing the companion project. We expect
+        // this to be provided by the Managed Project System in the near future.
+        internal static bool TryGetReferences(
+            IImmutableDictionary<string, IProjectRuleSnapshot> state,
+            out string[] references)
+        {
+            if (!state.TryGetValue(ManagedProjectSystemSchema.ResolvedCompilationReference.ItemName, out var rule))
+            {
+                references = null;
+                return false;
+            }
+
+            var items = rule.Items;
+            var referencesList = new List<string>();
+            foreach (var item in items)
+            {
+                var reference = item.Key;
+                if (!referencesList.Contains(reference, FilePathComparer.Instance))
+                {
+                    referencesList.Add(reference);
+                }
+            }
+
+            references = referencesList.ToArray();
+            return true;
+        }
+
+        // This is temporary code for initializing the companion project. We expect
+        // this to be provided by the Managed Project System in the near future.
+        internal static bool TryGetCommandLineOptions(
+            IImmutableDictionary<string, IProjectRuleSnapshot> state,
+            out string commandLineOptions)
+        {
+            if (!state.TryGetValue(ManagedProjectSystemSchema.CompilerCommandLineArgs.ItemName, out var rule))
+            {
+                commandLineOptions = null;
+                return false;
+            }
+
+            commandLineOptions = string.Join(" ", rule.Items.Select(kvp => kvp.Key));
+            return true;
+        }
+
+        // This is temporary code for initializing the companion project. We expect
+        // this to be provided by the Managed Project System in the near future.
+        internal static bool TryGetTargetPath(
+            IImmutableDictionary<string, IProjectRuleSnapshot> state,
+            out string targetPath)
+        {
+            if (!state.TryGetValue(ManagedProjectSystemSchema.ConfigurationGeneral.SchemaName, out var rule))
+            {
+                targetPath = null;
+                return false;
+            }
+
+            if (!rule.Properties.TryGetValue(ManagedProjectSystemSchema.ConfigurationGeneral.TargetPathPropertyName, out targetPath))
+            {
+                targetPath = null;
+                return false;
+            }
+
+            if (string.IsNullOrEmpty(targetPath))
+            {
+                targetPath = null;
+                return false;
+            }
+
+            return true;
+        }
+        
         private HostDocument[] GetCurrentDocuments(IProjectSubscriptionUpdate update)
         {
             if (!update.CurrentState.TryGetValue(Rules.RazorGenerateWithTargetPath.SchemaName, out var rule))
@@ -348,5 +436,37 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             return documents.ToArray();
         }
+
+        // This is temporary code for initializing the companion project. We expect
+        // this to be provided by the Managed Project System in the near future.
+        private string[] GetReferences(IProjectSubscriptionUpdate update)
+        {
+            if (!TryGetReferences(update.CurrentState, out var references))
+            {
+                return Array.Empty<string>();
+            }
+
+            if (TryGetTargetPath(update.CurrentState, out var targetPath))
+            {
+                references = references.Concat(new[] { targetPath, }).ToArray();
+            }
+
+            return references;
+        }
+
+        // This is temporary code for initializing the companion project. We expect
+        // this to be provided by the Managed Project System in the near future.
+        public int GetProjectName([In] uint itemid, [MarshalAs(UnmanagedType.BStr)] out string pbstrProjectName)
+        {
+            if (Current == null)
+            {
+                pbstrProjectName = null;
+
+                return VSConstants.E_INVALIDARG;
+            }
+
+            pbstrProjectName = Path.GetFileNameWithoutExtension(Current.FilePath) + " (Razor)";
+            return VSConstants.S_OK;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/DefaultWorkspaceProjectContextFactory.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/DefaultWorkspaceProjectContextFactory.cs
new file mode 100644
index 0000000000..0842ecc8fc
--- /dev/null
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/DefaultWorkspaceProjectContextFactory.cs
@@ -0,0 +1,101 @@
+// 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.
+
+// Temporary code until we get access to these APIs
+#if WORKSPACE_PROJECT_CONTEXT_FACTORY
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using Microsoft.CodeAnalysis;
+using Microsoft.VisualStudio.LanguageServices.Implementation.TaskList;
+using IWorkspaceProjectContextFactory = Microsoft.VisualStudio.LanguageServices.ProjectSystem.IWorkspaceProjectContextFactory2;
+
+namespace Microsoft.VisualStudio.LanguageServices.ProjectSystem
+{
+    [Export(typeof(IWorkspaceProjectContextFactory))]
+    internal class DefaultWorkspaceProjectContextFactory : IWorkspaceProjectContextFactory
+    {
+        public IWorkspaceProjectContext CreateProjectContext(string languageName, string projectDisplayName, string projectFilePath, Guid projectGuid, object hierarchy, string binOutputPath)
+        {
+            return new WorkspaceProjectContext();
+        }
+
+        public IWorkspaceProjectContext CreateProjectContext(string languageName, string projectDisplayName, string projectFilePath, Guid projectGuid, object hierarchy, string binOutputPath, ProjectExternalErrorReporter errorReporter)
+        {
+            return new WorkspaceProjectContext();
+        }
+
+        private class WorkspaceProjectContext : IWorkspaceProjectContext
+        {
+            public string DisplayName { get; set; }
+            public string ProjectFilePath { get; set; }
+            public Guid Guid { get; set; }
+            public bool LastDesignTimeBuildSucceeded { get; set; }
+            public string BinOutputPath { get; set; }
+
+            public void AddAdditionalFile(string filePath, bool isInCurrentContext = true)
+            {
+            }
+
+            public void AddAnalyzerReference(string referencePath)
+            {
+            }
+
+            public void AddMetadataReference(string referencePath, MetadataReferenceProperties properties)
+            {
+            }
+
+            public void AddProjectReference(IWorkspaceProjectContext project, MetadataReferenceProperties properties)
+            {
+            }
+
+            public void AddSourceFile(string filePath, bool isInCurrentContext, IEnumerable<string> folderNames, SourceCodeKind sourceCodeKind)
+            {
+            }
+
+            public void AddDynamicSourceFile(string filePath, IEnumerable<string> folderNames = null)
+            {
+            }
+
+            public void Dispose()
+            {
+            }
+
+            public void RemoveAdditionalFile(string filePath)
+            {
+            }
+
+            public void RemoveAnalyzerReference(string referencePath)
+            {
+            }
+
+            public void RemoveMetadataReference(string referencePath)
+            {
+            }
+
+            public void RemoveProjectReference(IWorkspaceProjectContext project)
+            {
+            }
+
+            public void RemoveSourceFile(string filePath)
+            {
+            }
+
+            public void RemoveDynamicSourceFile(string filePath)
+            {
+
+            }
+
+            public void SetOptions(string commandLineForOptions)
+            {
+            }
+
+            public void SetRuleSetFile(string filePath)
+            {
+            }
+        }
+    }
+}
+
+#endif
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/FallbackRazorProjectHost.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/FallbackRazorProjectHost.cs
index 5dedf67af9..ef33b79723 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/FallbackRazorProjectHost.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/FallbackRazorProjectHost.cs
@@ -38,7 +38,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
         public FallbackRazorProjectHost(
             IUnconfiguredProjectCommonServices commonServices,
             [Import(typeof(VisualStudioWorkspace))] Workspace workspace)
-            : base(commonServices, workspace)
+            : base(commonServices, workspace, projectContextFactory: null)
         {
         }
 
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/GeneratedDocumentTextLoader.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/GeneratedDocumentTextLoader.cs
new file mode 100644
index 0000000000..3aa5124572
--- /dev/null
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/GeneratedDocumentTextLoader.cs
@@ -0,0 +1,36 @@
+// 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;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
+{
+    internal class GeneratedDocumentTextLoader : TextLoader
+    {
+        private readonly DocumentSnapshot _document;
+        private readonly string _filePath;
+        private readonly VersionStamp _version;
+
+        public GeneratedDocumentTextLoader(DocumentSnapshot document, string filePath)
+        {
+            if (document == null)
+            {
+                throw new ArgumentNullException(nameof(document));
+            }
+
+            _document = document;
+            _filePath = filePath;
+            _version = VersionStamp.Create();
+        }
+
+        public override async Task<TextAndVersion> LoadTextAndVersionAsync(Workspace workspace, DocumentId documentId, CancellationToken cancellationToken)
+        {
+            var output = await _document.GetGeneratedOutputAsync().ConfigureAwait(false);
+            return TextAndVersion.Create(SourceText.From(output.GetCSharpDocument().GeneratedCode), _version, _filePath);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/IWorkspaceProjectContext.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/IWorkspaceProjectContext.cs
new file mode 100644
index 0000000000..91d7f2e90e
--- /dev/null
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/IWorkspaceProjectContext.cs
@@ -0,0 +1,45 @@
+// 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.
+
+// Temporary code until we get access to these APIs
+#if WORKSPACE_PROJECT_CONTEXT_FACTORY
+
+using System;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.VisualStudio.LanguageServices.ProjectSystem
+{
+    internal interface IWorkspaceProjectContext : IDisposable
+    {
+        // Project properties.
+        string DisplayName { get; set; }
+        string ProjectFilePath { get; set; }
+        Guid Guid { get; set; }
+        bool LastDesignTimeBuildSucceeded { get; set; }
+        string BinOutputPath { get; set; }
+
+        // Options.
+        void SetOptions(string commandLineForOptions);
+
+        // References.
+        void AddMetadataReference(string referencePath, MetadataReferenceProperties properties);
+        void RemoveMetadataReference(string referencePath);
+        void AddProjectReference(IWorkspaceProjectContext project, MetadataReferenceProperties properties);
+        void RemoveProjectReference(IWorkspaceProjectContext project);
+        void AddAnalyzerReference(string referencePath);
+        void RemoveAnalyzerReference(string referencePath);
+
+        // Files.
+        void AddSourceFile(string filePath, bool isInCurrentContext, IEnumerable<string> folderNames, SourceCodeKind sourceCodeKind);
+        void AddDynamicSourceFile(string filePath, IEnumerable<string> folderNames = null);
+        void RemoveSourceFile(string filePath);
+        void RemoveDynamicSourceFile(string filePath);
+        void AddAdditionalFile(string filePath, bool isInCurrentContext = true);
+        void RemoveAdditionalFile(string filePath);
+        void SetRuleSetFile(string filePath);
+    }
+}
+
+#endif
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/IWorkspaceProjectContextFactory.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/IWorkspaceProjectContextFactory.cs
new file mode 100644
index 0000000000..0cb912b627
--- /dev/null
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/IWorkspaceProjectContextFactory.cs
@@ -0,0 +1,23 @@
+// 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.
+
+// Temporary code until we get access to these APIs
+#if WORKSPACE_PROJECT_CONTEXT_FACTORY
+
+using System;
+using Microsoft.VisualStudio.LanguageServices.Implementation.TaskList;
+
+namespace Microsoft.VisualStudio.LanguageServices.ProjectSystem
+{
+    // The 2 is needed here to prevent clashes with the real interface. MEF is based on the FullName
+    // as a string.
+    internal interface IWorkspaceProjectContextFactory2
+    {
+        IWorkspaceProjectContext CreateProjectContext(string languageName, string projectDisplayName, string projectFilePath, Guid projectGuid, object hierarchy, string binOutputPath);
+
+
+        IWorkspaceProjectContext CreateProjectContext(string languageName, string projectDisplayName, string projectFilePath, Guid projectGuid, object hierarchy, string binOutputPath, ProjectExternalErrorReporter errorReporter);
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/ManagedProjectSystemSchema.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/ManagedProjectSystemSchema.cs
index a56464e495..9f67217eb6 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/ManagedProjectSystemSchema.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/ManagedProjectSystemSchema.cs
@@ -6,6 +6,20 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
     // Well-Known Schema and property names defined by the ManagedProjectSystem
     internal static class ManagedProjectSystemSchema
     {
+        public static class CompilerCommandLineArgs
+        {
+            public static readonly string SchemaName = "CompilerCommandLineArgs";
+
+            public static readonly string ItemName = "CompilerCommandLineArgs";
+        }
+
+        public static class ConfigurationGeneral
+        {
+            public static readonly string SchemaName = "ConfigurationGeneral";
+
+            public static readonly string TargetPathPropertyName = "TargetPath";
+        }
+
         public static class ResolvedCompilationReference
         {
             public static readonly string SchemaName = "ResolvedCompilationReference";
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/ProjectExternalErrorReporter.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/ProjectExternalErrorReporter.cs
new file mode 100644
index 0000000000..d9c230f65d
--- /dev/null
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/ProjectExternalErrorReporter.cs
@@ -0,0 +1,14 @@
+// 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.
+
+// Temporary code until we get access to these APIs
+#if WORKSPACE_PROJECT_CONTEXT_FACTORY
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.TaskList
+{
+    internal class ProjectExternalErrorReporter
+    {
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/RazorProjectHostBase.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/RazorProjectHostBase.cs
index e39a866f05..6d5700a796 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/RazorProjectHostBase.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/RazorProjectHostBase.cs
@@ -5,27 +5,40 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Composition;
 using Microsoft.VisualStudio.LanguageServices;
+using Microsoft.VisualStudio.LanguageServices.ProjectSystem;
 using Microsoft.VisualStudio.ProjectSystem;
 using Microsoft.VisualStudio.Threading;
 
+#if WORKSPACE_PROJECT_CONTEXT_FACTORY
+using IWorkspaceProjectContextFactory = Microsoft.VisualStudio.LanguageServices.ProjectSystem.IWorkspaceProjectContextFactory2;
+#endif
+
 namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 {
     internal abstract class RazorProjectHostBase : OnceInitializedOnceDisposedAsync, IProjectDynamicLoadComponent
     {
         private readonly Workspace _workspace;
+        private readonly Lazy<IWorkspaceProjectContextFactory> _projectContextFactory;
         private readonly AsyncSemaphore _lock;
 
         private ProjectSnapshotManagerBase _projectManager;
         private HostProject _current;
+        private IWorkspaceProjectContext _projectContext;
         private Dictionary<string, HostDocument> _currentDocuments;
+        private HashSet<string> _references;
+        private string _commandLineOptions;
 
         public RazorProjectHostBase(
             IUnconfiguredProjectCommonServices commonServices,
-            [Import(typeof(VisualStudioWorkspace))] Workspace workspace)
+            [Import(typeof(VisualStudioWorkspace))] Workspace workspace,
+            Lazy<IWorkspaceProjectContextFactory> projectContextFactory)
             : base(commonServices.ThreadingService.JoinableTaskContext)
         {
             if (commonServices == null)
@@ -40,9 +53,11 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             CommonServices = commonServices;
             _workspace = workspace;
+            _projectContextFactory = projectContextFactory;
 
             _lock = new AsyncSemaphore(initialCount: 1);
             _currentDocuments = new Dictionary<string, HostDocument>(FilePathComparer.Instance);
+            _references = new HashSet<string>(FilePathComparer.Instance);
         }
 
         // Internal for testing
@@ -73,6 +88,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             _lock = new AsyncSemaphore(initialCount: 1);
             _currentDocuments = new Dictionary<string, HostDocument>(FilePathComparer.Instance);
+            _references = new HashSet<string>(FilePathComparer.Instance);
         }
 
         protected HostProject Current => _current;
@@ -129,6 +145,8 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                     {
                         var filePath = CommonServices.UnconfiguredProject.FullPath;
                         UpdateProjectUnsafe(new HostProject(filePath, old.Configuration));
+                        UpdateWorkspaceProjectOptionsUnsafe(_commandLineOptions);
+                        UpdateWorkspaceProjectReferencesUnsafe(_references.ToArray());
 
                         // This should no-op in the common case, just putting it here for insurance.
                         for (var i = 0; i < oldDocuments.Length; i++)
@@ -153,6 +171,12 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             return _projectManager;
         }
 
+        private IWorkspaceProjectContextFactory GetProjectContextFactory()
+        {
+            CommonServices.ThreadingService.VerifyOnUIThread();
+            return _projectContextFactory?.Value;
+        }
+
         protected async Task UpdateAsync(Action action)
         {
             await CommonServices.ThreadingService.SwitchToUIThread();
@@ -174,12 +198,40 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             }
             else if (_current == null && project != null)
             {
+                // This is temporary code for initializing the companion project. We expect
+                // this to be provided by the Managed Project System in the near future.
+                var projectContextFactory = GetProjectContextFactory();
+                if (projectContextFactory != null)
+                {
+                    var assembly = Assembly.Load("Microsoft.VisualStudio.ProjectSystem.Managed, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
+                    var type = assembly.GetType("Microsoft.VisualStudio.ProjectSystem.LanguageServices.IProjectHostProvider");
+
+                    var exportProviderType = CommonServices.UnconfiguredProject.Services.ExportProvider.GetType();
+                    var method = exportProviderType.GetMethod(nameof(ExportProvider.GetExportedValue), Array.Empty<Type>()).MakeGenericMethod(type);
+                    var export = method.Invoke(CommonServices.UnconfiguredProject.Services.ExportProvider, Array.Empty<object>());
+                    var host = new IProjectHostProvider(export);
+
+                    var displayName = Path.GetFileNameWithoutExtension(CommonServices.UnconfiguredProject.FullPath) + " (Razor)";
+                    _projectContext = projectContextFactory.CreateProjectContext(
+                        LanguageNames.CSharp,
+                        displayName,
+                        CommonServices.UnconfiguredProject.FullPath,
+                        Guid.NewGuid(),
+                        host.UnconfiguredProjectHostObject.ActiveIntellisenseProjectHostObject,
+                        null,
+                        null);
+                }
+
+                // END temporary code
+
                 projectManager.HostProjectAdded(project);
             }
             else if (_current != null && project == null)
             {
                 Debug.Assert(_currentDocuments.Count == 0);
                 projectManager.HostProjectRemoved(_current);
+                _projectContext?.Dispose();
+                _projectContext = null;
             }
             else
             {
@@ -189,6 +241,56 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             _current = project;
         }
 
+        protected void UpdateWorkspaceProjectOptionsUnsafe(string commandLineOptions)
+        {
+            if (_projectContext == null)
+            {
+                _commandLineOptions = null;
+                return;
+            }
+            
+            if (!string.Equals(_commandLineOptions, commandLineOptions))
+            {
+                _projectContext.SetOptions(commandLineOptions);
+                _commandLineOptions = commandLineOptions;
+            }
+        }
+
+        protected void UpdateWorkspaceProjectReferencesUnsafe(string[] references)
+        {
+            if (_projectContext == null)
+            {
+                _references.Clear();
+                return;
+            }
+
+            var newer = new HashSet<string>(references, FilePathComparer.Instance);
+            var older = new HashSet<string>(_references, FilePathComparer.Instance);
+
+            if (older.SetEquals(newer))
+            {
+                return;
+            }
+
+            var remove = new HashSet<string>(older, FilePathComparer.Instance);
+            remove.ExceptWith(newer);
+
+            var add = new HashSet<string>(newer, FilePathComparer.Instance);
+            add.ExceptWith(older);
+
+            foreach (var reference in remove)
+            {
+                _references.Remove(reference);
+                _projectContext.RemoveMetadataReference(reference);
+            }
+
+            foreach (var reference in add)
+            {
+                _references.Add(reference);
+                _projectContext.AddMetadataReference(reference, new MetadataReferenceProperties());
+            }
+        }
+
         protected void AddDocumentUnsafe(HostDocument document)
         {
             var projectManager = GetProjectManager();
@@ -200,6 +302,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             }
 
             projectManager.DocumentAdded(_current, document, new FileTextLoader(document.FilePath, null));
+            _projectContext?.AddDynamicSourceFile(document.FilePath, GetFolders(document));
             _currentDocuments.Add(document.FilePath, document);
         }
 
@@ -207,6 +310,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
         {
             var projectManager = GetProjectManager();
 
+            _projectContext?.RemoveDynamicSourceFile(document.FilePath);
             projectManager.DocumentRemoved(_current, document);
             _currentDocuments.Remove(document.FilePath);
         }
@@ -217,6 +321,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             foreach (var kvp in _currentDocuments)
             {
+                _projectContext?.RemoveSourceFile(kvp.Value.FilePath);
                 _projectManager.DocumentRemoved(_current, kvp.Value);
             }
 
@@ -249,5 +354,48 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
         {
             await OnProjectRenamingAsync().ConfigureAwait(false);
         }
+
+        private static IEnumerable<string> GetFolders(HostDocument document)
+        {
+            var split = document.TargetPath.Split('/');
+            return split.Take(split.Length - 1);
+        }
+
+        private class IUnconfiguredProjectHostObject
+        {
+            private readonly object _inner;
+
+            public IUnconfiguredProjectHostObject(object inner)
+            {
+                _inner = inner;
+            }
+
+            public object ActiveIntellisenseProjectHostObject
+            {
+                get
+                {
+                    return  _inner.GetType().GetProperty(nameof(ActiveIntellisenseProjectHostObject)).GetValue(_inner);
+                }
+            }
+        }
+        
+        private class IProjectHostProvider
+        {
+            private readonly object _inner;
+
+            public IProjectHostProvider(object inner)
+            {
+                _inner = inner;
+            }
+
+            public IUnconfiguredProjectHostObject UnconfiguredProjectHostObject
+            {
+                get
+                {
+                    var inner = _inner.GetType().GetProperty(nameof(UnconfiguredProjectHostObject)).GetValue(_inner);
+                    return new IUnconfiguredProjectHostObject(inner);
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorConfiguration.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorConfiguration.cs
index d8c2484f5b..a21bc050c9 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorConfiguration.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorConfiguration.cs
@@ -8,205 +8,268 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
-	
-	
-	internal partial class RazorConfiguration {
-		
-		/// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary>
-		private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule;
-		
-		/// <summary>The name of the schema to look for at runtime to fulfill property access.</summary>
-		internal const string SchemaName = "RazorConfiguration";
-		
-		/// <summary>The ItemType given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
-		internal const string PrimaryDataSourceItemType = "RazorConfiguration";
-		
-		/// <summary>The Label given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
-		internal const string PrimaryDataSourceLabel = "";
-		
-		/// <summary>Razor Extensions (The "Extensions" property).</summary>
-		internal const string ExtensionsProperty = "Extensions";
-		
-		/// <summary>Backing field for the <see cref='Microsoft.Build.Framework.XamlTypes.Rule'/> property.</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule;
-		
-		/// <summary>Backing field for the file name of the rule property.</summary>
-		private string file;
-		
-		/// <summary>Backing field for the ItemType property.</summary>
-		private string itemType;
-		
-		/// <summary>Backing field for the ItemName property.</summary>
-		private string itemName;
-		
-		/// <summary>Configured Project</summary>
-		private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject;
-		
-		/// <summary>The dictionary of named catalogs.</summary>
-		private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs;
-		
-		/// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule;
-		
-		/// <summary>Thread locking object</summary>
-		private object locker = new object();
-		
-		/// <summary>Initializes a new instance of the RazorConfiguration class.</summary>
-		internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule) {
-			this.rule = rule;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorConfiguration class.</summary>
-		internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) : 
-				this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName)) {
-			if ((configuredProject == null)) {
-				throw new System.ArgumentNullException("configuredProject");
-			}
-			this.configuredProject = configuredProject;
-			this.catalogs = catalogs;
-			this.file = file;
-			this.itemType = itemType;
-			this.itemName = itemName;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorConfiguration class.</summary>
-		internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) : 
-				this(rule) {
-			if ((rule == null)) {
-				throw new System.ArgumentNullException("rule");
-			}
-			if ((configuredProject == null)) {
-				throw new System.ArgumentNullException("configuredProject");
-			}
-			this.configuredProject = configuredProject;
-			this.rule = rule;
-			this.file = this.rule.File;
-			this.itemType = this.rule.ItemType;
-			this.itemName = this.rule.ItemName;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorConfiguration class.</summary>
-		internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) : 
-				this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName) {
-		}
-		
-		/// <summary>Initializes a new instance of the RazorConfiguration class that assumes a project context (neither property sheet nor items).</summary>
-		internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) : 
-				this(configuredProject, catalogs, "Project", null, null, null) {
-		}
-		
-		/// <summary>Gets the IRule used to get and set properties.</summary>
-		public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule {
-			get {
-				return this.rule;
-			}
-		}
-		
-		/// <summary>Razor Extensions</summary>
-		internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty Extensions {
-			get {
-				Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
-				if ((localRule == null)) {
-					localRule = this.GeneratedFallbackRule;
-				}
-				if ((localRule == null)) {
-					return null;
-				}
-				Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(ExtensionsProperty)));
-				if (((property == null) 
-							&& (this.GeneratedFallbackRule != null))) {
-					localRule = this.GeneratedFallbackRule;
-					property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(ExtensionsProperty)));
-				}
-				return property;
-			}
-		}
-		
-		/// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule {
-			get {
-				if (((this.fallbackRule == null) 
-							&& (this.configuredProject != null))) {
-					System.Threading.Monitor.Enter(this.locker);
-					try {
-						if ((this.fallbackRule == null)) {
-							this.InitializeFallbackRule();
-						}
-					}
-					finally {
-						System.Threading.Monitor.Exit(this.locker);
-					}
-				}
-				return this.fallbackRule;
-			}
-		}
-		
-		private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName) {
-			if ((catalog == null)) {
-				return null;
-			}
-			return catalog.BindToContext(SchemaName, file, itemType, itemName);
-		}
-		
-		private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext) {
-			if ((propertiesContext.IsProjectFile == true)) {
-				return null;
-			}
-			else {
-				return propertiesContext.File;
-			}
-		}
-		
-		private void InitializeFallbackRule() {
-			if ((this.configuredProject == null)) {
-				return;
-			}
-			Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorConfiguration.deserializedFallbackRule;
-			if ((unboundRule == null)) {
-				System.IO.Stream xamlStream = null;
-				System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
-				try {
-					xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorConfiguration.xaml");
-					Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream)));
-					System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator();
-					for (
-					; ((unboundRule == null) 
-								&& ruleEnumerator.MoveNext()); 
-					) {
-						Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
-						if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName)) {
-							unboundRule = t;
-							unboundRule.Name = "30e71838-2cb8-4c67-ab28-7670763124af";
-							RazorConfiguration.deserializedFallbackRule = unboundRule;
-						}
-					}
-				}
-				finally {
-					if ((xamlStream != null)) {
-						((System.IDisposable)(xamlStream)).Dispose();
-					}
-				}
-			}
-			this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext");
-			Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext");
-			this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName);
-		}
-	}
-	
-	internal partial class RazorProjectProperties {
-		
-		private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorConfiguration> CreateRazorConfigurationPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorConfiguration>(CreateRazorConfigurationProperties);
-		
-		private static RazorConfiguration CreateRazorConfigurationProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state) {
-			RazorProjectProperties that = ((RazorProjectProperties)(state));
-			return new RazorConfiguration(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName);
-		}
-		
-		/// <summary>Gets the strongly-typed property accessor used to get and set Configuration Properties properties.</summary>
-		internal System.Threading.Tasks.Task<RazorConfiguration> GetRazorConfigurationPropertiesAsync() {
-			System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync();
-			return namedCatalogsTask.ContinueWith(CreateRazorConfigurationPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default);
-		}
-	}
+namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules
+{
+    
+    
+    internal partial class RazorConfiguration
+    {
+        
+        /// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary>
+        private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule;
+        
+        /// <summary>The name of the schema to look for at runtime to fulfill property access.</summary>
+        internal const string SchemaName = "RazorConfiguration";
+        
+        /// <summary>The ItemType given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
+        internal const string PrimaryDataSourceItemType = "RazorConfiguration";
+        
+        /// <summary>The Label given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
+        internal const string PrimaryDataSourceLabel = "";
+        
+        /// <summary>Razor Extensions (The "Extensions" property).</summary>
+        internal const string ExtensionsProperty = "Extensions";
+        
+        /// <summary>Backing field for the <see cref='Microsoft.Build.Framework.XamlTypes.Rule'/> property.</summary>
+        private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule;
+        
+        /// <summary>Backing field for the file name of the rule property.</summary>
+        private string file;
+        
+        /// <summary>Backing field for the ItemType property.</summary>
+        private string itemType;
+        
+        /// <summary>Backing field for the ItemName property.</summary>
+        private string itemName;
+        
+        /// <summary>Configured Project</summary>
+        private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject;
+        
+        /// <summary>The dictionary of named catalogs.</summary>
+        private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs;
+        
+        /// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary>
+        private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule;
+        
+        /// <summary>Thread locking object</summary>
+        private object locker = new object();
+        
+        /// <summary>Initializes a new instance of the RazorConfiguration class.</summary>
+        internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule)
+        {
+            this.rule = rule;
+        }
+        
+        /// <summary>Initializes a new instance of the RazorConfiguration class.</summary>
+        internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) : 
+                this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName))
+        {
+            if ((configuredProject == null))
+            {
+                throw new System.ArgumentNullException("configuredProject");
+            }
+            this.configuredProject = configuredProject;
+            this.catalogs = catalogs;
+            this.file = file;
+            this.itemType = itemType;
+            this.itemName = itemName;
+        }
+        
+        /// <summary>Initializes a new instance of the RazorConfiguration class.</summary>
+        internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) : 
+                this(rule)
+        {
+            if ((rule == null))
+            {
+                throw new System.ArgumentNullException("rule");
+            }
+            if ((configuredProject == null))
+            {
+                throw new System.ArgumentNullException("configuredProject");
+            }
+            this.configuredProject = configuredProject;
+            this.rule = rule;
+            this.file = this.rule.File;
+            this.itemType = this.rule.ItemType;
+            this.itemName = this.rule.ItemName;
+        }
+        
+        /// <summary>Initializes a new instance of the RazorConfiguration class.</summary>
+        internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) : 
+                this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName)
+        {
+        }
+        
+        /// <summary>Initializes a new instance of the RazorConfiguration class that assumes a project context (neither property sheet nor items).</summary>
+        internal RazorConfiguration(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) : 
+                this(configuredProject, catalogs, "Project", null, null, null)
+        {
+        }
+        
+        /// <summary>Gets the IRule used to get and set properties.</summary>
+        public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule
+        {
+            get
+            {
+                return this.rule;
+            }
+        }
+        
+        /// <summary>Razor Extensions</summary>
+        internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty Extensions
+        {
+            get
+            {
+                Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
+                if ((localRule == null))
+                {
+                    localRule = this.GeneratedFallbackRule;
+                }
+                if ((localRule == null))
+                {
+                    return null;
+                }
+                Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(ExtensionsProperty)));
+                if (((property == null) 
+                            && (this.GeneratedFallbackRule != null)))
+                {
+                    localRule = this.GeneratedFallbackRule;
+                    property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(ExtensionsProperty)));
+                }
+                return property;
+            }
+        }
+        
+        /// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary>
+        private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule
+        {
+            get
+            {
+                if (((this.fallbackRule == null) 
+                            && (this.configuredProject != null)))
+                {
+                    System.Threading.Monitor.Enter(this.locker);
+                    try
+                    {
+                        if ((this.fallbackRule == null))
+                        {
+                            this.InitializeFallbackRule();
+                        }
+                    }
+                    finally
+                    {
+                        System.Threading.Monitor.Exit(this.locker);
+                    }
+                }
+                return this.fallbackRule;
+            }
+        }
+        
+        private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName)
+        {
+            if ((catalog == null))
+            {
+                return null;
+            }
+            return catalog.BindToContext(SchemaName, file, itemType, itemName);
+        }
+        
+        private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext)
+        {
+            if ((propertiesContext.IsProjectFile == true))
+            {
+                return null;
+            }
+            else
+            {
+                return propertiesContext.File;
+            }
+        }
+        
+        private void InitializeFallbackRule()
+        {
+            if ((this.configuredProject == null))
+            {
+                return;
+            }
+            Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorConfiguration.deserializedFallbackRule;
+            if ((unboundRule == null))
+            {
+                System.IO.Stream xamlStream = null;
+                System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
+                try
+                {
+                    xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorConfiguration.xaml");
+                    Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream)));
+                    System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator();
+                    for (
+                    ; ((unboundRule == null) 
+                                && ruleEnumerator.MoveNext()); 
+                    )
+                    {
+                        Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
+                        if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName))
+                        {
+                            unboundRule = t;
+                            unboundRule.Name = "f269edfbdecc0079d5f539c22552711e194f39b2367903515ae5440a64b20a0f";
+                            RazorConfiguration.deserializedFallbackRule = unboundRule;
+                        }
+                    }
+                }
+                finally
+                {
+                    if ((xamlStream != null))
+                    {
+                        ((System.IDisposable)(xamlStream)).Dispose();
+                    }
+                }
+            }
+            this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext");
+            Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext");
+            this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName);
+        }
+    }
+    
+    internal partial class RazorProjectProperties
+    {
+        
+        private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorConfiguration> CreateRazorConfigurationPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorConfiguration>(CreateRazorConfigurationProperties);
+        
+        private static RazorConfiguration CreateRazorConfigurationProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state)
+        {
+            RazorProjectProperties that = ((RazorProjectProperties)(state));
+            return new RazorConfiguration(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName);
+        }
+        
+        /// <summary>Gets the strongly-typed property accessor used to get and set Configuration Properties properties.</summary>
+        internal System.Threading.Tasks.Task<RazorConfiguration> GetRazorConfigurationPropertiesAsync()
+        {
+            System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync();
+            return namedCatalogsTask.ContinueWith(CreateRazorConfigurationPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default);
+        }
+        
+        /// <summary>Gets the strongly-typed property accessor used to get value from the current project snapshot Configuration Properties properties.</summary>
+        internal bool TryGetCurrentRazorConfigurationPropertiesSnapshot(out RazorConfiguration snapshot, [System.Runtime.InteropServices.OptionalAttribute()] [System.Runtime.InteropServices.DefaultParameterValueAttribute(true)] bool requiredToMatchProjectVersion)
+        {
+            snapshot = null;
+            Microsoft.VisualStudio.ProjectSystem.IProjectVersionedValue<Microsoft.VisualStudio.ProjectSystem.Properties.IProjectCatalogSnapshot> catalogSnapshot;
+            if (this.TryGetCurrentCatalogSnapshot(out catalogSnapshot))
+            {
+                if (requiredToMatchProjectVersion)
+                {
+                    if ((this.ConfiguredProject.ProjectVersion.CompareTo(catalogSnapshot.DataSourceVersions[Microsoft.VisualStudio.ProjectSystem.ProjectDataSources.ConfiguredProjectVersion]) != 0))
+                    {
+                        return false;
+                    }
+                }
+                Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule = this.GetSnapshotRule(catalogSnapshot.Value, "Project", RazorConfiguration.SchemaName);
+                if ((rule != null))
+                {
+                    snapshot = new RazorConfiguration(rule, this.ConfiguredProject);
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
 }
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorExtension.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorExtension.cs
index 0ce503811b..6000099f24 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorExtension.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorExtension.cs
@@ -8,228 +8,296 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
-	
-	
-	internal partial class RazorExtension {
-		
-		/// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary>
-		private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule;
-		
-		/// <summary>The name of the schema to look for at runtime to fulfill property access.</summary>
-		internal const string SchemaName = "RazorExtension";
-		
-		/// <summary>The ItemType given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
-		internal const string PrimaryDataSourceItemType = "RazorExtension";
-		
-		/// <summary>The Label given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
-		internal const string PrimaryDataSourceLabel = "";
-		
-		/// <summary>Razor Extension Assembly Name (The "AssemblyName" property).</summary>
-		internal const string AssemblyNameProperty = "AssemblyName";
-		
-		/// <summary>Razor Extension Assembly File Path (The "AssemblyFilePath" property).</summary>
-		internal const string AssemblyFilePathProperty = "AssemblyFilePath";
-		
-		/// <summary>Backing field for the <see cref='Microsoft.Build.Framework.XamlTypes.Rule'/> property.</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule;
-		
-		/// <summary>Backing field for the file name of the rule property.</summary>
-		private string file;
-		
-		/// <summary>Backing field for the ItemType property.</summary>
-		private string itemType;
-		
-		/// <summary>Backing field for the ItemName property.</summary>
-		private string itemName;
-		
-		/// <summary>Configured Project</summary>
-		private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject;
-		
-		/// <summary>The dictionary of named catalogs.</summary>
-		private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs;
-		
-		/// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule;
-		
-		/// <summary>Thread locking object</summary>
-		private object locker = new object();
-		
-		/// <summary>Initializes a new instance of the RazorExtension class.</summary>
-		internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule) {
-			this.rule = rule;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorExtension class.</summary>
-		internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) : 
-				this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName)) {
-			if ((configuredProject == null)) {
-				throw new System.ArgumentNullException("configuredProject");
-			}
-			this.configuredProject = configuredProject;
-			this.catalogs = catalogs;
-			this.file = file;
-			this.itemType = itemType;
-			this.itemName = itemName;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorExtension class.</summary>
-		internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) : 
-				this(rule) {
-			if ((rule == null)) {
-				throw new System.ArgumentNullException("rule");
-			}
-			if ((configuredProject == null)) {
-				throw new System.ArgumentNullException("configuredProject");
-			}
-			this.configuredProject = configuredProject;
-			this.rule = rule;
-			this.file = this.rule.File;
-			this.itemType = this.rule.ItemType;
-			this.itemName = this.rule.ItemName;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorExtension class.</summary>
-		internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) : 
-				this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName) {
-		}
-		
-		/// <summary>Initializes a new instance of the RazorExtension class that assumes a project context (neither property sheet nor items).</summary>
-		internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) : 
-				this(configuredProject, catalogs, "Project", null, null, null) {
-		}
-		
-		/// <summary>Gets the IRule used to get and set properties.</summary>
-		public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule {
-			get {
-				return this.rule;
-			}
-		}
-		
-		/// <summary>Razor Extension Assembly Name</summary>
-		internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty AssemblyName {
-			get {
-				Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
-				if ((localRule == null)) {
-					localRule = this.GeneratedFallbackRule;
-				}
-				if ((localRule == null)) {
-					return null;
-				}
-				Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyNameProperty)));
-				if (((property == null) 
-							&& (this.GeneratedFallbackRule != null))) {
-					localRule = this.GeneratedFallbackRule;
-					property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyNameProperty)));
-				}
-				return property;
-			}
-		}
-		
-		/// <summary>Razor Extension Assembly File Path</summary>
-		internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty AssemblyFilePath {
-			get {
-				Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
-				if ((localRule == null)) {
-					localRule = this.GeneratedFallbackRule;
-				}
-				if ((localRule == null)) {
-					return null;
-				}
-				Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyFilePathProperty)));
-				if (((property == null) 
-							&& (this.GeneratedFallbackRule != null))) {
-					localRule = this.GeneratedFallbackRule;
-					property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyFilePathProperty)));
-				}
-				return property;
-			}
-		}
-		
-		/// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule {
-			get {
-				if (((this.fallbackRule == null) 
-							&& (this.configuredProject != null))) {
-					System.Threading.Monitor.Enter(this.locker);
-					try {
-						if ((this.fallbackRule == null)) {
-							this.InitializeFallbackRule();
-						}
-					}
-					finally {
-						System.Threading.Monitor.Exit(this.locker);
-					}
-				}
-				return this.fallbackRule;
-			}
-		}
-		
-		private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName) {
-			if ((catalog == null)) {
-				return null;
-			}
-			return catalog.BindToContext(SchemaName, file, itemType, itemName);
-		}
-		
-		private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext) {
-			if ((propertiesContext.IsProjectFile == true)) {
-				return null;
-			}
-			else {
-				return propertiesContext.File;
-			}
-		}
-		
-		private void InitializeFallbackRule() {
-			if ((this.configuredProject == null)) {
-				return;
-			}
-			Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorExtension.deserializedFallbackRule;
-			if ((unboundRule == null)) {
-				System.IO.Stream xamlStream = null;
-				System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
-				try {
-					xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorExtension.xaml");
-					Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream)));
-					System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator();
-					for (
-					; ((unboundRule == null) 
-								&& ruleEnumerator.MoveNext()); 
-					) {
-						Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
-						if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName)) {
-							unboundRule = t;
-							unboundRule.Name = "6b577687-703b-41a1-8f5f-c44644f65f2a";
-							RazorExtension.deserializedFallbackRule = unboundRule;
-						}
-					}
-				}
-				finally {
-					if ((xamlStream != null)) {
-						((System.IDisposable)(xamlStream)).Dispose();
-					}
-				}
-			}
-			this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext");
-			Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext");
-			this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName);
-		}
-	}
-	
-	internal partial class RazorProjectProperties {
-		
-		private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorExtension> CreateRazorExtensionPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorExtension>(CreateRazorExtensionProperties);
-		
-		private static RazorExtension CreateRazorExtensionProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state) {
-			RazorProjectProperties that = ((RazorProjectProperties)(state));
-			return new RazorExtension(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName);
-		}
-		
-		/// <summary>Gets the strongly-typed property accessor used to get and set Extension Properties properties.</summary>
-		internal System.Threading.Tasks.Task<RazorExtension> GetRazorExtensionPropertiesAsync() {
-			System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync();
-			return namedCatalogsTask.ContinueWith(CreateRazorExtensionPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default);
-		}
-	}
+namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules
+{
+    
+    
+    internal partial class RazorExtension
+    {
+        
+        /// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary>
+        private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule;
+        
+        /// <summary>The name of the schema to look for at runtime to fulfill property access.</summary>
+        internal const string SchemaName = "RazorExtension";
+        
+        /// <summary>The ItemType given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
+        internal const string PrimaryDataSourceItemType = "RazorExtension";
+        
+        /// <summary>The Label given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
+        internal const string PrimaryDataSourceLabel = "";
+        
+        /// <summary>Razor Extension Assembly Name (The "AssemblyName" property).</summary>
+        internal const string AssemblyNameProperty = "AssemblyName";
+        
+        /// <summary>Razor Extension Assembly File Path (The "AssemblyFilePath" property).</summary>
+        internal const string AssemblyFilePathProperty = "AssemblyFilePath";
+        
+        /// <summary>Backing field for the <see cref='Microsoft.Build.Framework.XamlTypes.Rule'/> property.</summary>
+        private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule;
+        
+        /// <summary>Backing field for the file name of the rule property.</summary>
+        private string file;
+        
+        /// <summary>Backing field for the ItemType property.</summary>
+        private string itemType;
+        
+        /// <summary>Backing field for the ItemName property.</summary>
+        private string itemName;
+        
+        /// <summary>Configured Project</summary>
+        private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject;
+        
+        /// <summary>The dictionary of named catalogs.</summary>
+        private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs;
+        
+        /// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary>
+        private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule;
+        
+        /// <summary>Thread locking object</summary>
+        private object locker = new object();
+        
+        /// <summary>Initializes a new instance of the RazorExtension class.</summary>
+        internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule)
+        {
+            this.rule = rule;
+        }
+        
+        /// <summary>Initializes a new instance of the RazorExtension class.</summary>
+        internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) : 
+                this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName))
+        {
+            if ((configuredProject == null))
+            {
+                throw new System.ArgumentNullException("configuredProject");
+            }
+            this.configuredProject = configuredProject;
+            this.catalogs = catalogs;
+            this.file = file;
+            this.itemType = itemType;
+            this.itemName = itemName;
+        }
+        
+        /// <summary>Initializes a new instance of the RazorExtension class.</summary>
+        internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) : 
+                this(rule)
+        {
+            if ((rule == null))
+            {
+                throw new System.ArgumentNullException("rule");
+            }
+            if ((configuredProject == null))
+            {
+                throw new System.ArgumentNullException("configuredProject");
+            }
+            this.configuredProject = configuredProject;
+            this.rule = rule;
+            this.file = this.rule.File;
+            this.itemType = this.rule.ItemType;
+            this.itemName = this.rule.ItemName;
+        }
+        
+        /// <summary>Initializes a new instance of the RazorExtension class.</summary>
+        internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) : 
+                this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName)
+        {
+        }
+        
+        /// <summary>Initializes a new instance of the RazorExtension class that assumes a project context (neither property sheet nor items).</summary>
+        internal RazorExtension(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) : 
+                this(configuredProject, catalogs, "Project", null, null, null)
+        {
+        }
+        
+        /// <summary>Gets the IRule used to get and set properties.</summary>
+        public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule
+        {
+            get
+            {
+                return this.rule;
+            }
+        }
+        
+        /// <summary>Razor Extension Assembly Name</summary>
+        internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty AssemblyName
+        {
+            get
+            {
+                Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
+                if ((localRule == null))
+                {
+                    localRule = this.GeneratedFallbackRule;
+                }
+                if ((localRule == null))
+                {
+                    return null;
+                }
+                Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyNameProperty)));
+                if (((property == null) 
+                            && (this.GeneratedFallbackRule != null)))
+                {
+                    localRule = this.GeneratedFallbackRule;
+                    property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyNameProperty)));
+                }
+                return property;
+            }
+        }
+        
+        /// <summary>Razor Extension Assembly File Path</summary>
+        internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty AssemblyFilePath
+        {
+            get
+            {
+                Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
+                if ((localRule == null))
+                {
+                    localRule = this.GeneratedFallbackRule;
+                }
+                if ((localRule == null))
+                {
+                    return null;
+                }
+                Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyFilePathProperty)));
+                if (((property == null) 
+                            && (this.GeneratedFallbackRule != null)))
+                {
+                    localRule = this.GeneratedFallbackRule;
+                    property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(AssemblyFilePathProperty)));
+                }
+                return property;
+            }
+        }
+        
+        /// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary>
+        private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule
+        {
+            get
+            {
+                if (((this.fallbackRule == null) 
+                            && (this.configuredProject != null)))
+                {
+                    System.Threading.Monitor.Enter(this.locker);
+                    try
+                    {
+                        if ((this.fallbackRule == null))
+                        {
+                            this.InitializeFallbackRule();
+                        }
+                    }
+                    finally
+                    {
+                        System.Threading.Monitor.Exit(this.locker);
+                    }
+                }
+                return this.fallbackRule;
+            }
+        }
+        
+        private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName)
+        {
+            if ((catalog == null))
+            {
+                return null;
+            }
+            return catalog.BindToContext(SchemaName, file, itemType, itemName);
+        }
+        
+        private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext)
+        {
+            if ((propertiesContext.IsProjectFile == true))
+            {
+                return null;
+            }
+            else
+            {
+                return propertiesContext.File;
+            }
+        }
+        
+        private void InitializeFallbackRule()
+        {
+            if ((this.configuredProject == null))
+            {
+                return;
+            }
+            Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorExtension.deserializedFallbackRule;
+            if ((unboundRule == null))
+            {
+                System.IO.Stream xamlStream = null;
+                System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
+                try
+                {
+                    xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorExtension.xaml");
+                    Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream)));
+                    System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator();
+                    for (
+                    ; ((unboundRule == null) 
+                                && ruleEnumerator.MoveNext()); 
+                    )
+                    {
+                        Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
+                        if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName))
+                        {
+                            unboundRule = t;
+                            unboundRule.Name = "e8ad5dd707beca947f7c014baa70b46c1d7a7fd6c8b49a5511ab299d8e1a3c70";
+                            RazorExtension.deserializedFallbackRule = unboundRule;
+                        }
+                    }
+                }
+                finally
+                {
+                    if ((xamlStream != null))
+                    {
+                        ((System.IDisposable)(xamlStream)).Dispose();
+                    }
+                }
+            }
+            this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext");
+            Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext");
+            this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName);
+        }
+    }
+    
+    internal partial class RazorProjectProperties
+    {
+        
+        private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorExtension> CreateRazorExtensionPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorExtension>(CreateRazorExtensionProperties);
+        
+        private static RazorExtension CreateRazorExtensionProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state)
+        {
+            RazorProjectProperties that = ((RazorProjectProperties)(state));
+            return new RazorExtension(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName);
+        }
+        
+        /// <summary>Gets the strongly-typed property accessor used to get and set Extension Properties properties.</summary>
+        internal System.Threading.Tasks.Task<RazorExtension> GetRazorExtensionPropertiesAsync()
+        {
+            System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync();
+            return namedCatalogsTask.ContinueWith(CreateRazorExtensionPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default);
+        }
+        
+        /// <summary>Gets the strongly-typed property accessor used to get value from the current project snapshot Extension Properties properties.</summary>
+        internal bool TryGetCurrentRazorExtensionPropertiesSnapshot(out RazorExtension snapshot, [System.Runtime.InteropServices.OptionalAttribute()] [System.Runtime.InteropServices.DefaultParameterValueAttribute(true)] bool requiredToMatchProjectVersion)
+        {
+            snapshot = null;
+            Microsoft.VisualStudio.ProjectSystem.IProjectVersionedValue<Microsoft.VisualStudio.ProjectSystem.Properties.IProjectCatalogSnapshot> catalogSnapshot;
+            if (this.TryGetCurrentCatalogSnapshot(out catalogSnapshot))
+            {
+                if (requiredToMatchProjectVersion)
+                {
+                    if ((this.ConfiguredProject.ProjectVersion.CompareTo(catalogSnapshot.DataSourceVersions[Microsoft.VisualStudio.ProjectSystem.ProjectDataSources.ConfiguredProjectVersion]) != 0))
+                    {
+                        return false;
+                    }
+                }
+                Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule = this.GetSnapshotRule(catalogSnapshot.Value, "Project", RazorExtension.SchemaName);
+                if ((rule != null))
+                {
+                    snapshot = new RazorExtension(rule, this.ConfiguredProject);
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
 }
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorGeneral.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorGeneral.cs
index 860fb1a80b..3c85d96d87 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorGeneral.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorGeneral.cs
@@ -8,228 +8,296 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
-	
-	
-	internal partial class RazorGeneral {
-		
-		/// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary>
-		private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule;
-		
-		/// <summary>The name of the schema to look for at runtime to fulfill property access.</summary>
-		internal const string SchemaName = "RazorGeneral";
-		
-		/// <summary>The ItemType given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
-		internal const string PrimaryDataSourceItemType = null;
-		
-		/// <summary>The Label given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
-		internal const string PrimaryDataSourceLabel = "";
-		
-		/// <summary>Razor Language Version (The "RazorLangVersion" property).</summary>
-		internal const string RazorLangVersionProperty = "RazorLangVersion";
-		
-		/// <summary>Razor Configuration Name (The "RazorDefaultConfiguration" property).</summary>
-		internal const string RazorDefaultConfigurationProperty = "RazorDefaultConfiguration";
-		
-		/// <summary>Backing field for the <see cref='Microsoft.Build.Framework.XamlTypes.Rule'/> property.</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule;
-		
-		/// <summary>Backing field for the file name of the rule property.</summary>
-		private string file;
-		
-		/// <summary>Backing field for the ItemType property.</summary>
-		private string itemType;
-		
-		/// <summary>Backing field for the ItemName property.</summary>
-		private string itemName;
-		
-		/// <summary>Configured Project</summary>
-		private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject;
-		
-		/// <summary>The dictionary of named catalogs.</summary>
-		private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs;
-		
-		/// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule;
-		
-		/// <summary>Thread locking object</summary>
-		private object locker = new object();
-		
-		/// <summary>Initializes a new instance of the RazorGeneral class.</summary>
-		internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule) {
-			this.rule = rule;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorGeneral class.</summary>
-		internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) : 
-				this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName)) {
-			if ((configuredProject == null)) {
-				throw new System.ArgumentNullException("configuredProject");
-			}
-			this.configuredProject = configuredProject;
-			this.catalogs = catalogs;
-			this.file = file;
-			this.itemType = itemType;
-			this.itemName = itemName;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorGeneral class.</summary>
-		internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) : 
-				this(rule) {
-			if ((rule == null)) {
-				throw new System.ArgumentNullException("rule");
-			}
-			if ((configuredProject == null)) {
-				throw new System.ArgumentNullException("configuredProject");
-			}
-			this.configuredProject = configuredProject;
-			this.rule = rule;
-			this.file = this.rule.File;
-			this.itemType = this.rule.ItemType;
-			this.itemName = this.rule.ItemName;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorGeneral class.</summary>
-		internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) : 
-				this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName) {
-		}
-		
-		/// <summary>Initializes a new instance of the RazorGeneral class that assumes a project context (neither property sheet nor items).</summary>
-		internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) : 
-				this(configuredProject, catalogs, "Project", null, null, null) {
-		}
-		
-		/// <summary>Gets the IRule used to get and set properties.</summary>
-		public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule {
-			get {
-				return this.rule;
-			}
-		}
-		
-		/// <summary>Razor Language Version</summary>
-		internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty RazorLangVersion {
-			get {
-				Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
-				if ((localRule == null)) {
-					localRule = this.GeneratedFallbackRule;
-				}
-				if ((localRule == null)) {
-					return null;
-				}
-				Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorLangVersionProperty)));
-				if (((property == null) 
-							&& (this.GeneratedFallbackRule != null))) {
-					localRule = this.GeneratedFallbackRule;
-					property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorLangVersionProperty)));
-				}
-				return property;
-			}
-		}
-		
-		/// <summary>Razor Configuration Name</summary>
-		internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty RazorDefaultConfiguration {
-			get {
-				Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
-				if ((localRule == null)) {
-					localRule = this.GeneratedFallbackRule;
-				}
-				if ((localRule == null)) {
-					return null;
-				}
-				Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorDefaultConfigurationProperty)));
-				if (((property == null) 
-							&& (this.GeneratedFallbackRule != null))) {
-					localRule = this.GeneratedFallbackRule;
-					property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorDefaultConfigurationProperty)));
-				}
-				return property;
-			}
-		}
-		
-		/// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule {
-			get {
-				if (((this.fallbackRule == null) 
-							&& (this.configuredProject != null))) {
-					System.Threading.Monitor.Enter(this.locker);
-					try {
-						if ((this.fallbackRule == null)) {
-							this.InitializeFallbackRule();
-						}
-					}
-					finally {
-						System.Threading.Monitor.Exit(this.locker);
-					}
-				}
-				return this.fallbackRule;
-			}
-		}
-		
-		private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName) {
-			if ((catalog == null)) {
-				return null;
-			}
-			return catalog.BindToContext(SchemaName, file, itemType, itemName);
-		}
-		
-		private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext) {
-			if ((propertiesContext.IsProjectFile == true)) {
-				return null;
-			}
-			else {
-				return propertiesContext.File;
-			}
-		}
-		
-		private void InitializeFallbackRule() {
-			if ((this.configuredProject == null)) {
-				return;
-			}
-			Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorGeneral.deserializedFallbackRule;
-			if ((unboundRule == null)) {
-				System.IO.Stream xamlStream = null;
-				System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
-				try {
-					xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorGeneral.xaml");
-					Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream)));
-					System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator();
-					for (
-					; ((unboundRule == null) 
-								&& ruleEnumerator.MoveNext()); 
-					) {
-						Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
-						if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName)) {
-							unboundRule = t;
-							unboundRule.Name = "e0400917-b7e9-4731-b3e6-447b229db9d4";
-							RazorGeneral.deserializedFallbackRule = unboundRule;
-						}
-					}
-				}
-				finally {
-					if ((xamlStream != null)) {
-						((System.IDisposable)(xamlStream)).Dispose();
-					}
-				}
-			}
-			this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext");
-			Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext");
-			this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName);
-		}
-	}
-	
-	internal partial class RazorProjectProperties {
-		
-		private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGeneral> CreateRazorGeneralPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGeneral>(CreateRazorGeneralProperties);
-		
-		private static RazorGeneral CreateRazorGeneralProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state) {
-			RazorProjectProperties that = ((RazorProjectProperties)(state));
-			return new RazorGeneral(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName);
-		}
-		
-		/// <summary>Gets the strongly-typed property accessor used to get and set Razor Properties properties.</summary>
-		internal System.Threading.Tasks.Task<RazorGeneral> GetRazorGeneralPropertiesAsync() {
-			System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync();
-			return namedCatalogsTask.ContinueWith(CreateRazorGeneralPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default);
-		}
-	}
+namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules
+{
+    
+    
+    internal partial class RazorGeneral
+    {
+        
+        /// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary>
+        private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule;
+        
+        /// <summary>The name of the schema to look for at runtime to fulfill property access.</summary>
+        internal const string SchemaName = "RazorGeneral";
+        
+        /// <summary>The ItemType given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
+        internal const string PrimaryDataSourceItemType = null;
+        
+        /// <summary>The Label given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
+        internal const string PrimaryDataSourceLabel = "";
+        
+        /// <summary>Razor Language Version (The "RazorLangVersion" property).</summary>
+        internal const string RazorLangVersionProperty = "RazorLangVersion";
+        
+        /// <summary>Razor Configuration Name (The "RazorDefaultConfiguration" property).</summary>
+        internal const string RazorDefaultConfigurationProperty = "RazorDefaultConfiguration";
+        
+        /// <summary>Backing field for the <see cref='Microsoft.Build.Framework.XamlTypes.Rule'/> property.</summary>
+        private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule;
+        
+        /// <summary>Backing field for the file name of the rule property.</summary>
+        private string file;
+        
+        /// <summary>Backing field for the ItemType property.</summary>
+        private string itemType;
+        
+        /// <summary>Backing field for the ItemName property.</summary>
+        private string itemName;
+        
+        /// <summary>Configured Project</summary>
+        private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject;
+        
+        /// <summary>The dictionary of named catalogs.</summary>
+        private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs;
+        
+        /// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary>
+        private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule;
+        
+        /// <summary>Thread locking object</summary>
+        private object locker = new object();
+        
+        /// <summary>Initializes a new instance of the RazorGeneral class.</summary>
+        internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule)
+        {
+            this.rule = rule;
+        }
+        
+        /// <summary>Initializes a new instance of the RazorGeneral class.</summary>
+        internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) : 
+                this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName))
+        {
+            if ((configuredProject == null))
+            {
+                throw new System.ArgumentNullException("configuredProject");
+            }
+            this.configuredProject = configuredProject;
+            this.catalogs = catalogs;
+            this.file = file;
+            this.itemType = itemType;
+            this.itemName = itemName;
+        }
+        
+        /// <summary>Initializes a new instance of the RazorGeneral class.</summary>
+        internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) : 
+                this(rule)
+        {
+            if ((rule == null))
+            {
+                throw new System.ArgumentNullException("rule");
+            }
+            if ((configuredProject == null))
+            {
+                throw new System.ArgumentNullException("configuredProject");
+            }
+            this.configuredProject = configuredProject;
+            this.rule = rule;
+            this.file = this.rule.File;
+            this.itemType = this.rule.ItemType;
+            this.itemName = this.rule.ItemName;
+        }
+        
+        /// <summary>Initializes a new instance of the RazorGeneral class.</summary>
+        internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) : 
+                this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName)
+        {
+        }
+        
+        /// <summary>Initializes a new instance of the RazorGeneral class that assumes a project context (neither property sheet nor items).</summary>
+        internal RazorGeneral(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) : 
+                this(configuredProject, catalogs, "Project", null, null, null)
+        {
+        }
+        
+        /// <summary>Gets the IRule used to get and set properties.</summary>
+        public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule
+        {
+            get
+            {
+                return this.rule;
+            }
+        }
+        
+        /// <summary>Razor Language Version</summary>
+        internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty RazorLangVersion
+        {
+            get
+            {
+                Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
+                if ((localRule == null))
+                {
+                    localRule = this.GeneratedFallbackRule;
+                }
+                if ((localRule == null))
+                {
+                    return null;
+                }
+                Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorLangVersionProperty)));
+                if (((property == null) 
+                            && (this.GeneratedFallbackRule != null)))
+                {
+                    localRule = this.GeneratedFallbackRule;
+                    property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorLangVersionProperty)));
+                }
+                return property;
+            }
+        }
+        
+        /// <summary>Razor Configuration Name</summary>
+        internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty RazorDefaultConfiguration
+        {
+            get
+            {
+                Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
+                if ((localRule == null))
+                {
+                    localRule = this.GeneratedFallbackRule;
+                }
+                if ((localRule == null))
+                {
+                    return null;
+                }
+                Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorDefaultConfigurationProperty)));
+                if (((property == null) 
+                            && (this.GeneratedFallbackRule != null)))
+                {
+                    localRule = this.GeneratedFallbackRule;
+                    property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(RazorDefaultConfigurationProperty)));
+                }
+                return property;
+            }
+        }
+        
+        /// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary>
+        private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule
+        {
+            get
+            {
+                if (((this.fallbackRule == null) 
+                            && (this.configuredProject != null)))
+                {
+                    System.Threading.Monitor.Enter(this.locker);
+                    try
+                    {
+                        if ((this.fallbackRule == null))
+                        {
+                            this.InitializeFallbackRule();
+                        }
+                    }
+                    finally
+                    {
+                        System.Threading.Monitor.Exit(this.locker);
+                    }
+                }
+                return this.fallbackRule;
+            }
+        }
+        
+        private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName)
+        {
+            if ((catalog == null))
+            {
+                return null;
+            }
+            return catalog.BindToContext(SchemaName, file, itemType, itemName);
+        }
+        
+        private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext)
+        {
+            if ((propertiesContext.IsProjectFile == true))
+            {
+                return null;
+            }
+            else
+            {
+                return propertiesContext.File;
+            }
+        }
+        
+        private void InitializeFallbackRule()
+        {
+            if ((this.configuredProject == null))
+            {
+                return;
+            }
+            Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorGeneral.deserializedFallbackRule;
+            if ((unboundRule == null))
+            {
+                System.IO.Stream xamlStream = null;
+                System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
+                try
+                {
+                    xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorGeneral.xaml");
+                    Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream)));
+                    System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator();
+                    for (
+                    ; ((unboundRule == null) 
+                                && ruleEnumerator.MoveNext()); 
+                    )
+                    {
+                        Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
+                        if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName))
+                        {
+                            unboundRule = t;
+                            unboundRule.Name = "6851f2efc446915a1288ec829aa82f7dc9bcfc6addb65b97866a1bc9e30b3348";
+                            RazorGeneral.deserializedFallbackRule = unboundRule;
+                        }
+                    }
+                }
+                finally
+                {
+                    if ((xamlStream != null))
+                    {
+                        ((System.IDisposable)(xamlStream)).Dispose();
+                    }
+                }
+            }
+            this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext");
+            Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext");
+            this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName);
+        }
+    }
+    
+    internal partial class RazorProjectProperties
+    {
+        
+        private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGeneral> CreateRazorGeneralPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGeneral>(CreateRazorGeneralProperties);
+        
+        private static RazorGeneral CreateRazorGeneralProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state)
+        {
+            RazorProjectProperties that = ((RazorProjectProperties)(state));
+            return new RazorGeneral(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName);
+        }
+        
+        /// <summary>Gets the strongly-typed property accessor used to get and set Razor Properties properties.</summary>
+        internal System.Threading.Tasks.Task<RazorGeneral> GetRazorGeneralPropertiesAsync()
+        {
+            System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync();
+            return namedCatalogsTask.ContinueWith(CreateRazorGeneralPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default);
+        }
+        
+        /// <summary>Gets the strongly-typed property accessor used to get value from the current project snapshot Razor Properties properties.</summary>
+        internal bool TryGetCurrentRazorGeneralPropertiesSnapshot(out RazorGeneral snapshot, [System.Runtime.InteropServices.OptionalAttribute()] [System.Runtime.InteropServices.DefaultParameterValueAttribute(true)] bool requiredToMatchProjectVersion)
+        {
+            snapshot = null;
+            Microsoft.VisualStudio.ProjectSystem.IProjectVersionedValue<Microsoft.VisualStudio.ProjectSystem.Properties.IProjectCatalogSnapshot> catalogSnapshot;
+            if (this.TryGetCurrentCatalogSnapshot(out catalogSnapshot))
+            {
+                if (requiredToMatchProjectVersion)
+                {
+                    if ((this.ConfiguredProject.ProjectVersion.CompareTo(catalogSnapshot.DataSourceVersions[Microsoft.VisualStudio.ProjectSystem.ProjectDataSources.ConfiguredProjectVersion]) != 0))
+                    {
+                        return false;
+                    }
+                }
+                Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule = this.GetSnapshotRule(catalogSnapshot.Value, "Project", RazorGeneral.SchemaName);
+                if ((rule != null))
+                {
+                    snapshot = new RazorGeneral(rule, this.ConfiguredProject);
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
 }
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorGenerateWithTargetPath.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorGenerateWithTargetPath.cs
index 8428e7244f..3b58d8dd23 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorGenerateWithTargetPath.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorGenerateWithTargetPath.cs
@@ -8,205 +8,268 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules {
-	
-	
-	internal partial class RazorGenerateWithTargetPath {
-		
-		/// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary>
-		private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule;
-		
-		/// <summary>The name of the schema to look for at runtime to fulfill property access.</summary>
-		internal const string SchemaName = "RazorGenerateWithTargetPath";
-		
-		/// <summary>The ItemType given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
-		internal const string PrimaryDataSourceItemType = "RazorGenerateWithTargetPath";
-		
-		/// <summary>The Label given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
-		internal const string PrimaryDataSourceLabel = "";
-		
-		/// <summary>Target Path (The "TargetPath" property).</summary>
-		internal const string TargetPathProperty = "TargetPath";
-		
-		/// <summary>Backing field for the <see cref='Microsoft.Build.Framework.XamlTypes.Rule'/> property.</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule;
-		
-		/// <summary>Backing field for the file name of the rule property.</summary>
-		private string file;
-		
-		/// <summary>Backing field for the ItemType property.</summary>
-		private string itemType;
-		
-		/// <summary>Backing field for the ItemName property.</summary>
-		private string itemName;
-		
-		/// <summary>Configured Project</summary>
-		private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject;
-		
-		/// <summary>The dictionary of named catalogs.</summary>
-		private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs;
-		
-		/// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule;
-		
-		/// <summary>Thread locking object</summary>
-		private object locker = new object();
-		
-		/// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary>
-		internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule) {
-			this.rule = rule;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary>
-		internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) : 
-				this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName)) {
-			if ((configuredProject == null)) {
-				throw new System.ArgumentNullException("configuredProject");
-			}
-			this.configuredProject = configuredProject;
-			this.catalogs = catalogs;
-			this.file = file;
-			this.itemType = itemType;
-			this.itemName = itemName;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary>
-		internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) : 
-				this(rule) {
-			if ((rule == null)) {
-				throw new System.ArgumentNullException("rule");
-			}
-			if ((configuredProject == null)) {
-				throw new System.ArgumentNullException("configuredProject");
-			}
-			this.configuredProject = configuredProject;
-			this.rule = rule;
-			this.file = this.rule.File;
-			this.itemType = this.rule.ItemType;
-			this.itemName = this.rule.ItemName;
-		}
-		
-		/// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary>
-		internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) : 
-				this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName) {
-		}
-		
-		/// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class that assumes a project context (neither property sheet nor items).</summary>
-		internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) : 
-				this(configuredProject, catalogs, "Project", null, null, null) {
-		}
-		
-		/// <summary>Gets the IRule used to get and set properties.</summary>
-		public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule {
-			get {
-				return this.rule;
-			}
-		}
-		
-		/// <summary>Target Path</summary>
-		internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty TargetPath {
-			get {
-				Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
-				if ((localRule == null)) {
-					localRule = this.GeneratedFallbackRule;
-				}
-				if ((localRule == null)) {
-					return null;
-				}
-				Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(TargetPathProperty)));
-				if (((property == null) 
-							&& (this.GeneratedFallbackRule != null))) {
-					localRule = this.GeneratedFallbackRule;
-					property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(TargetPathProperty)));
-				}
-				return property;
-			}
-		}
-		
-		/// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary>
-		private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule {
-			get {
-				if (((this.fallbackRule == null) 
-							&& (this.configuredProject != null))) {
-					System.Threading.Monitor.Enter(this.locker);
-					try {
-						if ((this.fallbackRule == null)) {
-							this.InitializeFallbackRule();
-						}
-					}
-					finally {
-						System.Threading.Monitor.Exit(this.locker);
-					}
-				}
-				return this.fallbackRule;
-			}
-		}
-		
-		private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName) {
-			if ((catalog == null)) {
-				return null;
-			}
-			return catalog.BindToContext(SchemaName, file, itemType, itemName);
-		}
-		
-		private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext) {
-			if ((propertiesContext.IsProjectFile == true)) {
-				return null;
-			}
-			else {
-				return propertiesContext.File;
-			}
-		}
-		
-		private void InitializeFallbackRule() {
-			if ((this.configuredProject == null)) {
-				return;
-			}
-			Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorGenerateWithTargetPath.deserializedFallbackRule;
-			if ((unboundRule == null)) {
-				System.IO.Stream xamlStream = null;
-				System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
-				try {
-					xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorGenerateWithTargetPath.xaml");
-					Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream)));
-					System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator();
-					for (
-					; ((unboundRule == null) 
-								&& ruleEnumerator.MoveNext()); 
-					) {
-						Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
-						if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName)) {
-							unboundRule = t;
-							unboundRule.Name = "4d01f23e-96db-4c90-9c01-17b7f8b61243";
-							RazorGenerateWithTargetPath.deserializedFallbackRule = unboundRule;
-						}
-					}
-				}
-				finally {
-					if ((xamlStream != null)) {
-						((System.IDisposable)(xamlStream)).Dispose();
-					}
-				}
-			}
-			this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext");
-			Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext");
-			this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName);
-		}
-	}
-	
-	internal partial class RazorProjectProperties {
-		
-		private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGenerateWithTargetPath> CreateRazorGenerateWithTargetPathPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGenerateWithTargetPath>(CreateRazorGenerateWithTargetPathProperties);
-		
-		private static RazorGenerateWithTargetPath CreateRazorGenerateWithTargetPathProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state) {
-			RazorProjectProperties that = ((RazorProjectProperties)(state));
-			return new RazorGenerateWithTargetPath(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName);
-		}
-		
-		/// <summary>Gets the strongly-typed property accessor used to get and set Razor Document Properties properties.</summary>
-		internal System.Threading.Tasks.Task<RazorGenerateWithTargetPath> GetRazorGenerateWithTargetPathPropertiesAsync() {
-			System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync();
-			return namedCatalogsTask.ContinueWith(CreateRazorGenerateWithTargetPathPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default);
-		}
-	}
+namespace Microsoft.CodeAnalysis.Razor.ProjectSystem.Rules
+{
+    
+    
+    internal partial class RazorGenerateWithTargetPath
+    {
+        
+        /// <summary>Backing field for deserialized rule.<see cref='Microsoft.Build.Framework.XamlTypes.Rule'/>.</summary>
+        private static Microsoft.Build.Framework.XamlTypes.Rule deserializedFallbackRule;
+        
+        /// <summary>The name of the schema to look for at runtime to fulfill property access.</summary>
+        internal const string SchemaName = "RazorGenerateWithTargetPath";
+        
+        /// <summary>The ItemType given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
+        internal const string PrimaryDataSourceItemType = "RazorGenerateWithTargetPath";
+        
+        /// <summary>The Label given in the Rule.DataSource property.  May not apply to every Property's individual DataSource.</summary>
+        internal const string PrimaryDataSourceLabel = "";
+        
+        /// <summary> (The "TargetPath" property).</summary>
+        internal const string TargetPathProperty = "TargetPath";
+        
+        /// <summary>Backing field for the <see cref='Microsoft.Build.Framework.XamlTypes.Rule'/> property.</summary>
+        private Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule;
+        
+        /// <summary>Backing field for the file name of the rule property.</summary>
+        private string file;
+        
+        /// <summary>Backing field for the ItemType property.</summary>
+        private string itemType;
+        
+        /// <summary>Backing field for the ItemName property.</summary>
+        private string itemName;
+        
+        /// <summary>Configured Project</summary>
+        private Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject;
+        
+        /// <summary>The dictionary of named catalogs.</summary>
+        private System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs;
+        
+        /// <summary>Backing field for the <see cref='Microsoft.VisualStudio.ProjectSystem.Properties.IRule'/> property.</summary>
+        private Microsoft.VisualStudio.ProjectSystem.Properties.IRule fallbackRule;
+        
+        /// <summary>Thread locking object</summary>
+        private object locker = new object();
+        
+        /// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary>
+        internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule)
+        {
+            this.rule = rule;
+        }
+        
+        /// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary>
+        internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, string file, string itemType, string itemName) : 
+                this(GetRule(System.Collections.Immutable.ImmutableDictionary.GetValueOrDefault(catalogs, context), file, itemType, itemName))
+        {
+            if ((configuredProject == null))
+            {
+                throw new System.ArgumentNullException("configuredProject");
+            }
+            this.configuredProject = configuredProject;
+            this.catalogs = catalogs;
+            this.file = file;
+            this.itemType = itemType;
+            this.itemName = itemName;
+        }
+        
+        /// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary>
+        internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule, Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject) : 
+                this(rule)
+        {
+            if ((rule == null))
+            {
+                throw new System.ArgumentNullException("rule");
+            }
+            if ((configuredProject == null))
+            {
+                throw new System.ArgumentNullException("configuredProject");
+            }
+            this.configuredProject = configuredProject;
+            this.rule = rule;
+            this.file = this.rule.File;
+            this.itemType = this.rule.ItemType;
+            this.itemName = this.rule.ItemName;
+        }
+        
+        /// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class.</summary>
+        internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs, string context, Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertyContext) : 
+                this(configuredProject, catalogs, context, GetContextFile(propertyContext), propertyContext.ItemType, propertyContext.ItemName)
+        {
+        }
+        
+        /// <summary>Initializes a new instance of the RazorGenerateWithTargetPath class that assumes a project context (neither property sheet nor items).</summary>
+        internal RazorGenerateWithTargetPath(Microsoft.VisualStudio.ProjectSystem.ConfiguredProject configuredProject, System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog> catalogs) : 
+                this(configuredProject, catalogs, "Project", null, null, null)
+        {
+        }
+        
+        /// <summary>Gets the IRule used to get and set properties.</summary>
+        public Microsoft.VisualStudio.ProjectSystem.Properties.IRule Rule
+        {
+            get
+            {
+                return this.rule;
+            }
+        }
+        
+        /// <summary>TargetPath</summary>
+        internal Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty TargetPath
+        {
+            get
+            {
+                Microsoft.VisualStudio.ProjectSystem.Properties.IRule localRule = this.rule;
+                if ((localRule == null))
+                {
+                    localRule = this.GeneratedFallbackRule;
+                }
+                if ((localRule == null))
+                {
+                    return null;
+                }
+                Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(TargetPathProperty)));
+                if (((property == null) 
+                            && (this.GeneratedFallbackRule != null)))
+                {
+                    localRule = this.GeneratedFallbackRule;
+                    property = ((Microsoft.VisualStudio.ProjectSystem.Properties.IEvaluatedProperty)(localRule.GetProperty(TargetPathProperty)));
+                }
+                return property;
+            }
+        }
+        
+        /// <summary>Get the fallback rule if the current rule on disk is missing or a property in the rule on disk is missing</summary>
+        private Microsoft.VisualStudio.ProjectSystem.Properties.IRule GeneratedFallbackRule
+        {
+            get
+            {
+                if (((this.fallbackRule == null) 
+                            && (this.configuredProject != null)))
+                {
+                    System.Threading.Monitor.Enter(this.locker);
+                    try
+                    {
+                        if ((this.fallbackRule == null))
+                        {
+                            this.InitializeFallbackRule();
+                        }
+                    }
+                    finally
+                    {
+                        System.Threading.Monitor.Exit(this.locker);
+                    }
+                }
+                return this.fallbackRule;
+            }
+        }
+        
+        private static Microsoft.VisualStudio.ProjectSystem.Properties.IRule GetRule(Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog, string file, string itemType, string itemName)
+        {
+            if ((catalog == null))
+            {
+                return null;
+            }
+            return catalog.BindToContext(SchemaName, file, itemType, itemName);
+        }
+        
+        private static string GetContextFile(Microsoft.VisualStudio.ProjectSystem.Properties.IProjectPropertiesContext propertiesContext)
+        {
+            if ((propertiesContext.IsProjectFile == true))
+            {
+                return null;
+            }
+            else
+            {
+                return propertiesContext.File;
+            }
+        }
+        
+        private void InitializeFallbackRule()
+        {
+            if ((this.configuredProject == null))
+            {
+                return;
+            }
+            Microsoft.Build.Framework.XamlTypes.Rule unboundRule = RazorGenerateWithTargetPath.deserializedFallbackRule;
+            if ((unboundRule == null))
+            {
+                System.IO.Stream xamlStream = null;
+                System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
+                try
+                {
+                    xamlStream = thisAssembly.GetManifestResourceStream("XamlRuleToCode:RazorGenerateWithTargetPath.xaml");
+                    Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode root = ((Microsoft.Build.Framework.XamlTypes.IProjectSchemaNode)(System.Xaml.XamlServices.Load(xamlStream)));
+                    System.Collections.Generic.IEnumerator<System.Object> ruleEnumerator = root.GetSchemaObjects(typeof(Microsoft.Build.Framework.XamlTypes.Rule)).GetEnumerator();
+                    for (
+                    ; ((unboundRule == null) 
+                                && ruleEnumerator.MoveNext()); 
+                    )
+                    {
+                        Microsoft.Build.Framework.XamlTypes.Rule t = ((Microsoft.Build.Framework.XamlTypes.Rule)(ruleEnumerator.Current));
+                        if (System.StringComparer.OrdinalIgnoreCase.Equals(t.Name, SchemaName))
+                        {
+                            unboundRule = t;
+                            unboundRule.Name = "4325a10cce970a389c33b97140c4307d2e10664e053c75cf9e0e0fd08288774f";
+                            RazorGenerateWithTargetPath.deserializedFallbackRule = unboundRule;
+                        }
+                    }
+                }
+                finally
+                {
+                    if ((xamlStream != null))
+                    {
+                        ((System.IDisposable)(xamlStream)).Dispose();
+                    }
+                }
+            }
+            this.configuredProject.Services.AdditionalRuleDefinitions.AddRuleDefinition(unboundRule, "FallbackRuleCodeGenerationContext");
+            Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog catalog = this.configuredProject.Services.PropertyPagesCatalog.GetMemoryOnlyCatalog("FallbackRuleCodeGenerationContext");
+            this.fallbackRule = catalog.BindToContext(unboundRule.Name, this.file, this.itemType, this.itemName);
+        }
+    }
+    
+    internal partial class RazorProjectProperties
+    {
+        
+        private static System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGenerateWithTargetPath> CreateRazorGenerateWithTargetPathPropertiesDelegate = new System.Func<System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>>, object, RazorGenerateWithTargetPath>(CreateRazorGenerateWithTargetPathProperties);
+        
+        private static RazorGenerateWithTargetPath CreateRazorGenerateWithTargetPathProperties(System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogs, object state)
+        {
+            RazorProjectProperties that = ((RazorProjectProperties)(state));
+            return new RazorGenerateWithTargetPath(that.ConfiguredProject, namedCatalogs.Result, "Project", that.File, that.ItemType, that.ItemName);
+        }
+        
+        /// <summary>Gets the strongly-typed property accessor used to get and set Razor Document Properties properties.</summary>
+        internal System.Threading.Tasks.Task<RazorGenerateWithTargetPath> GetRazorGenerateWithTargetPathPropertiesAsync()
+        {
+            System.Threading.Tasks.Task<System.Collections.Immutable.IImmutableDictionary<string, Microsoft.VisualStudio.ProjectSystem.Properties.IPropertyPagesCatalog>> namedCatalogsTask = this.GetNamedCatalogsAsync();
+            return namedCatalogsTask.ContinueWith(CreateRazorGenerateWithTargetPathPropertiesDelegate, this, System.Threading.CancellationToken.None, System.Threading.Tasks.TaskContinuationOptions.ExecuteSynchronously, System.Threading.Tasks.TaskScheduler.Default);
+        }
+        
+        /// <summary>Gets the strongly-typed property accessor used to get value from the current project snapshot Razor Document Properties properties.</summary>
+        internal bool TryGetCurrentRazorGenerateWithTargetPathPropertiesSnapshot(out RazorGenerateWithTargetPath snapshot, [System.Runtime.InteropServices.OptionalAttribute()] [System.Runtime.InteropServices.DefaultParameterValueAttribute(true)] bool requiredToMatchProjectVersion)
+        {
+            snapshot = null;
+            Microsoft.VisualStudio.ProjectSystem.IProjectVersionedValue<Microsoft.VisualStudio.ProjectSystem.Properties.IProjectCatalogSnapshot> catalogSnapshot;
+            if (this.TryGetCurrentCatalogSnapshot(out catalogSnapshot))
+            {
+                if (requiredToMatchProjectVersion)
+                {
+                    if ((this.ConfiguredProject.ProjectVersion.CompareTo(catalogSnapshot.DataSourceVersions[Microsoft.VisualStudio.ProjectSystem.ProjectDataSources.ConfiguredProjectVersion]) != 0))
+                    {
+                        return false;
+                    }
+                }
+                Microsoft.VisualStudio.ProjectSystem.Properties.IRule rule = this.GetSnapshotRule(catalogSnapshot.Value, "Project", RazorGenerateWithTargetPath.SchemaName);
+                if ((rule != null))
+                {
+                    snapshot = new RazorGenerateWithTargetPath(rule, this.ConfiguredProject);
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
 }
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Microsoft.VisualStudio.Mac.LanguageServices.Razor.csproj b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Microsoft.VisualStudio.Mac.LanguageServices.Razor.csproj
index 69e9071704..b3c81528d1 100644
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Microsoft.VisualStudio.Mac.LanguageServices.Razor.csproj
+++ b/src/Razor/src/Microsoft.VisualStudio.Mac.LanguageServices.Razor/Microsoft.VisualStudio.Mac.LanguageServices.Razor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure for Visual Studio for Mac.</Description>
     <EnableApiCheck>false</EnableApiCheck>
   </PropertyGroup>
@@ -15,4 +15,8 @@
     <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Editor.Razor\Microsoft.VisualStudio.Editor.Razor.csproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' ">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssemblies)" PrivateAssets="All" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Razor/src/RazorPageGenerator/Program.cs b/src/Razor/src/RazorPageGenerator/Program.cs
index 49a3154c90..5661d34cd3 100644
--- a/src/Razor/src/RazorPageGenerator/Program.cs
+++ b/src/Razor/src/RazorPageGenerator/Program.cs
@@ -61,7 +61,6 @@ Examples:
                         @class.Modifiers.Add("internal");
                     });
 
-                FunctionsDirective.Register(builder);
                 InheritsDirective.Register(builder);
                 SectionDirective.Register(builder);
 
diff --git a/src/Razor/src/RazorPageGenerator/RazorPageGenerator.csproj b/src/Razor/src/RazorPageGenerator/RazorPageGenerator.csproj
index 2668c16904..c7a690e4d6 100644
--- a/src/Razor/src/RazorPageGenerator/RazorPageGenerator.csproj
+++ b/src/Razor/src/RazorPageGenerator/RazorPageGenerator.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Builds Razor pages for views in a project. For internal use only.</Description>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>dotnet-razorpagegenerator</AssemblyName>
     <PackageId>RazorPageGenerator</PackageId>
     <OutputType>Exe</OutputType>
diff --git a/src/Razor/test/Directory.Build.props b/src/Razor/test/Directory.Build.props
index 1b12a7a57d..981d3641f8 100644
--- a/src/Razor/test/Directory.Build.props
+++ b/src/Razor/test/Directory.Build.props
@@ -2,7 +2,7 @@
   <Import Project="..\Directory.Build.props" />
 
   <PropertyGroup>
-    <DeveloperBuildTestTfms>netcoreapp2.2</DeveloperBuildTestTfms>
+    <DeveloperBuildTestTfms>netcoreapp3.0</DeveloperBuildTestTfms>
     <StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
     <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' ">$(StandardTestTfms)</StandardTestTfms>
     <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">net461;$(StandardTestTfms)</StandardTestTfms>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InjectDirectiveTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InjectDirectiveTest.cs
index eda37a3b99..54a2fa4fd1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InjectDirectiveTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InjectDirectiveTest.cs
@@ -194,22 +194,9 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
                 }
             }
 
-            return codeDocument.GetDocumentIntermediateNode();
-        }
-
-        private string GetCSharpContent(IntermediateNode node)
-        {
-            var builder = new StringBuilder();
-            for (var i = 0; i < node.Children.Count; i++)
-            {
-                var child = node.Children[i] as IntermediateToken;
-                if (child.Kind == TokenKind.CSharp)
-                {
-                    builder.Append(child.Content);
-                }
-            }
-
-            return builder.ToString();
+            var irDocument = codeDocument.GetDocumentIntermediateNode();
+            irDocument.DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind;
+            return irDocument;
         }
 
         private class ClassNodeVisitor : IntermediateNodeWalker
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/CodeGenerationIntegrationTest.cs
index b36e2dcad9..8273810ca3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/CodeGenerationIntegrationTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -19,9 +19,9 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.IntegrationTests
             : base(generateBaselines: null)
         {
             Configuration = RazorConfiguration.Create(
-                RazorLanguageVersion.Version_2_0,
-                "MVC-2.1",
-                new[] { new AssemblyExtension("MVC-2.1", typeof(ExtensionInitializer).Assembly) });
+                RazorLanguageVersion.Version_3_0,
+                "MVC-3.0",
+                new[] { new AssemblyExtension("MVC-3.0", typeof(ExtensionInitializer).Assembly) });
         }
 
         protected override CSharpCompilation BaseCompilation => DefaultBaseCompilation;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
index 8dcca8cc7c..86d975d404 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
@@ -41,11 +41,11 @@
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <MvcShim Condition="$(TargetFramework) != ''" Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim\bin\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.deps.json" />
-  </ItemGroup>
-
   <Target Name="CopyDepsFromShims" AfterTargets="Build">
+    <ItemGroup>
+      <MvcShim Condition="$(TargetFramework) != ''" Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim\bin\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.deps.json" />
+    </ItemGroup>
+
     <Copy SourceFiles="@(MvcShim)" DestinationFolder="$(OutputPath)" />
   </Target>
 </Project>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
index 8e6b1a7bd7..ec84263550 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
@@ -19,9 +19,7 @@ namespace AspNetCore
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(0, 4, true);
             WriteLiteral("<div");
-            EndContext();
             BeginWriteAttribute("class", " class=\"", 4, "\"", 28, 1);
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
 WriteAttributeValue("", 12, this.ToString(), 12, 16, false);
@@ -29,28 +27,20 @@ WriteAttributeValue("", 12, this.ToString(), 12, 16, false);
 #line default
 #line hidden
             EndWriteAttribute();
-            BeginContext(29, 24, true);
             WriteLiteral(">\r\n    Hello world\r\n    ");
-            EndContext();
-            BeginContext(54, 29, false);
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
 Write(string.Format("{0}", "Hello"));
 
 #line default
 #line hidden
-            EndContext();
-            BeginContext(83, 10, true);
             WriteLiteral("\r\n</div>\r\n");
-            EndContext();
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
    
     var cls = "foo";
 
 #line default
 #line hidden
-            BeginContext(123, 2, true);
             WriteLiteral("<p");
-            EndContext();
             BeginWriteAttribute("class", " class=\"", 125, "\"", 158, 1);
             WriteAttributeValue("", 133, new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_attribute_value_writer) => {
                 PushWriter(__razor_attribute_value_writer);
@@ -59,13 +49,11 @@ Write(string.Format("{0}", "Hello"));
 
 #line default
 #line hidden
-                BeginContext(153, 3, false);
 #line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
                         Write(cls);
 
 #line default
 #line hidden
-                EndContext();
 #line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
                                   }
 
@@ -75,9 +63,7 @@ Write(string.Format("{0}", "Hello"));
             }
             ), 133, 25, false);
             EndWriteAttribute();
-            BeginContext(159, 5, true);
             WriteLiteral(" />\r\n");
-            EndContext();
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
index 9173f6251b..8ed7912b0a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
@@ -13,62 +13,34 @@ Document -
         RazorSourceChecksumAttribute - 
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(0, 4, true);
                 HtmlContent - (0:0,0 [4] Basic.cshtml)
                     IntermediateToken - (0:0,0 [4] Basic.cshtml) - Html - <div
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 HtmlAttribute - (4:0,4 [25] Basic.cshtml) -  class=" - "
                     CSharpExpressionAttributeValue - (12:0,12 [16] Basic.cshtml) - 
                         IntermediateToken - (13:0,13 [15] Basic.cshtml) - CSharp - this.ToString()
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(29, 24, true);
                 HtmlContent - (29:0,29 [24] Basic.cshtml)
                     IntermediateToken - (29:0,29 [1] Basic.cshtml) - Html - >
                     IntermediateToken - (30:0,30 [19] Basic.cshtml) - Html - \n    Hello world\n
                     IntermediateToken - (49:2,0 [4] Basic.cshtml) - Html -     
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(54, 29, false);
                 CSharpExpression - (54:2,5 [29] Basic.cshtml)
                     IntermediateToken - (54:2,5 [29] Basic.cshtml) - CSharp - string.Format("{0}", "Hello")
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(83, 10, true);
                 HtmlContent - (83:2,34 [10] Basic.cshtml)
                     IntermediateToken - (83:2,34 [2] Basic.cshtml) - Html - \n
                     IntermediateToken - (85:3,0 [6] Basic.cshtml) - Html - </div>
                     IntermediateToken - (91:3,6 [2] Basic.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - (95:4,2 [25] Basic.cshtml)
                     IntermediateToken - (95:4,2 [25] Basic.cshtml) - CSharp -  \n    var cls = "foo";\n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(123, 2, true);
                 HtmlContent - (123:7,0 [2] Basic.cshtml)
                     IntermediateToken - (123:7,0 [2] Basic.cshtml) - Html - <p
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 HtmlAttribute - (125:7,2 [34] Basic.cshtml) -  class=" - "
                     CSharpCodeAttributeValue - (133:7,10 [25] Basic.cshtml) - 
                         IntermediateToken - (134:7,11 [18] Basic.cshtml) - CSharp - if(cls != null) { 
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(153, 3, false);
                         CSharpExpression - (153:7,30 [3] Basic.cshtml)
                             IntermediateToken - (153:7,30 [3] Basic.cshtml) - CSharp - cls
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
                         IntermediateToken - (156:7,33 [2] Basic.cshtml) - CSharp -  }
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(159, 5, true);
                 HtmlContent - (159:7,36 [5] Basic.cshtml)
                     IntermediateToken - (159:7,36 [3] Basic.cshtml) - Html -  />
                     IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
index 93b05b4ddd..dd100bee00 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -28,7 +28,11 @@ namespace AspNetCore
  }
         ))();
         ((System.Action)(() => {
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
 MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
index c13c9c3006..4bb61bf781 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -20,21 +20,21 @@ Generated Location: (830:27,0 [0] )
 
 Source Location: (159:11,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 |MyService<TModel>|
-Generated Location: (883:30,0 [17] )
+Generated Location: (980:31,0 [17] )
 |MyService<TModel>|
 
 Source Location: (176:11,25 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1005:34,0 [0] )
+Generated Location: (1133:38,0 [0] )
 ||
 
 Source Location: (190:13,10 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1058:37,0 [0] )
+Generated Location: (1186:41,0 [0] )
 ||
 
 Source Location: (203:14,11 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1111:40,0 [0] )
+Generated Location: (1239:44,0 [0] )
 ||
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
index 743eed291e..31179505bf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
@@ -19,33 +19,15 @@ namespace AspNetCore
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(83, 4, true);
             WriteLiteral("\r\n\r\n");
-            EndContext();
-            BeginContext(108, 5, true);
             WriteLiteral("\"\r\n\r\n");
-            EndContext();
-            BeginContext(119, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(128, 4, true);
             WriteLiteral("\r\n\r\n");
-            EndContext();
-            BeginContext(139, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(149, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(176, 4, true);
             WriteLiteral("\r\n\r\n");
-            EndContext();
-            BeginContext(190, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(203, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
index bd3bdd87e2..0478bc1e74 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
@@ -13,77 +13,41 @@ Document -
         RazorSourceChecksumAttribute - 
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(83, 4, true);
                 HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml) - page
                 MalformedDirective - (102:4,0 [6] IncompleteDirectives.cshtml) - page
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(108, 5, true);
                 HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)
                     IntermediateToken - (108:4,6 [5] IncompleteDirectives.cshtml) - Html - "\n\n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (113:6,0 [6] IncompleteDirectives.cshtml) - model
                     DirectiveToken - (119:6,6 [0] IncompleteDirectives.cshtml) - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(119, 2, true);
                 HtmlContent - (119:6,6 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (119:6,6 [2] IncompleteDirectives.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (121:7,0 [7] IncompleteDirectives.cshtml) - model
                     DirectiveToken - (128:7,7 [0] IncompleteDirectives.cshtml) - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(128, 4, true);
                 HtmlContent - (128:7,7 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (128:7,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (132:9,0 [7] IncompleteDirectives.cshtml) - inject
                     DirectiveToken - (139:9,7 [0] IncompleteDirectives.cshtml) - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(139, 2, true);
                 HtmlContent - (139:9,7 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (139:9,7 [2] IncompleteDirectives.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (141:10,0 [8] IncompleteDirectives.cshtml) - inject
                     DirectiveToken - (149:10,8 [0] IncompleteDirectives.cshtml) - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(149, 2, true);
                 HtmlContent - (149:10,8 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (149:10,8 [2] IncompleteDirectives.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (151:11,0 [25] IncompleteDirectives.cshtml) - inject
                     DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
                     DirectiveToken - (176:11,25 [0] IncompleteDirectives.cshtml) - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(176, 4, true);
                 HtmlContent - (176:11,25 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (176:11,25 [4] IncompleteDirectives.cshtml) - Html - \n\n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (180:13,0 [10] IncompleteDirectives.cshtml) - namespace
                     DirectiveToken - (190:13,10 [0] IncompleteDirectives.cshtml) - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(190, 2, true);
                 HtmlContent - (190:13,10 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (190:13,10 [2] IncompleteDirectives.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (192:14,0 [11] IncompleteDirectives.cshtml) - namespace
                     DirectiveToken - (203:14,11 [0] IncompleteDirectives.cshtml) - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(203, 2, true);
                 HtmlContent - (203:14,11 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (203:14,11 [2] IncompleteDirectives.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
index 6a16b10feb..7cdbaf3326 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
@@ -16,11 +16,19 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
 MyBasePageForViews<TModel> __typeHelper = default(MyBasePageForViews<TModel>);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
 MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
index 9b7a5db61d..6a313a909d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (10:0,10 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
 |MyBasePageForViews<TModel>|
-Generated Location: (647:18,0 [26] )
+Generated Location: (740:19,0 [26] )
 |MyBasePageForViews<TModel>|
 
 Source Location: (45:1,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
 |MyModel|
-Generated Location: (787:22,0 [7] )
+Generated Location: (1004:27,0 [7] )
 |MyModel|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
index 8d27d45236..f174a0fc2f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
@@ -16,7 +16,11 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml"
 MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
index c120ec9937..e7daecd874 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (14:1,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml)
 |MyModel|
-Generated Location: (646:18,0 [7] )
+Generated Location: (745:19,0 [7] )
 |MyModel|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
index e198bf38b2..2120622373 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
@@ -16,23 +16,43 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
 MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
 MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
 global::System.Object MyPropertyName = null;
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
 MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
 global::System.Object Html = null;
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
index 0d58ddea20..c4838ff64d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyModel|
-Generated Location: (675:18,0 [7] )
+Generated Location: (766:19,0 [7] )
 |MyModel|
 
 Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyApp|
-Generated Location: (777:22,0 [5] )
+Generated Location: (990:27,0 [5] )
 |MyApp|
 
 Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyPropertyName|
-Generated Location: (897:26,22 [14] )
+Generated Location: (1232:35,22 [14] )
 |MyPropertyName|
 
 Source Location: (54:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyService<TModel>|
-Generated Location: (981:30,0 [17] )
+Generated Location: (1438:43,0 [17] )
 |MyService<TModel>|
 
 Source Location: (72:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |Html|
-Generated Location: (1125:34,22 [4] )
+Generated Location: (1704:51,22 [4] )
 |Html|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
index 7d588d5d12..ea95a4e7eb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
@@ -16,39 +16,75 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 global::System.Object MyPropertyName = null;
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 global::System.Object Html = null;
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 global::System.Object MyPropertyName2 = null;
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 global::System.Object Html2 = null;
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
index 8e98145f2d..6a90f75f3e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
@@ -1,45 +1,45 @@
 Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyModel|
-Generated Location: (679:18,0 [7] )
+Generated Location: (774:19,0 [7] )
 |MyModel|
 
 Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyApp|
-Generated Location: (781:22,0 [5] )
+Generated Location: (1002:27,0 [5] )
 |MyApp|
 
 Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyPropertyName|
-Generated Location: (901:26,22 [14] )
+Generated Location: (1248:35,22 [14] )
 |MyPropertyName|
 
 Source Location: (58:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyService<TModel>|
-Generated Location: (985:30,0 [17] )
+Generated Location: (1458:43,0 [17] )
 |MyService<TModel>|
 
 Source Location: (76:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |Html|
-Generated Location: (1129:34,22 [4] )
+Generated Location: (1728:51,22 [4] )
 |Html|
 
 Source Location: (93:3,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyApp|
-Generated Location: (1203:38,0 [5] )
+Generated Location: (1928:59,0 [5] )
 |MyApp|
 
 Source Location: (99:3,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyPropertyName2|
-Generated Location: (1323:42,22 [15] )
+Generated Location: (2174:67,22 [15] )
 |MyPropertyName2|
 
 Source Location: (129:4,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyService<TModel>|
-Generated Location: (1408:46,0 [17] )
+Generated Location: (2385:75,0 [17] )
 |MyService<TModel>|
 
 Source Location: (147:4,26 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |Html2|
-Generated Location: (1552:50,22 [5] )
+Generated Location: (2655:83,22 [5] )
 |Html2|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
index b6a4d2a93f..7b2f4fedc6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
@@ -16,11 +16,19 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
 MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
 global::System.Object MyPropertyName = null;
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
index 8bd4399f3f..10ed356ecf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (8:0,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
 |MyApp|
-Generated Location: (666:18,0 [5] )
+Generated Location: (748:19,0 [5] )
 |MyApp|
 
 Source Location: (14:0,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
 |MyPropertyName|
-Generated Location: (786:22,22 [14] )
+Generated Location: (981:27,22 [14] )
 |MyPropertyName|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
index 2accba6951..2b269092bb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
@@ -19,9 +19,7 @@ namespace AspNetCore
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(11, 5, true);
             WriteLiteral("Test.");
-            EndContext();
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
index e99ab2d9c2..7a0583e5a0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
@@ -14,12 +14,8 @@ Document -
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 MalformedDirective - (0:0,0 [11] InvalidNamespaceAtEOF.cshtml) - namespace
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(11, 5, true);
                 HtmlContent - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml)
                     IntermediateToken - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml) - Html - Test.
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs
index 7835a2dae2..63b6c0a23e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs
@@ -19,9 +19,7 @@ namespace AspNetCore
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(6, 49, true);
             WriteLiteral("\"foo\r\n\r\n<h1>About Us</h1>\r\n<p>We are awesome.</p>");
-            EndContext();
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
index 0692442d42..7a04b0051a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
@@ -14,8 +14,6 @@ Document -
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 MalformedDirective - (0:0,0 [6] MalformedPageDirective.cshtml) - page
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(6, 49, true);
                 HtmlContent - (6:0,6 [49] MalformedPageDirective.cshtml)
                     IntermediateToken - (6:0,6 [8] MalformedPageDirective.cshtml) - Html - "foo\n\n
                     IntermediateToken - (14:2,0 [4] MalformedPageDirective.cshtml) - Html - <h1>
@@ -25,8 +23,6 @@ Document -
                     IntermediateToken - (33:3,0 [3] MalformedPageDirective.cshtml) - Html - <p>
                     IntermediateToken - (36:3,3 [15] MalformedPageDirective.cshtml) - Html - We are awesome.
                     IntermediateToken - (51:3,18 [4] MalformedPageDirective.cshtml) - Html - </p>
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
index e669a23be0..82441cd663 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
@@ -17,11 +17,19 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
 DateTime __typeHelper = default(DateTime);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
 global::System.Object __typeHelper = "InputTestTagHelper, AppCode";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
index ced10bc85e..63a7d6ccc1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |DateTime|
-Generated Location: (751:19,0 [8] )
+Generated Location: (851:20,0 [8] )
 |DateTime|
 
 Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |"InputTestTagHelper, AppCode"|
-Generated Location: (892:23,37 [29] )
+Generated Location: (1123:28,37 [29] )
 |"InputTestTagHelper, AppCode"|
 
 Source Location: (83:4,17 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |Date|
-Generated Location: (1540:36,102 [4] )
+Generated Location: (1802:44,102 [4] )
 |Date|
 
 Source Location: (111:5,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |Model|
-Generated Location: (1856:42,94 [5] )
+Generated Location: (2118:50,94 [5] )
 |Model|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
index 799bbc1362..d5ec95d2aa 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
@@ -38,13 +38,8 @@ namespace AspNetCore
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(17, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(64, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(66, 25, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             );
@@ -63,11 +58,7 @@ __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewDat
             }
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
-            EndContext();
-            BeginContext(91, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(93, 27, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             );
@@ -86,10 +77,7 @@ __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewDat
             }
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
-            EndContext();
-            BeginContext(120, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
index 1fb7820a75..0d8f3b8ec2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
@@ -15,20 +15,10 @@ Document -
             DefaultTagHelperRuntime - 
             FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(17, 2, true);
                 HtmlContent - (17:1,0 [2] ModelExpressionTagHelper.cshtml)
                     IntermediateToken - (17:1,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(64, 2, true);
                 HtmlContent - (64:3,0 [2] ModelExpressionTagHelper.cshtml)
                     IntermediateToken - (64:3,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(66, 25, false);
                 TagHelper - (66:4,0 [25] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
                     DefaultTagHelperBody - 
                     DefaultTagHelperCreate -  - InputTestTagHelper
@@ -39,16 +29,8 @@ Document -
                             IntermediateToken - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - CSharp - Date
                             IntermediateToken -  - CSharp - )
                     DefaultTagHelperExecute - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(91, 2, true);
                 HtmlContent - (91:4,25 [2] ModelExpressionTagHelper.cshtml)
                     IntermediateToken - (91:4,25 [2] ModelExpressionTagHelper.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(93, 27, false);
                 TagHelper - (93:5,0 [27] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
                     DefaultTagHelperBody - 
                     DefaultTagHelperCreate -  - InputTestTagHelper
@@ -58,14 +40,8 @@ Document -
                             IntermediateToken - (111:5,18 [5] ModelExpressionTagHelper.cshtml) - CSharp - Model
                             IntermediateToken -  - CSharp - )
                     DefaultTagHelperExecute - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(120, 2, true);
                 HtmlContent - (120:5,27 [2] ModelExpressionTagHelper.cshtml)
                     IntermediateToken - (120:5,27 [2] ModelExpressionTagHelper.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
index 923b853936..63c2a52c6f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
@@ -16,7 +16,11 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml"
 System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
index 14e9047943..7d84cf754d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (7:0,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml)
 |System.Collections.IEnumerable|
-Generated Location: (688:18,0 [30] )
+Generated Location: (769:19,0 [30] )
 |System.Collections.IEnumerable|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
index dc5fcee8a2..e8f705cef7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
@@ -16,11 +16,19 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
 ThisShouldBeGenerated __typeHelper = default(ThisShouldBeGenerated);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
 System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
index ff5971643c..79d7e257c7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (7:0,7 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml)
 |ThisShouldBeGenerated|
-Generated Location: (688:18,0 [21] )
+Generated Location: (778:19,0 [21] )
 |ThisShouldBeGenerated|
 
 Source Location: (37:1,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml)
 |System.Collections.IEnumerable|
-Generated Location: (818:22,0 [30] )
+Generated Location: (1029:27,0 [30] )
 |System.Collections.IEnumerable|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs
index cb05019c29..9d7181bfad 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs
@@ -16,7 +16,11 @@ namespace Test.Namespace
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml"
 global::System.Object __typeHelper = nameof(Test.Namespace);
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt
index 23b745fa44..b41240c9c5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (18:1,11 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml)
 |Test.Namespace|
-Generated Location: (716:18,44 [14] )
+Generated Location: (809:19,44 [14] )
 |Test.Namespace|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs
index 9c1a5b03f5..729698a9cc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs
@@ -19,9 +19,7 @@ namespace Test.Namespace
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(34, 20, true);
             WriteLiteral("<h1>Hi There!</h1>\r\n");
-            EndContext();
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
index 53b89427ee..5be907ee1d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
@@ -13,15 +13,11 @@ Document -
         RazorSourceChecksumAttribute - 
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(34, 20, true);
                 HtmlContent - (34:2,0 [20] PageWithNamespace.cshtml)
                     IntermediateToken - (34:2,0 [4] PageWithNamespace.cshtml) - Html - <h1>
                     IntermediateToken - (38:2,4 [9] PageWithNamespace.cshtml) - Html - Hi There!
                     IntermediateToken - (47:2,13 [5] PageWithNamespace.cshtml) - Html - </h1>
                     IntermediateToken - (52:2,18 [2] PageWithNamespace.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs
index 107beef619..f69dce12eb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs
@@ -19,9 +19,7 @@ namespace AspNetCore
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(0, 28, true);
             WriteLiteral("<div>Some text here.</div>\r\n");
-            EndContext();
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
index 764b704909..42eb920742 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
@@ -13,15 +13,11 @@ Document -
         RazorSourceChecksumAttribute - 
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(0, 28, true);
                 HtmlContent - (0:0,0 [28] RazorPageWithNoLeadingPageDirective.cshtml)
                     IntermediateToken - (0:0,0 [5] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div>
                     IntermediateToken - (5:0,5 [15] RazorPageWithNoLeadingPageDirective.cshtml) - Html - Some text here.
                     IntermediateToken - (20:0,20 [6] RazorPageWithNoLeadingPageDirective.cshtml) - Html - </div>
                     IntermediateToken - (26:0,26 [2] RazorPageWithNoLeadingPageDirective.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
index 69b52f95f7..8f5d082e6a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
@@ -22,11 +22,19 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
 global::System.Object __typeHelper = "/About";
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
 NewModel __typeHelper = default(NewModel);
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
index e97ebe1943..cc5e9cad30 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
@@ -5,17 +5,17 @@ Generated Location: (492:14,0 [41] )
 
 Source Location: (6:0,6 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
 |"/About"|
-Generated Location: (1005:24,37 [8] )
+Generated Location: (1108:25,37 [8] )
 |"/About"|
 
 Source Location: (25:2,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
 |NewModel|
-Generated Location: (1076:28,0 [8] )
+Generated Location: (1313:33,0 [8] )
 |NewModel|
 
 Source Location: (213:12,18 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
 |Model.Name|
-Generated Location: (1573:40,18 [10] )
+Generated Location: (1841:48,18 [10] )
 |Model.Name|
 
 Source Location: (93:5,12 [97] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
@@ -25,7 +25,7 @@ Source Location: (93:5,12 [97] TestFiles/IntegrationTests/CodeGenerationIntegrat
         public string Name { get; set; }
     }
 |
-Generated Location: (1781:47,12 [97] )
+Generated Location: (2049:55,12 [97] )
 |
     public class NewModel : PageModel
     {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
index bff519edb2..83f08818fc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
@@ -25,25 +25,15 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(16, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(79, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(193, 19, true);
             WriteLiteral("\r\n<h1>New Customer ");
-            EndContext();
-            BeginContext(213, 10, false);
 #line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
             Write(Model.Name);
 
 #line default
 #line hidden
-            EndContext();
-            BeginContext(223, 7, true);
             WriteLiteral("</h1>\r\n");
-            EndContext();
         }
         #pragma warning restore 1998
 #line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
index 5d54680b90..c8fbdea2cc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
@@ -15,39 +15,19 @@ Document -
         RazorSourceChecksumAttribute - 
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(16, 2, true);
                 HtmlContent - (16:1,0 [2] RazorPagesWithRouteTemplate.cshtml)
                     IntermediateToken - (16:1,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(79, 2, true);
                 HtmlContent - (79:4,0 [2] RazorPagesWithRouteTemplate.cshtml)
                     IntermediateToken - (79:4,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(193, 19, true);
                 HtmlContent - (193:11,0 [19] RazorPagesWithRouteTemplate.cshtml)
                     IntermediateToken - (193:11,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
                     IntermediateToken - (195:12,0 [4] RazorPagesWithRouteTemplate.cshtml) - Html - <h1>
                     IntermediateToken - (199:12,4 [13] RazorPagesWithRouteTemplate.cshtml) - Html - New Customer 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(213, 10, false);
                 CSharpExpression - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml)
                     IntermediateToken - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml) - CSharp - Model.Name
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(223, 7, true);
                 HtmlContent - (223:12,28 [7] RazorPagesWithRouteTemplate.cshtml)
                     IntermediateToken - (223:12,28 [5] RazorPagesWithRouteTemplate.cshtml) - Html - </h1>
                     IntermediateToken - (228:12,33 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             CSharpCode - (93:5,12 [97] RazorPagesWithRouteTemplate.cshtml)
                 IntermediateToken - (93:5,12 [97] RazorPagesWithRouteTemplate.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public string Name { get; set; }\n    }\n
             Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
index af9ff10e76..aeb2631c46 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
@@ -22,7 +22,11 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
 global::System.Object __typeHelper = "*, AppCode";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
index a4abcf411d..33f7baa377 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
@@ -5,12 +5,12 @@ Generated Location: (487:14,0 [41] )
 
 Source Location: (23:2,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
 |"*, AppCode"|
-Generated Location: (937:24,37 [12] )
+Generated Location: (1035:25,37 [12] )
 |"*, AppCode"|
 
 Source Location: (566:24,47 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
 |Name|
-Generated Location: (1500:37,47 [4] )
+Generated Location: (1629:41,47 [4] )
 |Name|
 
 Source Location: (95:5,12 [283] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
@@ -28,7 +28,7 @@ Source Location: (95:5,12 [283] TestFiles/IntegrationTests/CodeGenerationIntegra
         public string Name { get; set; }
     }
 |
-Generated Location: (1981:48,12 [283] )
+Generated Location: (2110:52,12 [283] )
 |
     public IActionResult OnPost(Customer customer)
     {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
index f11c563667..2a42ce12f2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
@@ -47,16 +47,9 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(7, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(81, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(381, 75, true);
             WriteLiteral("\r\n<h1>New Customer</h1>\r\n<form method=\"post\" class=\"form-horizontal\">\r\n    ");
-            EndContext();
-            BeginContext(456, 31, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
             }
             );
@@ -70,30 +63,17 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
             }
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
-            EndContext();
-            BeginContext(487, 6, true);
             WriteLiteral("\r\n    ");
-            EndContext();
-            BeginContext(493, 237, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
-                BeginContext(517, 48, true);
                 WriteLiteral("\r\n        <label class=\"col-md-2 control-label\">");
-                EndContext();
-                BeginContext(566, 4, false);
 #line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
                                          Write(Name);
 
 #line default
 #line hidden
-                EndContext();
-                BeginContext(570, 18, true);
                 WriteLiteral("</label>\r\n        ");
-                EndContext();
-                BeginContext(588, 130, false);
                 __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
-                    BeginContext(611, 101, true);
                     WriteLiteral("\r\n            <input class=\"form-control\" />\r\n            <span class=\"text-danger\"></span>\r\n        ");
-                    EndContext();
                 }
                 );
                 __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
@@ -106,10 +86,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
                 }
                 Write(__tagHelperExecutionContext.Output);
                 __tagHelperExecutionContext = __tagHelperScopeManager.End();
-                EndContext();
-                BeginContext(718, 6, true);
                 WriteLiteral("\r\n    ");
-                EndContext();
             }
             );
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
@@ -122,20 +99,11 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
             }
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
-            EndContext();
-            BeginContext(730, 6, true);
             WriteLiteral("\r\n    ");
-            EndContext();
-            BeginContext(736, 174, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
-                BeginContext(760, 10, true);
                 WriteLiteral("\r\n        ");
-                EndContext();
-                BeginContext(770, 128, false);
                 __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
-                    BeginContext(809, 83, true);
                     WriteLiteral("\r\n            <button type=\"submit\" class=\"btn btn-primary\">Save</button>\r\n        ");
-                    EndContext();
                 }
                 );
                 __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
@@ -148,10 +116,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
                 }
                 Write(__tagHelperExecutionContext.Output);
                 __tagHelperExecutionContext = __tagHelperScopeManager.End();
-                EndContext();
-                BeginContext(898, 6, true);
                 WriteLiteral("\r\n    ");
-                EndContext();
             }
             );
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
@@ -164,10 +129,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
             }
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
-            EndContext();
-            BeginContext(910, 11, true);
             WriteLiteral("\r\n</form>\r\n");
-            EndContext();
         }
         #pragma warning restore 1998
 #line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
index 519006aec3..ea80083dd2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
@@ -20,20 +20,10 @@ Document -
             DefaultTagHelperRuntime - 
             FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(7, 2, true);
                 HtmlContent - (7:1,0 [2] RazorPagesWithoutModel.cshtml)
                     IntermediateToken - (7:1,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(81, 2, true);
                 HtmlContent - (81:4,0 [2] RazorPagesWithoutModel.cshtml)
                     IntermediateToken - (81:4,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(381, 75, true);
                 HtmlContent - (381:19,0 [75] RazorPagesWithoutModel.cshtml)
                     IntermediateToken - (381:19,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
                     IntermediateToken - (383:20,0 [4] RazorPagesWithoutModel.cshtml) - Html - <h1>
@@ -45,55 +35,27 @@ Document -
                     IntermediateToken - (425:21,19 [24] RazorPagesWithoutModel.cshtml) - Html -  class="form-horizontal"
                     IntermediateToken - (449:21,43 [1] RazorPagesWithoutModel.cshtml) - Html - >
                     IntermediateToken - (450:21,44 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(456, 31, false);
                 TagHelper - (456:22,4 [31] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
                     DefaultTagHelperCreate -  - DivTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
                     DefaultTagHelperExecute - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(487, 6, true);
                 HtmlContent - (487:22,35 [6] RazorPagesWithoutModel.cshtml)
                     IntermediateToken - (487:22,35 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(493, 237, false);
                 TagHelper - (493:23,4 [237] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(517, 48, true);
                         HtmlContent - (517:23,28 [48] RazorPagesWithoutModel.cshtml)
                             IntermediateToken - (517:23,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
                             IntermediateToken - (527:24,8 [6] RazorPagesWithoutModel.cshtml) - Html - <label
                             IntermediateToken - (533:24,14 [31] RazorPagesWithoutModel.cshtml) - Html -  class="col-md-2 control-label"
                             IntermediateToken - (564:24,45 [1] RazorPagesWithoutModel.cshtml) - Html - >
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(566, 4, false);
                         CSharpExpression - (566:24,47 [4] RazorPagesWithoutModel.cshtml)
                             IntermediateToken - (566:24,47 [4] RazorPagesWithoutModel.cshtml) - CSharp - Name
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(570, 18, true);
                         HtmlContent - (570:24,51 [18] RazorPagesWithoutModel.cshtml)
                             IntermediateToken - (570:24,51 [8] RazorPagesWithoutModel.cshtml) - Html - </label>
                             IntermediateToken - (578:24,59 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(588, 130, false);
                         TagHelper - (588:25,8 [130] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
                             DefaultTagHelperBody - 
-                                CSharpCode - 
-                                    IntermediateToken -  - CSharp - BeginContext(611, 101, true);
                                 HtmlContent - (611:25,31 [101] RazorPagesWithoutModel.cshtml)
                                     IntermediateToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
                                     IntermediateToken - (625:26,12 [6] RazorPagesWithoutModel.cshtml) - Html - <input
@@ -105,46 +67,22 @@ Document -
                                     IntermediateToken - (694:27,37 [1] RazorPagesWithoutModel.cshtml) - Html - >
                                     IntermediateToken - (695:27,38 [7] RazorPagesWithoutModel.cshtml) - Html - </span>
                                     IntermediateToken - (702:27,45 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
-                                CSharpCode - 
-                                    IntermediateToken -  - CSharp - EndContext();
                             DefaultTagHelperCreate -  - DivTagHelper
                             PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
                             DefaultTagHelperExecute - 
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(718, 6, true);
                         HtmlContent - (718:28,14 [6] RazorPagesWithoutModel.cshtml)
                             IntermediateToken - (718:28,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
                     DefaultTagHelperCreate -  - DivTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
                     DefaultTagHelperExecute - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(730, 6, true);
                 HtmlContent - (730:29,10 [6] RazorPagesWithoutModel.cshtml)
                     IntermediateToken - (730:29,10 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(736, 174, false);
                 TagHelper - (736:30,4 [174] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(760, 10, true);
                         HtmlContent - (760:30,28 [10] RazorPagesWithoutModel.cshtml)
                             IntermediateToken - (760:30,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(770, 128, false);
                         TagHelper - (770:31,8 [128] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
                             DefaultTagHelperBody - 
-                                CSharpCode - 
-                                    IntermediateToken -  - CSharp - BeginContext(809, 83, true);
                                 HtmlContent - (809:31,47 [83] RazorPagesWithoutModel.cshtml)
                                     IntermediateToken - (809:31,47 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
                                     IntermediateToken - (823:32,12 [7] RazorPagesWithoutModel.cshtml) - Html - <button
@@ -154,32 +92,18 @@ Document -
                                     IntermediateToken - (869:32,58 [4] RazorPagesWithoutModel.cshtml) - Html - Save
                                     IntermediateToken - (873:32,62 [9] RazorPagesWithoutModel.cshtml) - Html - </button>
                                     IntermediateToken - (882:32,71 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
-                                CSharpCode - 
-                                    IntermediateToken -  - CSharp - EndContext();
                             DefaultTagHelperCreate -  - DivTagHelper
                             PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
                             DefaultTagHelperExecute - 
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(898, 6, true);
                         HtmlContent - (898:33,14 [6] RazorPagesWithoutModel.cshtml)
                             IntermediateToken - (898:33,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
                     DefaultTagHelperCreate -  - DivTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
                     DefaultTagHelperExecute - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(910, 11, true);
                 HtmlContent - (910:34,10 [11] RazorPagesWithoutModel.cshtml)
                     IntermediateToken - (910:34,10 [2] RazorPagesWithoutModel.cshtml) - Html - \n
                     IntermediateToken - (912:35,0 [7] RazorPagesWithoutModel.cshtml) - Html - </form>
                     IntermediateToken - (919:35,7 [2] RazorPagesWithoutModel.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             CSharpCode - (95:5,12 [283] RazorPagesWithoutModel.cshtml)
                 IntermediateToken - (95:5,12 [283] RazorPagesWithoutModel.cshtml) - CSharp - \n    public IActionResult OnPost(Customer customer)\n    {\n        Name = customer.Name;\n        return Redirect("~/customers/inlinepagemodels/");\n    }\n\n    public string Name { get; set; }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
             Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
index 8731920f14..d7acbdf7d1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
@@ -22,11 +22,19 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
 NewModel __typeHelper = default(NewModel);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
 global::System.Object __typeHelper = "*, AppCode";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
index 02d6726a3a..0af8c77dfd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
@@ -5,17 +5,17 @@ Generated Location: (475:14,0 [41] )
 
 Source Location: (16:2,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
 |NewModel|
-Generated Location: (876:24,0 [8] )
+Generated Location: (962:25,0 [8] )
 |NewModel|
 
 Source Location: (40:3,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
 |"*, AppCode"|
-Generated Location: (1017:28,37 [12] )
+Generated Location: (1220:33,37 [12] )
 |"*, AppCode"|
 
 Source Location: (661:28,47 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
 |Model.Name|
-Generated Location: (1568:41,47 [10] )
+Generated Location: (1802:49,47 [10] )
 |Model.Name|
 
 Source Location: (112:6,12 [360] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
@@ -36,7 +36,7 @@ Source Location: (112:6,12 [360] TestFiles/IntegrationTests/CodeGenerationIntegr
         public string Name { get; set; }
     }
 |
-Generated Location: (2043:52,12 [360] )
+Generated Location: (2277:60,12 [360] )
 |
     public class NewModel : PageModel
     {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
index ca08b5e268..8f9b84f114 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
@@ -47,16 +47,9 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(7, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(98, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(475, 76, true);
             WriteLiteral("\r\n<h1>New Customer</h1>\r\n<form method=\"post\" class=\"form-horizontal\" >\r\n    ");
-            EndContext();
-            BeginContext(551, 31, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
             }
             );
@@ -70,30 +63,17 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
             }
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
-            EndContext();
-            BeginContext(582, 6, true);
             WriteLiteral("\r\n    ");
-            EndContext();
-            BeginContext(588, 243, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
-                BeginContext(612, 48, true);
                 WriteLiteral("\r\n        <label class=\"col-md-2 control-label\">");
-                EndContext();
-                BeginContext(661, 10, false);
 #line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
                                          Write(Model.Name);
 
 #line default
 #line hidden
-                EndContext();
-                BeginContext(671, 18, true);
                 WriteLiteral("</label>\r\n        ");
-                EndContext();
-                BeginContext(689, 130, false);
                 __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
-                    BeginContext(712, 101, true);
                     WriteLiteral("\r\n            <input class=\"form-control\" />\r\n            <span class=\"text-danger\"></span>\r\n        ");
-                    EndContext();
                 }
                 );
                 __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
@@ -106,10 +86,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
                 }
                 Write(__tagHelperExecutionContext.Output);
                 __tagHelperExecutionContext = __tagHelperScopeManager.End();
-                EndContext();
-                BeginContext(819, 6, true);
                 WriteLiteral("\r\n    ");
-                EndContext();
             }
             );
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
@@ -122,20 +99,11 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
             }
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
-            EndContext();
-            BeginContext(831, 6, true);
             WriteLiteral("\r\n    ");
-            EndContext();
-            BeginContext(837, 174, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
-                BeginContext(861, 10, true);
                 WriteLiteral("\r\n        ");
-                EndContext();
-                BeginContext(871, 128, false);
                 __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
-                    BeginContext(910, 83, true);
                     WriteLiteral("\r\n            <button type=\"submit\" class=\"btn btn-primary\">Save</button>\r\n        ");
-                    EndContext();
                 }
                 );
                 __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
@@ -148,10 +116,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
                 }
                 Write(__tagHelperExecutionContext.Output);
                 __tagHelperExecutionContext = __tagHelperScopeManager.End();
-                EndContext();
-                BeginContext(999, 6, true);
                 WriteLiteral("\r\n    ");
-                EndContext();
             }
             );
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
@@ -164,10 +129,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
             }
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
-            EndContext();
-            BeginContext(1011, 11, true);
             WriteLiteral("\r\n</form>\r\n");
-            EndContext();
         }
         #pragma warning restore 1998
 #line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
index cc1bc6f718..8c352308a0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
@@ -20,20 +20,10 @@ Document -
             DefaultTagHelperRuntime - 
             FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(7, 2, true);
                 HtmlContent - (7:1,0 [2] RazorPages.cshtml)
                     IntermediateToken - (7:1,0 [2] RazorPages.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(98, 2, true);
                 HtmlContent - (98:5,0 [2] RazorPages.cshtml)
                     IntermediateToken - (98:5,0 [2] RazorPages.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(475, 76, true);
                 HtmlContent - (475:23,0 [76] RazorPages.cshtml)
                     IntermediateToken - (475:23,0 [2] RazorPages.cshtml) - Html - \n
                     IntermediateToken - (477:24,0 [4] RazorPages.cshtml) - Html - <h1>
@@ -45,55 +35,27 @@ Document -
                     IntermediateToken - (519:25,19 [24] RazorPages.cshtml) - Html -  class="form-horizontal"
                     IntermediateToken - (543:25,43 [2] RazorPages.cshtml) - Html -  >
                     IntermediateToken - (545:25,45 [6] RazorPages.cshtml) - Html - \n    
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(551, 31, false);
                 TagHelper - (551:26,4 [31] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
                     DefaultTagHelperCreate -  - DivTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
                     DefaultTagHelperExecute - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(582, 6, true);
                 HtmlContent - (582:26,35 [6] RazorPages.cshtml)
                     IntermediateToken - (582:26,35 [6] RazorPages.cshtml) - Html - \n    
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(588, 243, false);
                 TagHelper - (588:27,4 [243] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(612, 48, true);
                         HtmlContent - (612:27,28 [48] RazorPages.cshtml)
                             IntermediateToken - (612:27,28 [10] RazorPages.cshtml) - Html - \n        
                             IntermediateToken - (622:28,8 [6] RazorPages.cshtml) - Html - <label
                             IntermediateToken - (628:28,14 [31] RazorPages.cshtml) - Html -  class="col-md-2 control-label"
                             IntermediateToken - (659:28,45 [1] RazorPages.cshtml) - Html - >
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(661, 10, false);
                         CSharpExpression - (661:28,47 [10] RazorPages.cshtml)
                             IntermediateToken - (661:28,47 [10] RazorPages.cshtml) - CSharp - Model.Name
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(671, 18, true);
                         HtmlContent - (671:28,57 [18] RazorPages.cshtml)
                             IntermediateToken - (671:28,57 [8] RazorPages.cshtml) - Html - </label>
                             IntermediateToken - (679:28,65 [10] RazorPages.cshtml) - Html - \n        
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(689, 130, false);
                         TagHelper - (689:29,8 [130] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
                             DefaultTagHelperBody - 
-                                CSharpCode - 
-                                    IntermediateToken -  - CSharp - BeginContext(712, 101, true);
                                 HtmlContent - (712:29,31 [101] RazorPages.cshtml)
                                     IntermediateToken - (712:29,31 [14] RazorPages.cshtml) - Html - \n            
                                     IntermediateToken - (726:30,12 [6] RazorPages.cshtml) - Html - <input
@@ -105,46 +67,22 @@ Document -
                                     IntermediateToken - (795:31,37 [1] RazorPages.cshtml) - Html - >
                                     IntermediateToken - (796:31,38 [7] RazorPages.cshtml) - Html - </span>
                                     IntermediateToken - (803:31,45 [10] RazorPages.cshtml) - Html - \n        
-                                CSharpCode - 
-                                    IntermediateToken -  - CSharp - EndContext();
                             DefaultTagHelperCreate -  - DivTagHelper
                             PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
                             DefaultTagHelperExecute - 
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(819, 6, true);
                         HtmlContent - (819:32,14 [6] RazorPages.cshtml)
                             IntermediateToken - (819:32,14 [6] RazorPages.cshtml) - Html - \n    
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
                     DefaultTagHelperCreate -  - DivTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
                     DefaultTagHelperExecute - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(831, 6, true);
                 HtmlContent - (831:33,10 [6] RazorPages.cshtml)
                     IntermediateToken - (831:33,10 [6] RazorPages.cshtml) - Html - \n    
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(837, 174, false);
                 TagHelper - (837:34,4 [174] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(861, 10, true);
                         HtmlContent - (861:34,28 [10] RazorPages.cshtml)
                             IntermediateToken - (861:34,28 [10] RazorPages.cshtml) - Html - \n        
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(871, 128, false);
                         TagHelper - (871:35,8 [128] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
                             DefaultTagHelperBody - 
-                                CSharpCode - 
-                                    IntermediateToken -  - CSharp - BeginContext(910, 83, true);
                                 HtmlContent - (910:35,47 [83] RazorPages.cshtml)
                                     IntermediateToken - (910:35,47 [14] RazorPages.cshtml) - Html - \n            
                                     IntermediateToken - (924:36,12 [7] RazorPages.cshtml) - Html - <button
@@ -154,32 +92,18 @@ Document -
                                     IntermediateToken - (970:36,58 [4] RazorPages.cshtml) - Html - Save
                                     IntermediateToken - (974:36,62 [9] RazorPages.cshtml) - Html - </button>
                                     IntermediateToken - (983:36,71 [10] RazorPages.cshtml) - Html - \n        
-                                CSharpCode - 
-                                    IntermediateToken -  - CSharp - EndContext();
                             DefaultTagHelperCreate -  - DivTagHelper
                             PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
                             DefaultTagHelperExecute - 
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(999, 6, true);
                         HtmlContent - (999:37,14 [6] RazorPages.cshtml)
                             IntermediateToken - (999:37,14 [6] RazorPages.cshtml) - Html - \n    
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
                     DefaultTagHelperCreate -  - DivTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
                     DefaultTagHelperExecute - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(1011, 11, true);
                 HtmlContent - (1011:38,10 [11] RazorPages.cshtml)
                     IntermediateToken - (1011:38,10 [2] RazorPages.cshtml) - Html - \n
                     IntermediateToken - (1013:39,0 [7] RazorPages.cshtml) - Html - </form>
                     IntermediateToken - (1020:39,7 [2] RazorPages.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             CSharpCode - (112:6,12 [360] RazorPages.cshtml)
                 IntermediateToken - (112:6,12 [360] RazorPages.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public IActionResult OnPost(Customer customer)\n        {\n            Name = customer.Name;\n            return Redirect("~/customers/inlinepagemodels/");\n        }\n\n        public string Name { get; set; }\n    }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
             Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
index 604b3f412a..3ca46af8a7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
@@ -17,15 +17,27 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
 DateTime __typeHelper = default(DateTime);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
 global::System.Object __typeHelper = "InputTestTagHelper, AppCode";
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
 global::System.Object Section1 = null;
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
index 4eb221e12b..1cc991810c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
@@ -1,29 +1,29 @@
 Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |DateTime|
-Generated Location: (735:19,0 [8] )
+Generated Location: (819:20,0 [8] )
 |DateTime|
 
 Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |"InputTestTagHelper, AppCode"|
-Generated Location: (876:23,37 [29] )
+Generated Location: (1075:28,37 [29] )
 |"InputTestTagHelper, AppCode"|
 
 Source Location: (152:10,9 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Section1|
-Generated Location: (990:27,22 [8] )
+Generated Location: (1305:36,22 [8] )
 |Section1|
 
 Source Location: (68:4,2 [46] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 | 
     Layout = "_SectionTestLayout.cshtml";
 |
-Generated Location: (1425:39,2 [46] )
+Generated Location: (1771:51,2 [46] )
 | 
     Layout = "_SectionTestLayout.cshtml";
 |
 
 Source Location: (222:12,21 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Date|
-Generated Location: (1850:47,102 [4] )
+Generated Location: (2196:59,102 [4] )
 |Date|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
index 5d5ab480d6..9e809e0db5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
@@ -38,26 +38,17 @@ namespace AspNetCore
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(17, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(64, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
    
     Layout = "_SectionTestLayout.cshtml";
 
 #line default
 #line hidden
-            BeginContext(117, 26, true);
             WriteLiteral("\r\n<div>Some body</div>\r\n\r\n");
-            EndContext();
             DefineSection("Section1", async() => {
-                BeginContext(162, 43, true);
                 WriteLiteral("\r\n    <div>This is in Section 1</div>\r\n    ");
-                EndContext();
-                BeginContext(205, 25, false);
                 __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                 }
                 );
@@ -76,10 +67,7 @@ __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewDat
                 }
                 Write(__tagHelperExecutionContext.Output);
                 __tagHelperExecutionContext = __tagHelperScopeManager.End();
-                EndContext();
-                BeginContext(230, 2, true);
                 WriteLiteral("\r\n");
-                EndContext();
             }
             );
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
index 8a5b810749..1309bc9423 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
@@ -15,43 +15,25 @@ Document -
             DefaultTagHelperRuntime - 
             FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(17, 2, true);
                 HtmlContent - (17:1,0 [2] Sections.cshtml)
                     IntermediateToken - (17:1,0 [2] Sections.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(64, 2, true);
                 HtmlContent - (64:3,0 [2] Sections.cshtml)
                     IntermediateToken - (64:3,0 [2] Sections.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - (68:4,2 [46] Sections.cshtml)
                     IntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp -  \n    Layout = "_SectionTestLayout.cshtml";\n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(117, 26, true);
                 HtmlContent - (117:7,0 [26] Sections.cshtml)
                     IntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
                     IntermediateToken - (119:8,0 [5] Sections.cshtml) - Html - <div>
                     IntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
                     IntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
                     IntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 Section -  - Section1
-                    CSharpCode - 
-                        IntermediateToken -  - CSharp - BeginContext(162, 43, true);
                     HtmlContent - (162:10,19 [43] Sections.cshtml)
                         IntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n    
                         IntermediateToken - (168:11,4 [5] Sections.cshtml) - Html - <div>
                         IntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
                         IntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
                         IntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n    
-                    CSharpCode - 
-                        IntermediateToken -  - CSharp - EndContext();
-                    CSharpCode - 
-                        IntermediateToken -  - CSharp - BeginContext(205, 25, false);
                     TagHelper - (205:12,4 [25] Sections.cshtml) - input-test - TagMode.SelfClosing
                         DefaultTagHelperBody - 
                         DefaultTagHelperCreate -  - InputTestTagHelper
@@ -62,14 +44,8 @@ Document -
                                 IntermediateToken - (222:12,21 [4] Sections.cshtml) - CSharp - Date
                                 IntermediateToken -  - CSharp - )
                         DefaultTagHelperExecute - 
-                    CSharpCode - 
-                        IntermediateToken -  - CSharp - EndContext();
-                    CSharpCode - 
-                        IntermediateToken -  - CSharp - BeginContext(230, 2, true);
                     HtmlContent - (230:12,29 [2] Sections.cshtml)
                         IntermediateToken - (230:12,29 [2] Sections.cshtml) - Html - \n
-                    CSharpCode - 
-                        IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
index 1cd38d3029..b6196f6651 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
@@ -18,7 +18,11 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
 global::System.Object __typeHelper = "*, AppCode";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
index dcc0a00913..9c5fd32efb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
@@ -1,19 +1,19 @@
 Source Location: (14:0,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
 |"*, AppCode"|
-Generated Location: (959:20,37 [12] )
+Generated Location: (1057:21,37 [12] )
 |"*, AppCode"|
 
 Source Location: (30:1,2 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
 |
     var foo = "Hello";
 |
-Generated Location: (1405:32,2 [26] )
+Generated Location: (1534:36,2 [26] )
 |
     var foo = "Hello";
 |
 
 Source Location: (83:5,22 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
 |foo|
-Generated Location: (1856:40,22 [3] )
+Generated Location: (1985:44,22 [3] )
 |foo|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
index 28241f9687..f654e3766e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
@@ -46,10 +46,7 @@ namespace AspNetCore
 
 #line default
 #line hidden
-            BeginContext(59, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(61, 50, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("vc:test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
             }
             );
@@ -75,7 +72,6 @@ namespace AspNetCore
             }
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
-            EndContext();
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
index 4c215a09d3..c69014763c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
@@ -19,14 +19,8 @@ Document -
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 CSharpCode - (30:1,2 [26] ViewComponentTagHelper.cshtml)
                     IntermediateToken - (30:1,2 [26] ViewComponentTagHelper.cshtml) - CSharp - \n    var foo = "Hello";\n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(59, 2, true);
                 HtmlContent - (59:4,0 [2] ViewComponentTagHelper.cshtml)
                     IntermediateToken - (59:4,0 [2] ViewComponentTagHelper.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(61, 50, false);
                 TagHelper - (61:5,0 [50] ViewComponentTagHelper.cshtml) - vc:test - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
                     DefaultTagHelperCreate -  - AllTagHelper
@@ -36,8 +30,6 @@ Document -
                             IntermediateToken - (83:5,22 [3] ViewComponentTagHelper.cshtml) - CSharp - foo
                     PreallocatedTagHelperProperty - (93:5,32 [6] ViewComponentTagHelper.cshtml) - __tagHelperAttribute_0 - bar - Bar
                     DefaultTagHelperExecute - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs
index 208184dc25..209d3361f0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs
@@ -16,7 +16,11 @@ namespace Test.Namespace
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml"
 global::System.Object __typeHelper = nameof(Test.Namespace);
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt
index caae65f18f..2b7a295e01 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (11:0,11 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml)
 |Test.Namespace|
-Generated Location: (725:18,44 [14] )
+Generated Location: (818:19,44 [14] )
 |Test.Namespace|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs
index fb4ec5e55e..ef6c311053 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs
@@ -19,9 +19,7 @@ namespace Test.Namespace
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(27, 20, true);
             WriteLiteral("<h1>Hi There!</h1>\r\n");
-            EndContext();
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
index 471464c580..17f6801a03 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
@@ -13,15 +13,11 @@ Document -
         RazorSourceChecksumAttribute - 
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(27, 20, true);
                 HtmlContent - (27:1,0 [20] ViewWithNamespace.cshtml)
                     IntermediateToken - (27:1,0 [4] ViewWithNamespace.cshtml) - Html - <h1>
                     IntermediateToken - (31:1,4 [9] ViewWithNamespace.cshtml) - Html - Hi There!
                     IntermediateToken - (40:1,13 [5] ViewWithNamespace.cshtml) - Html - </h1>
                     IntermediateToken - (45:1,18 [2] ViewWithNamespace.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
index 6bc3c83d01..1f60d924cc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
@@ -16,11 +16,19 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml"
 IHtmlHelper<TModel> __typeHelper = default(IHtmlHelper<TModel>);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml"
 global::System.Object Helper = null;
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
index a418264123..dc03ca32da 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (8:0,8 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml)
 |IHtmlHelper<TModel>|
-Generated Location: (672:18,0 [19] )
+Generated Location: (760:19,0 [19] )
 |IHtmlHelper<TModel>|
 
 Source Location: (28:0,28 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml)
 |Helper|
-Generated Location: (820:22,22 [6] )
+Generated Location: (1027:27,22 [6] )
 |Helper|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
index 5975633478..9fdc70a98b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -28,7 +28,11 @@ namespace AspNetCore
  }
         ))();
         ((System.Action)(() => {
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
 MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
index 3b5068e43c..cb37b8b1a0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -20,11 +20,11 @@ Generated Location: (839:27,0 [0] )
 
 Source Location: (133:7,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 |MyService<TModel>|
-Generated Location: (892:30,0 [17] )
+Generated Location: (988:31,0 [17] )
 |MyService<TModel>|
 
 Source Location: (150:7,25 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1014:34,0 [0] )
+Generated Location: (1141:38,0 [0] )
 ||
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
index 6a16b10feb..7cdbaf3326 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
@@ -16,11 +16,19 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
 MyBasePageForViews<TModel> __typeHelper = default(MyBasePageForViews<TModel>);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
 MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
index 9b7a5db61d..6a313a909d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (10:0,10 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
 |MyBasePageForViews<TModel>|
-Generated Location: (647:18,0 [26] )
+Generated Location: (740:19,0 [26] )
 |MyBasePageForViews<TModel>|
 
 Source Location: (45:1,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
 |MyModel|
-Generated Location: (787:22,0 [7] )
+Generated Location: (1004:27,0 [7] )
 |MyModel|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
index b77fc2e72c..0ca023f56a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
@@ -16,7 +16,11 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml"
 MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
index 8ae3008a95..9ee5bceaa0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml)
 |MyModel|
-Generated Location: (653:18,0 [7] )
+Generated Location: (752:19,0 [7] )
 |MyModel|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
index e198bf38b2..2120622373 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
@@ -16,23 +16,43 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
 MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
 MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
 global::System.Object MyPropertyName = null;
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
 MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
 global::System.Object Html = null;
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
index 0d58ddea20..c4838ff64d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyModel|
-Generated Location: (675:18,0 [7] )
+Generated Location: (766:19,0 [7] )
 |MyModel|
 
 Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyApp|
-Generated Location: (777:22,0 [5] )
+Generated Location: (990:27,0 [5] )
 |MyApp|
 
 Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyPropertyName|
-Generated Location: (897:26,22 [14] )
+Generated Location: (1232:35,22 [14] )
 |MyPropertyName|
 
 Source Location: (54:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |MyService<TModel>|
-Generated Location: (981:30,0 [17] )
+Generated Location: (1438:43,0 [17] )
 |MyService<TModel>|
 
 Source Location: (72:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
 |Html|
-Generated Location: (1125:34,22 [4] )
+Generated Location: (1704:51,22 [4] )
 |Html|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
index 7d588d5d12..ea95a4e7eb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
@@ -16,39 +16,75 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 global::System.Object MyPropertyName = null;
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 global::System.Object Html = null;
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 global::System.Object MyPropertyName2 = null;
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
 global::System.Object Html2 = null;
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
index 8e98145f2d..6a90f75f3e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
@@ -1,45 +1,45 @@
 Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyModel|
-Generated Location: (679:18,0 [7] )
+Generated Location: (774:19,0 [7] )
 |MyModel|
 
 Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyApp|
-Generated Location: (781:22,0 [5] )
+Generated Location: (1002:27,0 [5] )
 |MyApp|
 
 Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyPropertyName|
-Generated Location: (901:26,22 [14] )
+Generated Location: (1248:35,22 [14] )
 |MyPropertyName|
 
 Source Location: (58:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyService<TModel>|
-Generated Location: (985:30,0 [17] )
+Generated Location: (1458:43,0 [17] )
 |MyService<TModel>|
 
 Source Location: (76:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |Html|
-Generated Location: (1129:34,22 [4] )
+Generated Location: (1728:51,22 [4] )
 |Html|
 
 Source Location: (93:3,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyApp|
-Generated Location: (1203:38,0 [5] )
+Generated Location: (1928:59,0 [5] )
 |MyApp|
 
 Source Location: (99:3,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyPropertyName2|
-Generated Location: (1323:42,22 [15] )
+Generated Location: (2174:67,22 [15] )
 |MyPropertyName2|
 
 Source Location: (129:4,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |MyService<TModel>|
-Generated Location: (1408:46,0 [17] )
+Generated Location: (2385:75,0 [17] )
 |MyService<TModel>|
 
 Source Location: (147:4,26 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
 |Html2|
-Generated Location: (1552:50,22 [5] )
+Generated Location: (2655:83,22 [5] )
 |Html2|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
index b6a4d2a93f..7b2f4fedc6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
@@ -16,11 +16,19 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
 MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
 global::System.Object MyPropertyName = null;
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
index 8bd4399f3f..10ed356ecf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (8:0,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
 |MyApp|
-Generated Location: (666:18,0 [5] )
+Generated Location: (748:19,0 [5] )
 |MyApp|
 
 Source Location: (14:0,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
 |MyPropertyName|
-Generated Location: (786:22,22 [14] )
+Generated Location: (981:27,22 [14] )
 |MyPropertyName|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
index e669a23be0..82441cd663 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
@@ -17,11 +17,19 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
 DateTime __typeHelper = default(DateTime);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
 global::System.Object __typeHelper = "InputTestTagHelper, AppCode";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
index ced10bc85e..63a7d6ccc1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |DateTime|
-Generated Location: (751:19,0 [8] )
+Generated Location: (851:20,0 [8] )
 |DateTime|
 
 Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |"InputTestTagHelper, AppCode"|
-Generated Location: (892:23,37 [29] )
+Generated Location: (1123:28,37 [29] )
 |"InputTestTagHelper, AppCode"|
 
 Source Location: (83:4,17 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |Date|
-Generated Location: (1540:36,102 [4] )
+Generated Location: (1802:44,102 [4] )
 |Date|
 
 Source Location: (111:5,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
 |Model|
-Generated Location: (1856:42,94 [5] )
+Generated Location: (2118:50,94 [5] )
 |Model|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
index 923b853936..63c2a52c6f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
@@ -16,7 +16,11 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml"
 System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
index 14e9047943..7d84cf754d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (7:0,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml)
 |System.Collections.IEnumerable|
-Generated Location: (688:18,0 [30] )
+Generated Location: (769:19,0 [30] )
 |System.Collections.IEnumerable|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
index dc5fcee8a2..e8f705cef7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
@@ -16,11 +16,19 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
 ThisShouldBeGenerated __typeHelper = default(ThisShouldBeGenerated);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
 System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
index ff5971643c..79d7e257c7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (7:0,7 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml)
 |ThisShouldBeGenerated|
-Generated Location: (688:18,0 [21] )
+Generated Location: (778:19,0 [21] )
 |ThisShouldBeGenerated|
 
 Source Location: (37:1,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml)
 |System.Collections.IEnumerable|
-Generated Location: (818:22,0 [30] )
+Generated Location: (1029:27,0 [30] )
 |System.Collections.IEnumerable|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
index 604b3f412a..3ca46af8a7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
@@ -17,15 +17,27 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
 DateTime __typeHelper = default(DateTime);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
 global::System.Object __typeHelper = "InputTestTagHelper, AppCode";
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
 global::System.Object Section1 = null;
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
index 4eb221e12b..1cc991810c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
@@ -1,29 +1,29 @@
 Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |DateTime|
-Generated Location: (735:19,0 [8] )
+Generated Location: (819:20,0 [8] )
 |DateTime|
 
 Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |"InputTestTagHelper, AppCode"|
-Generated Location: (876:23,37 [29] )
+Generated Location: (1075:28,37 [29] )
 |"InputTestTagHelper, AppCode"|
 
 Source Location: (152:10,9 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Section1|
-Generated Location: (990:27,22 [8] )
+Generated Location: (1305:36,22 [8] )
 |Section1|
 
 Source Location: (68:4,2 [46] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 | 
     Layout = "_SectionTestLayout.cshtml";
 |
-Generated Location: (1425:39,2 [46] )
+Generated Location: (1771:51,2 [46] )
 | 
     Layout = "_SectionTestLayout.cshtml";
 |
 
 Source Location: (222:12,21 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Date|
-Generated Location: (1850:47,102 [4] )
+Generated Location: (2196:59,102 [4] )
 |Date|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
index 1cd38d3029..b6196f6651 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
@@ -18,7 +18,11 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
 global::System.Object __typeHelper = "*, AppCode";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
index dcc0a00913..9c5fd32efb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
@@ -1,19 +1,19 @@
 Source Location: (14:0,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
 |"*, AppCode"|
-Generated Location: (959:20,37 [12] )
+Generated Location: (1057:21,37 [12] )
 |"*, AppCode"|
 
 Source Location: (30:1,2 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
 |
     var foo = "Hello";
 |
-Generated Location: (1405:32,2 [26] )
+Generated Location: (1534:36,2 [26] )
 |
     var foo = "Hello";
 |
 
 Source Location: (83:5,22 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
 |foo|
-Generated Location: (1856:40,22 [3] )
+Generated Location: (1985:44,22 [3] )
 |foo|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
index 6bc3c83d01..1f60d924cc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
@@ -16,11 +16,19 @@ namespace AspNetCore
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml"
 IHtmlHelper<TModel> __typeHelper = default(IHtmlHelper<TModel>);
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml"
 global::System.Object Helper = null;
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
index a418264123..dc03ca32da 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (8:0,8 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml)
 |IHtmlHelper<TModel>|
-Generated Location: (672:18,0 [19] )
+Generated Location: (760:19,0 [19] )
 |IHtmlHelper<TModel>|
 
 Source Location: (28:0,28 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml)
 |Helper|
-Generated Location: (820:22,22 [6] )
+Generated Location: (1027:27,22 [6] )
 |Helper|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/AssemblyAttributeInjectionPassTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/AssemblyAttributeInjectionPassTest.cs
new file mode 100644
index 0000000000..4dbe6c72b4
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/AssemblyAttributeInjectionPassTest.cs
@@ -0,0 +1,444 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class AssemblyAttributeInjectionPassTest
+    {
+        [Fact]
+        public void Execute_NoOps_IfNamespaceNodeIsMissing()
+        {
+            // Arrange
+            var irDocument = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
+
+            // Assert
+            Assert.Empty(irDocument.Children);
+        }
+
+        [Fact]
+        public void Execute_NoOps_IfNamespaceNodeHasEmptyContent()
+        {
+            // Arrange
+            var irDocument = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = string.Empty };
+            @namespace.Annotations[CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace;
+            builder.Push(@namespace);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
+
+            // Assert
+            Assert.Collection(irDocument.Children,
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_NoOps_IfClassNameNodeIsMissing()
+        {
+            // Arrange
+            var irDocument = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "SomeNamespace" };
+            builder.Push(@namespace);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
+
+            // Assert
+            Assert.Collection(
+                irDocument.Children,
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_NoOps_IfClassNameIsEmpty()
+        {
+            // Arrange
+            var irDocument = new DocumentIntermediateNode()
+            {
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Content = "SomeNamespace",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace,
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
+
+            // Assert
+            Assert.Collection(irDocument.Children,
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_NoOps_IfDocumentIsNotViewOrPage()
+        {
+            // Arrange
+            var irDocument = new DocumentIntermediateNode
+            {
+                DocumentKind = "Default",
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "SomeNamespace" };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                ClassName = "SomeName",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            // Act
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
+
+            // Assert
+            Assert.Collection(
+                irDocument.Children,
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_NoOps_ForDesignTime()
+        {
+            // Arrange
+            var irDocument = new DocumentIntermediateNode
+            {
+                DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind,
+                Options = RazorCodeGenerationOptions.CreateDesignTimeDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Content = "SomeNamespace",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                ClassName = "SomeName",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "/Views/Index.cshtml"));
+            var document = RazorCodeDocument.Create(source);
+
+            // Act
+            pass.Execute(document, irDocument);
+
+            // Assert
+            Assert.Collection(
+                irDocument.Children,
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_AddsRazorViewAttribute_ToViews()
+        {
+            // Arrange
+            var expectedAttribute = "[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@\"/Views/Index.cshtml\", typeof(SomeNamespace.SomeName))]";
+            var irDocument = new DocumentIntermediateNode
+            {
+                DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind,
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Content = "SomeNamespace",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                ClassName = "SomeName",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "/Views/Index.cshtml"));
+            var document = RazorCodeDocument.Create(source);
+
+            // Act
+            pass.Execute(document, irDocument);
+
+            // Assert
+            Assert.Collection(irDocument.Children,
+                node =>
+                {
+                    var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
+                    var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
+                    Assert.Equal(TokenKind.CSharp, token.Kind);
+                    Assert.Equal(expectedAttribute, token.Content);
+                },
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_EscapesViewPathWhenAddingAttributeToViews()
+        {
+            // Arrange
+            var expectedAttribute = "[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@\"/test/\"\"Index.cshtml\", typeof(SomeNamespace.SomeName))]";
+            var irDocument = new DocumentIntermediateNode
+            {
+                DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind,
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Content = "SomeNamespace",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                ClassName = "SomeName",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "\\test\\\"Index.cshtml"));
+            var document = RazorCodeDocument.Create(source);
+
+            // Act
+            pass.Execute(document, irDocument);
+
+            // Assert
+            Assert.Collection(irDocument.Children,
+                node =>
+                {
+                    var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
+                    var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
+                    Assert.Equal(TokenKind.CSharp, token.Kind);
+                    Assert.Equal(expectedAttribute, token.Content);
+                },
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_AddsRazorPagettribute_ToPage()
+        {
+            // Arrange
+            var expectedAttribute = "[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@\"/Views/Index.cshtml\", typeof(SomeNamespace.SomeName), null)]";
+            var irDocument = new DocumentIntermediateNode
+            {
+                DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind,
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var pageDirective = new DirectiveIntermediateNode
+            {
+                Directive = PageDirective.Directive,
+            };
+            builder.Add(pageDirective);
+
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Content = "SomeNamespace",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                ClassName = "SomeName",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "/Views/Index.cshtml"));
+            var document = RazorCodeDocument.Create(source);
+
+            // Act
+            pass.Execute(document, irDocument);
+
+            // Assert
+            Assert.Collection(irDocument.Children,
+                node => Assert.Same(pageDirective, node),
+                node =>
+                {
+                    var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
+                    var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
+                    Assert.Equal(TokenKind.CSharp, token.Kind);
+                    Assert.Equal(expectedAttribute, token.Content);
+                },
+                node => Assert.Same(@namespace, node));
+        }
+
+        [Fact]
+        public void Execute_EscapesViewPathAndRouteWhenAddingAttributeToPage()
+        {
+            // Arrange
+            var expectedAttribute = "[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@\"/test/\"\"Index.cshtml\", typeof(SomeNamespace.SomeName))]";
+            var irDocument = new DocumentIntermediateNode
+            {
+                DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind,
+                Options = RazorCodeGenerationOptions.CreateDefault(),
+            };
+            var builder = IntermediateNodeBuilder.Create(irDocument);
+            var @namespace = new NamespaceDeclarationIntermediateNode
+            {
+                Content = "SomeNamespace",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryNamespace] = CommonAnnotations.PrimaryNamespace
+                },
+            };
+            builder.Push(@namespace);
+            var @class = new ClassDeclarationIntermediateNode
+            {
+                ClassName = "SomeName",
+                Annotations =
+                {
+                    [CommonAnnotations.PrimaryClass] = CommonAnnotations.PrimaryClass,
+                },
+            };
+
+            builder.Add(@class);
+
+            var pass = new AssemblyAttributeInjectionPass
+            {
+                Engine = RazorProjectEngine.Create().Engine,
+            };
+
+            var source = TestRazorSourceDocument.Create("test", new RazorSourceDocumentProperties(filePath: null, relativePath: "test\\\"Index.cshtml"));
+            var document = RazorCodeDocument.Create(source);
+
+            // Act
+            pass.Execute(document, irDocument);
+
+            // Assert
+            Assert.Collection(irDocument.Children,
+                node =>
+                {
+                    var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
+                    var token = Assert.IsType<IntermediateToken>(Assert.Single(csharpCode.Children));
+                    Assert.Equal(TokenKind.CSharp, token.Kind);
+                    Assert.Equal(expectedAttribute, token.Content);
+                },
+                node => Assert.Same(@namespace, node));
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDocumentClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/InjectDirectiveTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/InjectDirectiveTest.cs
new file mode 100644
index 0000000000..ff128921c9
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/InjectDirectiveTest.cs
@@ -0,0 +1,225 @@
+// 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.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class InjectDirectiveTest
+    {
+        [Fact]
+        public void InjectDirectivePass_Execute_DefinesProperty()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inject PropertyType PropertyName
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        [Fact]
+        public void InjectDirectivePass_Execute_DedupesPropertiesByName()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inject PropertyType PropertyName
+@inject PropertyType2 PropertyName
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType2", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        [Fact]
+        public void InjectDirectivePass_Execute_ExpandsTModel_WithDynamic()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inject PropertyType<TModel> PropertyName
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType<dynamic>", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        [Fact]
+        public void InjectDirectivePass_Execute_ExpandsTModel_WithModelTypeFirst()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@model ModelType
+@inject PropertyType<TModel> PropertyName
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType<ModelType>", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        [Fact]
+        public void InjectDirectivePass_Execute_ExpandsTModel_WithModelType()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inject PropertyType<TModel> PropertyName
+@model ModelType
+");
+
+            var engine = CreateEngine();
+            var pass = new InjectDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal(2, @class.Children.Count);
+
+            var node = Assert.IsType<InjectIntermediateNode>(@class.Children[1]);
+            Assert.Equal("PropertyType<ModelType>", node.TypeName);
+            Assert.Equal("PropertyName", node.MemberName);
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return RazorCodeDocument.Create(source);
+        }
+
+        private ClassDeclarationIntermediateNode FindClassNode(IntermediateNode node)
+        {
+            var visitor = new ClassNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private RazorEngine CreateEngine()
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                // Notice we're not registering the InjectDirective.Pass here so we can run it on demand.
+                b.AddDirective(InjectDirective.Directive);
+                b.AddDirective(ModelDirective.Directive);
+            }).Engine;
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDocumentClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private string GetCSharpContent(IntermediateNode node)
+        {
+            var builder = new StringBuilder();
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                var child = node.Children[i] as IntermediateToken;
+                if (child.Kind == TokenKind.CSharp)
+                {
+                    builder.Append(child.Content);
+                }
+            }
+
+            return builder.ToString();
+        }
+
+        private class ClassNodeVisitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Node { get; set; }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/InjectTargetExtensionTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/InjectTargetExtensionTest.cs
new file mode 100644
index 0000000000..71b2ec20ce
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/InjectTargetExtensionTest.cs
@@ -0,0 +1,68 @@
+// 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;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class InjectTargetExtensionTest
+    {
+        [Fact]
+        public void InjectDirectiveTargetExtension_WritesProperty()
+        {
+            // Arrange
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var target = new InjectTargetExtension();
+            var node = new InjectIntermediateNode()
+            {
+                TypeName = "PropertyType",
+                MemberName = "PropertyName",
+            };
+
+            // Act
+            target.WriteInjectProperty(context, node);
+
+            // Assert
+            Assert.Equal(
+                "[global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]" + Environment.NewLine +
+                "public PropertyType PropertyName { get; private set; }" + Environment.NewLine,
+                context.CodeWriter.GenerateCode());
+        }
+
+        [Fact]
+        public void InjectDirectiveTargetExtension_WritesPropertyWithLinePragma_WhenSourceIsSet()
+        {
+            // Arrange
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var target = new InjectTargetExtension();
+            var node = new InjectIntermediateNode()
+            {
+                TypeName = "PropertyType<ModelType>",
+                MemberName = "PropertyName",
+                Source = new SourceSpan(
+                    filePath: "test-path",
+                    absoluteIndex: 0,
+                    lineIndex: 1,
+                    characterIndex: 1,
+                    length: 10)
+            };
+
+            // Act
+            target.WriteInjectProperty(context, node);
+
+            // Assert
+            Assert.Equal(
+                "#line 2 \"test-path\"" + Environment.NewLine +
+                "[global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]" + Environment.NewLine +
+                "public PropertyType<ModelType> PropertyName { get; private set; }" + Environment.NewLine + Environment.NewLine +
+                "#line default" + Environment.NewLine +
+                "#line hidden" + Environment.NewLine,
+                context.CodeWriter.GenerateCode());
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InstrumentationPassTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/InstrumentationPassTest.cs
similarity index 99%
rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InstrumentationPassTest.cs
rename to src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/InstrumentationPassTest.cs
index e9a1d5538a..e1bd402e26 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InstrumentationPassTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/InstrumentationPassTest.cs
@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Xunit;
 using static Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeAssert;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
 {
     public class InstrumentationPassTest
     {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/IntegrationTests/CodeGenerationIntegrationTest.cs
new file mode 100644
index 0000000000..1ff7ec5794
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -0,0 +1,961 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.IntegrationTests;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IntegrationTests
+{
+    public class CodeGenerationIntegrationTest : IntegrationTestBase
+    {
+        private readonly static CSharpCompilation DefaultBaseCompilation = MvcShim.BaseCompilation.WithAssemblyName("AppCode");
+
+        public CodeGenerationIntegrationTest()
+            : base(generateBaselines: null)
+        {
+            Configuration = RazorConfiguration.Create(
+                RazorLanguageVersion.Version_2_0,
+                "MVC-2.1",
+                new[] { new AssemblyExtension("MVC-2.1", typeof(ExtensionInitializer).Assembly) });
+        }
+
+        protected override CSharpCompilation BaseCompilation => DefaultBaseCompilation;
+
+        protected override RazorConfiguration Configuration { get; }
+
+        #region Runtime
+
+        [Fact]
+        public void UsingDirectives_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false, throwOnFailure: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+
+            var diagnostics = compiled.Compilation.GetDiagnostics().Where(d => d.Severity >= DiagnosticSeverity.Warning);
+            Assert.Equal("The using directive for 'System' appeared previously in this namespace", Assert.Single(diagnostics).GetMessage());
+        }
+
+        [Fact]
+        public void InvalidNamespaceAtEOF_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ1014", Assert.Single(diagnotics).Id);
+        }
+
+        [Fact]
+        public void IncompleteDirectives_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+
+            // We expect this test to generate a bunch of errors.
+            Assert.True(compiled.CodeDocument.GetCSharpDocument().Diagnostics.Count > 0);
+        }
+
+        [Fact]
+        public void InheritsViewModel_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Razor;
+
+public class MyBasePageForViews<TModel> : RazorPage
+{
+    public override Task ExecuteAsync()
+    {
+        throw new System.NotImplementedException();
+    }
+}
+public class MyModel
+{
+
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void InheritsWithViewImports_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+public abstract class MyPageModel<T> : Page
+{
+    public override Task ExecuteAsync()
+    {
+        throw new System.NotImplementedException();
+    }
+}
+
+public class MyModel
+{
+
+}");
+            AddProjectItemFromText(@"@inherits MyPageModel<TModel>");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void MalformedPageDirective_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ1016", Assert.Single(diagnotics).Id);
+        }
+
+        [Fact]
+        public void Basic_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void Sections_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+public class InputTestTagHelper : {typeof(TagHelper).FullName}
+{{
+    public ModelExpression For {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void _ViewImports_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void Inject_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void InjectWithModel_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyModel
+{
+
+}
+
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}
+
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void InjectWithSemicolon_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyModel
+{
+
+}
+
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}
+
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void Model_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void ModelExpressionTagHelper_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+public class InputTestTagHelper : {typeof(TagHelper).FullName}
+{{
+    public ModelExpression For {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void RazorPages_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class DivTagHelper : {typeof(TagHelper).FullName}
+{{
+
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void RazorPagesWithRouteTemplate_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void RazorPagesWithoutModel_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class DivTagHelper : {typeof(TagHelper).FullName}
+{{
+
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void PageWithNamespace_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void ViewWithNamespace_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void ViewComponentTagHelper_Runtime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class TestViewComponent
+{{
+    public string Invoke(string firstName)
+    {{
+        return firstName;
+    }}
+}}
+
+[{typeof(HtmlTargetElementAttribute).FullName}]
+public class AllTagHelper : {typeof(TagHelper).FullName}
+{{
+    public string Bar {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+        }
+
+        [Fact]
+        public void RazorPageWithNoLeadingPageDirective_Runtime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ3906", Assert.Single(diagnotics).Id);
+        }
+        #endregion
+
+        #region DesignTime
+
+        [Fact]
+        public void UsingDirectives_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true, throwOnFailure: false);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            var diagnostics = compiled.Compilation.GetDiagnostics().Where(d => d.Severity >= DiagnosticSeverity.Warning);
+            Assert.Equal("The using directive for 'System' appeared previously in this namespace", Assert.Single(diagnostics).GetMessage());
+        }
+
+        [Fact]
+        public void InvalidNamespaceAtEOF_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ1014", Assert.Single(diagnotics).Id);
+        }
+
+        [Fact]
+        public void IncompleteDirectives_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            // We expect this test to generate a bunch of errors.
+            Assert.True(compiled.CodeDocument.GetCSharpDocument().Diagnostics.Count > 0);
+        }
+
+        [Fact]
+        public void InheritsViewModel_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Razor;
+
+public class MyBasePageForViews<TModel> : RazorPage
+{
+    public override Task ExecuteAsync()
+    {
+        throw new System.NotImplementedException();
+    }
+}
+public class MyModel
+{
+
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void InheritsWithViewImports_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+public abstract class MyPageModel<T> : Page
+{
+    public override Task ExecuteAsync()
+    {
+        throw new System.NotImplementedException();
+    }
+}
+
+public class MyModel
+{
+
+}");
+
+            AddProjectItemFromText(@"@inherits MyPageModel<TModel>");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void MalformedPageDirective_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ1016", Assert.Single(diagnotics).Id);
+        }
+
+        [Fact]
+        public void Basic_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void Sections_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+public class InputTestTagHelper : {typeof(TagHelper).FullName}
+{{
+    public ModelExpression For {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void _ViewImports_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void Inject_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void InjectWithModel_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyModel
+{
+
+}
+
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}
+
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void InjectWithSemicolon_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class MyModel
+{
+
+}
+
+public class MyApp
+{
+    public string MyProperty { get; set; }
+}
+
+public class MyService<TModel>
+{
+    public string Html { get; set; }
+}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void Model_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void MultipleModels_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree(@"
+public class ThisShouldBeGenerated
+{
+
+}");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ2001", Assert.Single(diagnotics).Id);
+        }
+        
+        [Fact]
+        public void ModelExpressionTagHelper_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+public class InputTestTagHelper : {typeof(TagHelper).FullName}
+{{
+    public ModelExpression For {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void RazorPages_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class DivTagHelper : {typeof(TagHelper).FullName}
+{{
+
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void RazorPagesWithRouteTemplate_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void RazorPagesWithoutModel_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class DivTagHelper : {typeof(TagHelper).FullName}
+{{
+
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void PageWithNamespace_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void ViewWithNamespace_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void ViewComponentTagHelper_DesignTime()
+        {
+            // Arrange
+            AddCSharpSyntaxTree($@"
+public class TestViewComponent
+{{
+    public string Invoke(string firstName)
+    {{
+        return firstName;
+    }}
+}}
+
+[{typeof(HtmlTargetElementAttribute).FullName}]
+public class AllTagHelper : {typeof(TagHelper).FullName}
+{{
+    public string Bar {{ get; set; }}
+}}
+");
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToAssembly(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+        }
+
+        [Fact]
+        public void RazorPageWithNoLeadingPageDirective_DesignTime()
+        {
+            // Arrange
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var compiled = CompileToCSharp(projectItem, designTime: true);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(compiled.CodeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(compiled.CodeDocument.GetCSharpDocument());
+            AssertSourceMappingsMatchBaseline(compiled.CodeDocument);
+
+            var diagnotics = compiled.CodeDocument.GetCSharpDocument().Diagnostics;
+            Assert.Equal("RZ3906", Assert.Single(diagnotics).Id);
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/InstrumentationPassIntegrationTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/IntegrationTests/InstrumentationPassIntegrationTest.cs
similarity index 97%
rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/InstrumentationPassIntegrationTest.cs
rename to src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/IntegrationTests/InstrumentationPassIntegrationTest.cs
index 2e312fa430..604100a335 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/InstrumentationPassIntegrationTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/IntegrationTests/InstrumentationPassIntegrationTest.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.IntegrationTests;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.IntegrationTests
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.IntegrationTests
 {
     public class InstrumentationPassIntegrationTest : IntegrationTestBase
     {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
new file mode 100644
index 0000000000..0fd06dcdfd
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
@@ -0,0 +1,52 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\**" />
+    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- We need this to compile but don't want it referenced by the project. It is included dynamically in CodeGeneration tests. -->
+    <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>Content</OutputItemType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Targets>Build</Targets>
+    </ProjectReference>
+
+    <!-- Due to how DependencyContext.Load handles our special MvcShim reference above we need to also reference the MvcShim's DiagnosticSource dependency -->
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+  </ItemGroup>
+
+
+  <Target Name="CopyDepsFromShims" AfterTargets="Build">
+    <ItemGroup>
+      <MvcShim Condition="$(TargetFramework) != ''" Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X\bin\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.deps.json" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(MvcShim)" DestinationFolder="$(OutputPath)" />
+  </Target>
+</Project>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ModelDirectiveTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ModelDirectiveTest.cs
new file mode 100644
index 0000000000..eedc94d581
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ModelDirectiveTest.cs
@@ -0,0 +1,343 @@
+// 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;
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class ModelDirectiveTest
+    {
+        [Fact]
+        public void ModelDirective_GetModelType_GetsTypeFromFirstWellFormedDirective()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@model Type1
+@model Type2
+@model
+");
+
+            var engine = CreateEngine();
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = ModelDirective.GetModelType(irDocument);
+
+            // Assert
+            Assert.Equal("Type1", result);
+        }
+
+        [Fact]
+        public void ModelDirective_GetModelType_DefaultsToDynamic()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@" ");
+
+            var engine = CreateEngine();
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = ModelDirective.GetModelType(irDocument);
+
+            // Assert
+            Assert.Equal("dynamic", result);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_Execute_ReplacesTModelInBaseType()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType<TModel>
+@model Type1
+");
+
+            var engine = CreateEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<Type1>", @class.BaseType);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_Execute_ReplacesTModelInBaseType_DifferentOrdering()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@model Type1
+@inherits BaseType<TModel>
+@model Type2
+");
+
+            var engine = CreateEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<Type1>", @class.BaseType);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_Execute_NoOpWithoutTModel()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType
+@model Type1
+");
+
+            var engine = CreateEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType", @class.BaseType);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_Execute_ReplacesTModelInBaseType_DefaultDynamic()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType<TModel>
+");
+
+            var engine = CreateEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<dynamic>", @class.BaseType);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_DesignTime_AddsTModelUsingDirective()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType<TModel>
+");
+
+            var engine = CreateDesignTimeEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<dynamic>", @class.BaseType);
+
+            var @namespace = FindNamespaceNode(irDocument);
+            var usingNode = Assert.IsType<UsingDirectiveIntermediateNode>(@namespace.Children[0]);
+            Assert.Equal($"TModel = global::{typeof(object).FullName}", usingNode.Content);
+        }
+
+        [Fact]
+        public void ModelDirectivePass_DesignTime_WithModel_AddsTModelUsingDirective()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@inherits BaseType<TModel>
+@model SomeType
+");
+
+            var engine = CreateDesignTimeEngine();
+            var pass = new ModelDirective.Pass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.NotNull(@class);
+            Assert.Equal("BaseType<SomeType>", @class.BaseType);
+
+            var @namespace = FindNamespaceNode(irDocument);
+            var usingNode = Assert.IsType<UsingDirectiveIntermediateNode>(@namespace.Children[0]);
+            Assert.Equal($"TModel = global::System.Object", usingNode.Content);
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return RazorCodeDocument.Create(source);
+        }
+
+        private ClassDeclarationIntermediateNode FindClassNode(IntermediateNode node)
+        {
+            var visitor = new ClassNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private NamespaceDeclarationIntermediateNode FindNamespaceNode(IntermediateNode node)
+        {
+            var visitor = new NamespaceNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private RazorEngine CreateEngine()
+        {
+            return CreateEngineCore();
+        }
+
+        private RazorEngine CreateDesignTimeEngine()
+        {
+            return CreateEngineCore(designTime: true);
+        }
+
+        private RazorEngine CreateEngineCore(bool designTime = false)
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                // Notice we're not registering the ModelDirective.Pass here so we can run it on demand.
+                b.AddDirective(ModelDirective.Directive);
+
+                // There's some special interaction with the inherits directive
+                InheritsDirective.Register(b);
+
+                b.Features.Add(new DesignTimeOptionsFeature(designTime));
+            }).Engine;
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDocumentClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            // InheritsDirectivePass needs to run before ModelDirective.
+            var pass = new InheritsDirectivePass()
+            {
+                Engine = engine
+            };
+            pass.Execute(codeDocument, codeDocument.GetDocumentIntermediateNode());
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private string GetCSharpContent(IntermediateNode node)
+        {
+            var builder = new StringBuilder();
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                var child = node.Children[i] as IntermediateToken;
+                if (child.Kind == TokenKind.CSharp)
+                {
+                    builder.Append(child.Content);
+                }
+            }
+
+            return builder.ToString();
+        }
+
+        private class ClassNodeVisitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Node { get; set; }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+
+        private class NamespaceNodeVisitor : IntermediateNodeWalker
+        {
+            public NamespaceDeclarationIntermediateNode Node { get; set; }
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+
+        private class DesignTimeOptionsFeature : IConfigureRazorParserOptionsFeature, IConfigureRazorCodeGenerationOptionsFeature
+        {
+            private bool _designTime;
+
+            public DesignTimeOptionsFeature(bool designTime)
+            {
+                _designTime = designTime;
+            }
+
+            public int Order { get; }
+
+            public RazorEngine Engine { get; set; }
+
+            public void Configure(RazorParserOptionsBuilder options)
+            {
+                options.SetDesignTime(_designTime);
+            }
+
+            public void Configure(RazorCodeGenerationOptionsBuilder options)
+            {
+                options.SetDesignTime(_designTime);
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ModelExpressionPassTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ModelExpressionPassTest.cs
new file mode 100644
index 0000000000..d18984c900
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ModelExpressionPassTest.cs
@@ -0,0 +1,208 @@
+// 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.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class ModelExpressionPassTest
+    {
+        [Fact]
+        public void ModelExpressionPass_NonModelExpressionProperty_Ignored()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper TestTagHelper, TestAssembly
+<p foo=""17"">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
+                    .BoundAttributeDescriptor(attribute =>
+                        attribute
+                            .Name("Foo")
+                            .TypeName("System.Int32"))
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule.RequireTagName("p"))
+                    .Build()
+            };
+
+            var engine = CreateEngine(tagHelpers);
+            var pass = new ModelExpressionPass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            var setProperty = tagHelper.Children.OfType<TagHelperPropertyIntermediateNode>().Single();
+
+            var token = Assert.IsType<IntermediateToken>(Assert.Single(setProperty.Children));
+            Assert.True(token.IsCSharp);
+            Assert.Equal("17", token.Content);
+        }
+
+        [Fact]
+        public void ModelExpressionPass_ModelExpressionProperty_SimpleExpression()
+        {
+            // Arrange
+
+            // Using \r\n here because we verify line mappings
+            var codeDocument = CreateDocument(
+                "@addTagHelper TestTagHelper, TestAssembly\r\n<p foo=\"Bar\">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
+                    .BoundAttributeDescriptor(attribute =>
+                        attribute
+                            .Name("Foo")
+                            .TypeName("Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression"))
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule.RequireTagName("p"))
+                    .Build()
+            };
+
+            var engine = CreateEngine(tagHelpers);
+            var pass = new ModelExpressionPass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            var setProperty = tagHelper.Children.OfType<TagHelperPropertyIntermediateNode>().Single();
+
+            var expression = Assert.IsType<CSharpExpressionIntermediateNode>(Assert.Single(setProperty.Children));
+            Assert.Equal("ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Bar)", GetCSharpContent(expression));
+
+            var originalNode = Assert.IsType<IntermediateToken>(expression.Children[2]);
+            Assert.Equal(TokenKind.CSharp, originalNode.Kind);
+            Assert.Equal("Bar", originalNode.Content);
+            Assert.Equal(new SourceSpan("test.cshtml", 51, 1, 8, 3), originalNode.Source.Value);
+        }
+
+        [Fact]
+        public void ModelExpressionPass_ModelExpressionProperty_ComplexExpression()
+        {
+            // Arrange
+
+            // Using \r\n here because we verify line mappings
+            var codeDocument = CreateDocument(
+                "@addTagHelper TestTagHelper, TestAssembly\r\n<p foo=\"@Bar\">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
+                    .BoundAttributeDescriptor(attribute =>
+                        attribute
+                            .Name("Foo")
+                            .TypeName("Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression"))
+                    .TagMatchingRuleDescriptor(rule =>
+                        rule.RequireTagName("p"))
+                    .Build()
+            };
+
+            var engine = CreateEngine(tagHelpers);
+            var pass = new ModelExpressionPass()
+            {
+                Engine = engine,
+            };
+
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            var setProperty = tagHelper.Children.OfType<TagHelperPropertyIntermediateNode>().Single();
+
+            var expression = Assert.IsType<CSharpExpressionIntermediateNode>(Assert.Single(setProperty.Children));
+            Assert.Equal("ModelExpressionProvider.CreateModelExpression(ViewData, __model => Bar)", GetCSharpContent(expression));
+
+            var originalNode = Assert.IsType<IntermediateToken>(expression.Children[1]);
+            Assert.Equal(TokenKind.CSharp, originalNode.Kind);
+            Assert.Equal("Bar", originalNode.Content);
+            Assert.Equal(new SourceSpan("test.cshtml", 52, 1, 9, 3), originalNode.Source.Value);
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return RazorCodeDocument.Create(source);
+        }
+
+        private RazorEngine CreateEngine(params TagHelperDescriptor[] tagHelpers)
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                b.Features.Add(new TestTagHelperFeature(tagHelpers));
+            }).Engine;
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDirectiveClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private TagHelperIntermediateNode FindTagHelperNode(IntermediateNode node)
+        {
+            var visitor = new TagHelperNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private string GetCSharpContent(IntermediateNode node)
+        {
+            var builder = new StringBuilder();
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                var child = node.Children[i] as IntermediateToken;
+                if (child.Kind == TokenKind.CSharp)
+                {
+                    builder.Append(child.Content);
+                }
+            }
+
+            return builder.ToString();
+        }
+
+        private class TagHelperNodeVisitor : IntermediateNodeWalker
+        {
+            public TagHelperIntermediateNode Node { get; set; }
+
+            public override void VisitTagHelper(TagHelperIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/MvcImportProjectFeatureTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/MvcImportProjectFeatureTest.cs
new file mode 100644
index 0000000000..13c686adf9
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/MvcImportProjectFeatureTest.cs
@@ -0,0 +1,76 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class MvcImportProjectFeatureTest
+    {
+        [Fact]
+        public void AddDefaultDirectivesImport_AddsSingleDynamicImport()
+        {
+            // Arrange
+            var imports = new List<RazorProjectItem>();
+
+            // Act
+            MvcImportProjectFeature.AddDefaultDirectivesImport(imports);
+
+            // Assert
+            var import = Assert.Single(imports);
+            Assert.Null(import.FilePath);
+        }
+
+        [Fact]
+        public void AddHierarchicalImports_AddsViewImportSourceDocumentsOnDisk()
+        {
+            // Arrange
+            var imports = new List<RazorProjectItem>();
+            var projectItem = new TestRazorProjectItem("/Contact/Index.cshtml");
+            var testFileSystem = new TestRazorProjectFileSystem(new[]
+            {
+                new TestRazorProjectItem("/Index.cshtml"),
+                new TestRazorProjectItem("/_ViewImports.cshtml"),
+                new TestRazorProjectItem("/Contact/_ViewImports.cshtml"),
+                projectItem,
+            });
+            var mvcImportFeature = new MvcImportProjectFeature()
+            {
+                ProjectEngine = Mock.Of<RazorProjectEngine>(projectEngine => projectEngine.FileSystem == testFileSystem)
+            };
+
+            // Act
+            mvcImportFeature.AddHierarchicalImports(projectItem, imports);
+
+            // Assert
+            Assert.Collection(imports,
+                import => Assert.Equal("/_ViewImports.cshtml", import.FilePath),
+                import => Assert.Equal("/Contact/_ViewImports.cshtml", import.FilePath));
+        }
+
+        [Fact]
+        public void AddHierarchicalImports_AddsViewImportSourceDocumentsNotOnDisk()
+        {
+            // Arrange
+            var imports = new List<RazorProjectItem>();
+            var projectItem = new TestRazorProjectItem("/Pages/Contact/Index.cshtml");
+            var testFileSystem = new TestRazorProjectFileSystem(new[] { projectItem });
+            var mvcImportFeature = new MvcImportProjectFeature()
+            {
+                ProjectEngine = Mock.Of<RazorProjectEngine>(projectEngine => projectEngine.FileSystem == testFileSystem)
+            };
+
+            // Act
+            mvcImportFeature.AddHierarchicalImports(projectItem, imports);
+
+            // Assert
+            Assert.Collection(imports,
+                import => Assert.Equal("/_ViewImports.cshtml", import.FilePath),
+                import => Assert.Equal("/Pages/_ViewImports.cshtml", import.FilePath),
+                import => Assert.Equal("/Pages/Contact/_ViewImports.cshtml", import.FilePath));
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/MvcShim.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/MvcShim.cs
new file mode 100644
index 0000000000..acbdea28f3
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/MvcShim.cs
@@ -0,0 +1,45 @@
+// 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.IO;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    internal static class MvcShim
+    {
+        public static readonly string AssemblyName = "Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X";
+
+        private static Assembly _assembly;
+        private static CSharpCompilation _baseCompilation;
+
+        public static Assembly Assembly
+        {
+            get
+            {
+                if (_assembly == null)
+                {
+                    var filePath = Path.Combine(Directory.GetCurrentDirectory(), AssemblyName + ".dll");
+                    _assembly = Assembly.LoadFrom(filePath);
+                }
+
+                return _assembly;
+            }
+        }
+
+        public static CSharpCompilation BaseCompilation
+        {
+            get
+            {
+                if (_baseCompilation == null)
+                {
+                    _baseCompilation = TestCompilation.Create(Assembly);
+                }
+
+                return _baseCompilation;
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/MvcViewDocumentClassifierPassTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/MvcViewDocumentClassifierPassTest.cs
new file mode 100644
index 0000000000..2d437c158d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/MvcViewDocumentClassifierPassTest.cs
@@ -0,0 +1,264 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class MvcViewDocumentClassifierPassTest
+    {
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SetsDocumentKind()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.cshtml"));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal("mvc.1.0.view", irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_NoOpsIfDocumentKindIsAlreadySet()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.cshtml"));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            irDocument.DocumentKind = "some-value";
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal("some-value", irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SetsNamespace()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.cshtml"));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("AspNetCore", visitor.Namespace.Content);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SetsClass()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: "Test.cshtml");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType);
+            Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
+            Assert.Equal("Test", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_NullFilePath_SetsClass()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: null, relativePath: null);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType);
+            Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
+            Assert.Equal("AspNetCore_d9f877a857a7e9928eac04d09a59f25967624155", visitor.Class.ClassName);
+        }
+
+        [Theory]
+        [InlineData("/Views/Home/Index.cshtml", "_Views_Home_Index")]
+        [InlineData("/Areas/MyArea/Views/Home/About.cshtml", "_Areas_MyArea_Views_Home_About")]
+        public void MvcViewDocumentClassifierPass_UsesRelativePathToGenerateTypeName(string relativePath, string expected)
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: relativePath);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal(expected, visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_UsesAbsolutePath_IfRelativePathIsNotSet()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: @"x::\application\Views\Home\Index.cshtml", relativePath: null);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("x___application_Views_Home_Index", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SanitizesClassName()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: @"x:\Test.cshtml", relativePath: "path.with+invalid-chars");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("path_with_invalid_chars", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void MvcViewDocumentClassifierPass_SetsUpExecuteAsyncMethod()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.cshtml"));
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new MvcViewDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("ExecuteAsync", visitor.Method.MethodName);
+            Assert.Equal("global::System.Threading.Tasks.Task", visitor.Method.ReturnType);
+            Assert.Equal(new[] { "public", "async", "override" }, visitor.Method.Modifiers);
+        }
+
+        private static RazorProjectEngine CreateProjectEngine() => RazorProjectEngine.Create();
+
+        private static DocumentIntermediateNode CreateIRDocument(RazorProjectEngine projectEngine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < projectEngine.Phases.Count; i++)
+            {
+                var phase = projectEngine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorIntermediateNodeLoweringPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public NamespaceDeclarationIntermediateNode Namespace { get; private set; }
+
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public MethodDeclarationIntermediateNode Method { get; private set; }
+
+            public override void VisitMethodDeclaration(MethodDeclarationIntermediateNode node)
+            {
+                Method = node;
+            }
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                Namespace = node;
+                base.VisitNamespaceDeclaration(node);
+            }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Class = node;
+                base.VisitClassDeclaration(node);
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/NamespaceDirectiveTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/NamespaceDirectiveTest.cs
new file mode 100644
index 0000000000..8e5d76c678
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/NamespaceDirectiveTest.cs
@@ -0,0 +1,352 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class NamespaceDirectiveTest
+    {
+        [Fact]
+        public void GetNamespace_IncompleteDirective_UsesEmptyNamespace()
+        {
+            // Arrange
+            var source = "c:\\foo\\bar\\bleh.cshtml";
+            var imports = "c:\\foo\\baz\\bleh.cshtml";
+            var node = new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan(imports, 0, 0, 0, 0),
+            };
+
+            // Act
+            var @namespace = NamespaceDirective.GetNamespace(source, node);
+
+            // Assert
+            Assert.Equal(string.Empty, @namespace);
+        }
+
+        [Fact]
+        public void GetNamespace_EmptyDirective_UsesEmptyNamespace()
+        {
+            // Arrange
+            var source = "c:\\foo\\bar\\bleh.cshtml";
+            var imports = "c:\\foo\\baz\\bleh.cshtml";
+            var node = new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan(imports, 0, 0, 0, 0),
+            };
+            node.Children.Add(new DirectiveTokenIntermediateNode() { Content = string.Empty });
+
+            // Act
+            var @namespace = NamespaceDirective.GetNamespace(source, node);
+
+            // Assert
+            Assert.Equal(string.Empty, @namespace);
+        }
+
+        // When we don't have a relationship between the source file and the imports file
+        // we will just use the namespace on the node directly.
+        [Theory]
+        [InlineData((string)null, (string)null)]
+        [InlineData("", "")]
+        [InlineData(null, "/foo/bar")]
+        [InlineData("/foo/baz", "/foo/bar/bleh")]
+        [InlineData("/foo.cshtml", "/foo/bar.cshtml")]
+        [InlineData("c:\\foo.cshtml", "d:\\foo\\bar.cshtml")]
+        [InlineData("c:\\foo\\bar\\bleh.cshtml", "c:\\foo\\baz\\bleh.cshtml")]
+        public void GetNamespace_ForNonRelatedFiles_UsesNamespaceVerbatim(string source, string imports)
+        {
+            // Arrange
+            var node = new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan(imports, 0, 0, 0, 0),
+            };
+
+            node.Children.Add(new DirectiveTokenIntermediateNode() { Content = "Base" });
+
+            // Act
+            var @namespace = NamespaceDirective.GetNamespace(source, node);
+
+            // Assert
+            Assert.Equal("Base", @namespace);
+        }
+
+        [Theory]
+        [InlineData("/foo.cshtml", "/_ViewImports.cshtml", "Base")]
+        [InlineData("/foo/bar.cshtml", "/_ViewImports.cshtml", "Base.foo")]
+        [InlineData("/foo/bar/baz.cshtml", "/_ViewImports.cshtml", "Base.foo.bar")]
+        [InlineData("/foo/bar/baz.cshtml", "/foo/_ViewImports.cshtml", "Base.bar")]
+        [InlineData("/Foo/bar/baz.cshtml", "/foo/_ViewImports.cshtml", "Base.bar")]
+        [InlineData("c:\\foo.cshtml", "c:\\_ViewImports.cshtml", "Base")]
+        [InlineData("c:\\foo\\bar.cshtml", "c:\\_ViewImports.cshtml", "Base.foo")]
+        [InlineData("c:\\foo\\bar\\baz.cshtml", "c:\\_ViewImports.cshtml", "Base.foo.bar")]
+        [InlineData("c:\\foo\\bar\\baz.cshtml", "c:\\foo\\_ViewImports.cshtml", "Base.bar")]
+        [InlineData("c:\\Foo\\bar\\baz.cshtml", "c:\\foo\\_ViewImports.cshtml", "Base.bar")]
+        public void GetNamespace_ForRelatedFiles_ComputesNamespaceWithSuffix(string source, string imports, string expected)
+        {
+            // Arrange
+            var node = new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan(imports, 0, 0, 0, 0),
+            };
+
+            node.Children.Add(new DirectiveTokenIntermediateNode() { Content = "Base" });
+
+            // Act
+            var @namespace = NamespaceDirective.GetNamespace(source, node);
+
+            // Assert
+            Assert.Equal(expected, @namespace);
+        }
+
+        // This is the case where a _ViewImports sets the namespace.
+        [Fact]
+        public void Pass_SetsNamespace_ComputedFromImports()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan("/Account/_ViewImports.cshtml", 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account" });
+            builder.Pop();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
+            builder.Push(@namespace);
+
+            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
+            builder.Add(@class);
+            
+            document.DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind;
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
+
+            var pass = new NamespaceDirective.Pass();
+            pass.Engine = Mock.Of<RazorEngine>();
+
+            // Act
+            pass.Execute(codeDocument, document);
+
+            // Assert
+            Assert.Equal("WebApplication.Account.Manage", @namespace.Content);
+            Assert.Equal("default", @class.ClassName);
+        }
+
+        // This is the case where the source file sets the namespace.
+        [Fact]
+        public void Pass_SetsNamespace_ComputedFromSource()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            // This will be ignored.
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan("/Account/_ViewImports.cshtml", 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "ignored" });
+            builder.Pop();
+
+            // This will be used.
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan("/Account/Manage/AddUser.cshtml", 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account.Manage" });
+            builder.Pop();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
+            builder.Push(@namespace);
+
+            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
+            builder.Add(@class);
+            
+            document.DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind;
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
+
+            var pass = new NamespaceDirective.Pass();
+            pass.Engine = Mock.Of<RazorEngine>();
+
+            // Act
+            pass.Execute(codeDocument, document);
+
+            // Assert
+            Assert.Equal("WebApplication.Account.Manage", @namespace.Content);
+            Assert.Equal("default", @class.ClassName);
+        }
+
+        // Handles cases where invalid characters appears in FileNames. Note that we don't sanitize the part of
+        // the namespace that you put in an import, just the file-based-suffix. Garbage in, garbage out.
+        [Fact]
+        public void Pass_SetsNamespace_SanitizesClassAndNamespace()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan("/Account/_ViewImports.cshtml", 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account" });
+            builder.Pop();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
+            builder.Push(@namespace);
+
+            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
+            builder.Add(@class);
+
+            document.DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind;
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage-Info/Add+User.cshtml"));
+
+            var pass = new NamespaceDirective.Pass();
+            pass.Engine = Mock.Of<RazorEngine>();
+
+            // Act
+            pass.Execute(codeDocument, document);
+
+            // Assert
+            Assert.Equal("WebApplication.Account.Manage_Info", @namespace.Content);
+            Assert.Equal("default", @class.ClassName);
+        }
+
+        // This is the case where the source file sets the namespace.
+        [Fact]
+        public void Pass_SetsNamespace_ComputedFromSource_ForView()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            // This will be ignored.
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan("/Account/_ViewImports.cshtml", 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "ignored" });
+            builder.Pop();
+
+            // This will be used.
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan("/Account/Manage/AddUser.cshtml", 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account.Manage" });
+            builder.Pop();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
+            builder.Push(@namespace);
+
+            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
+            builder.Add(@class);
+            
+            document.DocumentKind = MvcViewDocumentClassifierPass.MvcViewDocumentKind;
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
+
+            var pass = new NamespaceDirective.Pass();
+            pass.Engine = Mock.Of<RazorEngine>();
+
+            // Act
+            pass.Execute(codeDocument, document);
+
+            // Assert
+            Assert.Equal("WebApplication.Account.Manage", @namespace.Content);
+            Assert.Equal("default", @class.ClassName);
+        }
+
+        // This handles an error case where we can't determine the relationship between the
+        // imports and the source.
+        [Fact]
+        public void Pass_SetsNamespace_VerbatimFromImports()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan(null, 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account" });
+            builder.Pop();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
+            builder.Push(@namespace);
+
+            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
+            builder.Add(@class);
+            
+            document.DocumentKind = RazorPageDocumentClassifierPass.RazorPageDocumentKind;
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
+
+            var pass = new NamespaceDirective.Pass();
+            pass.Engine = Mock.Of<RazorEngine>();
+
+            // Act
+            pass.Execute(codeDocument, document);
+
+            // Assert
+            Assert.Equal("WebApplication.Account", @namespace.Content);
+            Assert.Equal("default", @class.ClassName);
+        }
+
+        [Fact]
+        public void Pass_DoesNothing_ForUnknownDocumentKind()
+        {
+            // Arrange
+            var document = new DocumentIntermediateNode();
+            var builder = IntermediateNodeBuilder.Create(document);
+
+            builder.Push(new DirectiveIntermediateNode()
+            {
+                Directive = NamespaceDirective.Directive,
+                Source = new SourceSpan(null, 0, 0, 0, 0),
+            });
+            builder.Add(new DirectiveTokenIntermediateNode() { Content = "WebApplication.Account" });
+            builder.Pop();
+
+            var @namespace = new NamespaceDeclarationIntermediateNode() { Content = "default" };
+            builder.Push(@namespace);
+
+            var @class = new ClassDeclarationIntermediateNode() { ClassName = "default" };
+            builder.Add(@class);
+            
+            document.DocumentKind = null;
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("ignored", "/Account/Manage/AddUser.cshtml"));
+
+            var pass = new NamespaceDirective.Pass();
+            pass.Engine = Mock.Of<RazorEngine>();
+
+            // Act
+            pass.Execute(codeDocument, document);
+
+            // Assert
+            Assert.Equal("default", @namespace.Content);
+            Assert.Equal("default", @class.ClassName);
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/PageDirectiveTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/PageDirectiveTest.cs
new file mode 100644
index 0000000000..1bdb156298
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/PageDirectiveTest.cs
@@ -0,0 +1,148 @@
+// 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;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class PageDirectiveTest
+    {
+        [Fact]
+        public void TryGetPageDirective_ReturnsTrue_IfPageIsMalformed()
+        {
+            // Arrange
+            var content = "@page \"some-route-template\" Invalid";
+            var sourceDocument = RazorSourceDocument.Create(content, "file");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = PageDirective.TryGetPageDirective(irDocument, out var pageDirective);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal("some-route-template", pageDirective.RouteTemplate);
+            Assert.NotNull(pageDirective.DirectiveNode);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_ReturnsTrue_IfPageIsImported()
+        {
+            // Arrange
+            var content = "Hello world";
+            var sourceDocument = RazorSourceDocument.Create(content, "file");
+            var importDocument = RazorSourceDocument.Create("@page", "imports.cshtml");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument, new[] { importDocument });
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = PageDirective.TryGetPageDirective(irDocument, out var pageDirective);
+
+            // Assert
+            Assert.True(result);
+            Assert.Null(pageDirective.RouteTemplate);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_ReturnsFalse_IfPageDoesNotHaveDirective()
+        {
+            // Arrange
+            var content = "Hello world";
+            var sourceDocument = RazorSourceDocument.Create(content, "file");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = PageDirective.TryGetPageDirective(irDocument, out var pageDirective);
+
+            // Assert
+            Assert.False(result);
+            Assert.Null(pageDirective);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_ReturnsTrue_IfPageDoesStartWithDirective()
+        {
+            // Arrange
+            var content = "Hello @page";
+            var sourceDocument = RazorSourceDocument.Create(content, "file");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = PageDirective.TryGetPageDirective(irDocument, out var pageDirective);
+
+            // Assert
+            Assert.True(result);
+            Assert.Null(pageDirective.RouteTemplate);
+            Assert.NotNull(pageDirective.DirectiveNode);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_ReturnsTrue_IfContentHasDirective()
+        {
+            // Arrange
+            var content = "@page";
+            var sourceDocument = RazorSourceDocument.Create(content, "file");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = PageDirective.TryGetPageDirective(irDocument, out var pageDirective);
+
+            // Assert
+            Assert.True(result);
+            Assert.Null(pageDirective.RouteTemplate);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_ParsesRouteTemplate()
+        {
+            // Arrange
+            var content = "@page \"some-route-template\"";
+            var sourceDocument = RazorSourceDocument.Create(content, "file");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument);
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+
+            // Act
+            var result = PageDirective.TryGetPageDirective(irDocument, out var pageDirective);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal("some-route-template", pageDirective.RouteTemplate);
+        }
+
+        private RazorEngine CreateEngine()
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                PageDirective.Register(b);
+            }).Engine;
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDocumentClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/Properties/AssemblyInfo.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..3337ebeac2
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// 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.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/RazorPageDocumentClassifierPassTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/RazorPageDocumentClassifierPassTest.cs
new file mode 100644
index 0000000000..74acfa0c13
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/RazorPageDocumentClassifierPassTest.cs
@@ -0,0 +1,417 @@
+// 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;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class RazorPageDocumentClassifierPassTest
+    {
+        [Fact]
+        public void RazorPageDocumentClassifierPass_LogsErrorForImportedPageDirectives()
+        {
+            // Arrange
+            var sourceSpan = new SourceSpan("import.cshtml", 0, 0, 0, 5);
+            var expectedDiagnostic = RazorExtensionsDiagnosticFactory.CreatePageDirective_CannotBeImported(sourceSpan);
+            var importDocument = RazorSourceDocument.Create("@page", "import.cshtml");
+            var sourceDocument = RazorSourceDocument.Create("<p>Hello World</p>", "main.cshtml");
+            var codeDocument = RazorCodeDocument.Create(sourceDocument, new[] { importDocument });
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var pageDirectives = irDocument.FindDirectiveReferences(PageDirective.Directive);
+            var directive = Assert.Single(pageDirectives);
+            var diagnostic = Assert.Single(directive.Node.Diagnostics);
+            Assert.Equal(expectedDiagnostic, diagnostic);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_LogsErrorIfDirectiveNotAtTopOfFile()
+        {
+            // Arrange
+            var sourceSpan = new SourceSpan(
+                "Test.cshtml",
+                absoluteIndex: 14 + Environment.NewLine.Length * 2,
+                lineIndex: 2,
+                characterIndex: 0,
+                length: 5 + Environment.NewLine.Length);
+
+            var expectedDiagnostic = RazorExtensionsDiagnosticFactory.CreatePageDirective_MustExistAtTheTopOfFile(sourceSpan);
+            var content = @"
+@somethingelse
+@page
+";
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(content, "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            var pageDirectives = irDocument.FindDirectiveReferences(PageDirective.Directive);
+            var directive = Assert.Single(pageDirectives);
+            var diagnostic = Assert.Single(directive.Node.Diagnostics);
+            Assert.Equal(expectedDiagnostic, diagnostic);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_DoesNotLogErrorIfCommentAndWhitespaceBeforeDirective()
+        {
+            // Arrange
+            var content = @"
+@* some comment *@
+     
+@page
+";
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(content, "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            var pageDirectives = irDocument.FindDirectiveReferences(PageDirective.Directive);
+            var directive = Assert.Single(pageDirectives);
+            Assert.Empty(directive.Node.Diagnostics);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_SetsDocumentKind()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal("mvc.1.0.razor-page", irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_NoOpsIfDocumentKindIsAlreadySet()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            irDocument.DocumentKind = "some-value";
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal("some-value", irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_NoOpsIfPageDirectiveIsMalformed()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page+1", "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            irDocument.DocumentKind = "some-value";
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal("some-value", irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_SetsNamespace()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("AspNetCore", visitor.Namespace.Content);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_SetsClass()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: "Test.cshtml");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("global::Microsoft.AspNetCore.Mvc.RazorPages.Page", visitor.Class.BaseType);
+            Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
+            Assert.Equal("Test", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_NullFilePath_SetsClass()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: null, relativePath: null);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("global::Microsoft.AspNetCore.Mvc.RazorPages.Page", visitor.Class.BaseType);
+            Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
+            Assert.Equal("AspNetCore_74fbaab062bb228ed1ab09c5ff8d6ed2417320e2", visitor.Class.ClassName);
+        }
+
+        [Theory]
+        [InlineData("/Views/Home/Index.cshtml", "_Views_Home_Index")]
+        [InlineData("/Areas/MyArea/Views/Home/About.cshtml", "_Areas_MyArea_Views_Home_About")]
+        public void RazorPageDocumentClassifierPass_UsesRelativePathToGenerateTypeName(string relativePath, string expected)
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: relativePath);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal(expected, visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_UsesAbsolutePath_IfRelativePathIsNotSet()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: @"x::\application\Views\Home\Index.cshtml", relativePath: null);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("x___application_Views_Home_Index", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_SanitizesClassName()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: @"x:\Test.cshtml", relativePath: "path.with+invalid-chars");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", properties));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("path_with_invalid_chars", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_SetsUpExecuteAsyncMethod()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page", "Test.cshtml"));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("ExecuteAsync", visitor.Method.MethodName);
+            Assert.Equal("global::System.Threading.Tasks.Task", visitor.Method.ReturnType);
+            Assert.Equal(new[] { "public", "async", "override" }, visitor.Method.Modifiers);
+        }
+
+        [Fact]
+        public void RazorPageDocumentClassifierPass_AddsRouteTemplateMetadata()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "ignored", relativePath: "Test.cshtml");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("@page \"some-route\"", properties));
+
+            var engine = CreateEngine();
+            var irDocument = CreateIRDocument(engine, codeDocument);
+            var pass = new RazorPageDocumentClassifierPass
+            {
+                Engine = engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            var attributeNode = Assert.IsType<RazorCompiledItemMetadataAttributeIntermediateNode>(visitor.ExtensionNode);
+            Assert.Equal("RouteTemplate", attributeNode.Key);
+            Assert.Equal("some-route", attributeNode.Value);
+        }
+
+        private static RazorEngine CreateEngine()
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                PageDirective.Register(b);
+            }).Engine;
+        }
+
+        private static DocumentIntermediateNode CreateIRDocument(RazorEngine engine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < engine.Phases.Count; i++)
+            {
+                var phase = engine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorIntermediateNodeLoweringPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public NamespaceDeclarationIntermediateNode Namespace { get; private set; }
+
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public MethodDeclarationIntermediateNode Method { get; private set; }
+
+            public ExtensionIntermediateNode ExtensionNode { get; private set; }
+
+            public override void VisitMethodDeclaration(MethodDeclarationIntermediateNode node)
+            {
+                Method = node;
+            }
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                Namespace = node;
+                base.VisitNamespaceDeclaration(node);
+            }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Class = node;
+                base.VisitClassDeclaration(node);
+            }
+
+            public override void VisitExtension(ExtensionIntermediateNode node)
+            {
+                ExtensionNode = node;
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/SourceMappingsSerializer.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/SourceMappingsSerializer.cs
new file mode 100644
index 0000000000..8c63fd7444
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/SourceMappingsSerializer.cs
@@ -0,0 +1,54 @@
+// 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;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public static class SourceMappingsSerializer
+    {
+        public static string Serialize(RazorCSharpDocument csharpDocument, RazorSourceDocument sourceDocument)
+        {
+            var builder = new StringBuilder();
+            var sourceFilePath = sourceDocument.FilePath;
+            var charBuffer = new char[sourceDocument.Length];
+            sourceDocument.CopyTo(0, charBuffer, 0, sourceDocument.Length);
+            var sourceContent = new string(charBuffer);
+
+            for (var i = 0; i < csharpDocument.SourceMappings.Count; i++)
+            {
+                var sourceMapping = csharpDocument.SourceMappings[i];
+                if (!string.Equals(sourceMapping.OriginalSpan.FilePath, sourceFilePath, StringComparison.Ordinal))
+                {
+                    continue;
+                }
+
+                builder.Append("Source Location: ");
+                AppendMappingLocation(builder, sourceMapping.OriginalSpan, sourceContent);
+
+                builder.Append("Generated Location: ");
+                AppendMappingLocation(builder, sourceMapping.GeneratedSpan, csharpDocument.GeneratedCode);
+
+                builder.AppendLine();
+            }
+
+            return builder.ToString();
+        }
+
+        private static void AppendMappingLocation(StringBuilder builder, SourceSpan location, string content)
+        {
+            builder
+                .AppendLine(location.ToString())
+                .Append("|");
+
+            for (var i = 0; i < location.Length; i++)
+            {
+                builder.Append(content[location.AbsoluteIndex + i]);
+            }
+
+            builder.AppendLine("|");
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TagHelperDescriptorExtensionsTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TagHelperDescriptorExtensionsTest.cs
new file mode 100644
index 0000000000..af0b983b55
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TagHelperDescriptorExtensionsTest.cs
@@ -0,0 +1,82 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class TagHelperDescriptorExtensionsTest
+    {
+        [Fact]
+        public void IsViewComponentKind_ReturnsFalse_ForNonVCTHDescriptor()
+        {
+            // Arrange
+            var tagHelper = CreateTagHelperDescriptor();
+
+            // Act
+            var result = tagHelper.IsViewComponentKind();
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsViewComponentKind_ReturnsTrue_ForVCTHDescriptor()
+        {
+            // Arrange
+            var tagHelper = CreateViewComponentTagHelperDescriptor();
+
+            // Act
+            var result = tagHelper.IsViewComponentKind();
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void GetViewComponentName_ReturnsNull_ForNonVCTHDescriptor()
+        {
+            //Arrange
+            var tagHelper = CreateTagHelperDescriptor();
+
+            // Act
+            var result = tagHelper.GetViewComponentName();
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void GetViewComponentName_ReturnsName_ForVCTHDescriptor()
+        {
+            // Arrange
+            var tagHelper = CreateViewComponentTagHelperDescriptor("ViewComponentName");
+
+            // Act
+            var result = tagHelper.GetViewComponentName();
+
+            // Assert
+            Assert.Equal("ViewComponentName", result);
+        }
+
+        private static TagHelperDescriptor CreateTagHelperDescriptor()
+        {
+            var tagHelper = TagHelperDescriptorBuilder.Create("TypeName", "AssemblyName")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tag-name"))
+                .Build();
+
+            return tagHelper;
+        }
+
+        private static TagHelperDescriptor CreateViewComponentTagHelperDescriptor(string name = "ViewComponentName")
+        {
+            var tagHelper = TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, "TypeName", "AssemblyName")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tag-name"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, name)
+                .Build();
+
+            return tagHelper;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml
new file mode 100644
index 0000000000..a20b20dae8
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml
@@ -0,0 +1,8 @@
+<div class="@this.ToString()">
+    Hello world
+    @string.Format("{0}", "Hello")
+</div>
+@{ 
+    var cls = "foo";
+}
+<p class="@if(cls != null) { @cls }" />
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs
new file mode 100644
index 0000000000..d39b64c26d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs
@@ -0,0 +1,71 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+       __o = this.ToString();
+
+#line default
+#line hidden
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+__o = string.Format("{0}", "Hello");
+
+#line default
+#line hidden
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+   
+    var cls = "foo";
+
+#line default
+#line hidden
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+           if(cls != null) { 
+
+#line default
+#line hidden
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+                        __o = cls;
+
+#line default
+#line hidden
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+                                  }
+
+#line default
+#line hidden
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
new file mode 100644
index 0000000000..4074239b9f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt
@@ -0,0 +1,64 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [4] Basic.cshtml)
+                    IntermediateToken - (0:0,0 [4] Basic.cshtml) - Html - <div
+                HtmlAttribute - (4:0,4 [25] Basic.cshtml) -  class=" - "
+                    CSharpExpressionAttributeValue - (12:0,12 [16] Basic.cshtml) - 
+                        IntermediateToken - (13:0,13 [15] Basic.cshtml) - CSharp - this.ToString()
+                HtmlContent - (29:0,29 [24] Basic.cshtml)
+                    IntermediateToken - (29:0,29 [1] Basic.cshtml) - Html - >
+                    IntermediateToken - (30:0,30 [23] Basic.cshtml) - Html - \n    Hello world\n    
+                CSharpExpression - (54:2,5 [29] Basic.cshtml)
+                    IntermediateToken - (54:2,5 [29] Basic.cshtml) - CSharp - string.Format("{0}", "Hello")
+                HtmlContent - (83:2,34 [10] Basic.cshtml)
+                    IntermediateToken - (83:2,34 [2] Basic.cshtml) - Html - \n
+                    IntermediateToken - (85:3,0 [6] Basic.cshtml) - Html - </div>
+                    IntermediateToken - (91:3,6 [2] Basic.cshtml) - Html - \n
+                CSharpCode - (95:4,2 [25] Basic.cshtml)
+                    IntermediateToken - (95:4,2 [25] Basic.cshtml) - CSharp -  \n    var cls = "foo";\n
+                HtmlContent - (123:7,0 [2] Basic.cshtml)
+                    IntermediateToken - (123:7,0 [2] Basic.cshtml) - Html - <p
+                HtmlAttribute - (125:7,2 [34] Basic.cshtml) -  class=" - "
+                    CSharpCodeAttributeValue - (133:7,10 [25] Basic.cshtml) - 
+                        IntermediateToken - (134:7,11 [18] Basic.cshtml) - CSharp - if(cls != null) { 
+                        CSharpExpression - (153:7,30 [3] Basic.cshtml)
+                            IntermediateToken - (153:7,30 [3] Basic.cshtml) - CSharp - cls
+                        IntermediateToken - (156:7,33 [2] Basic.cshtml) - CSharp -  }
+                HtmlContent - (159:7,36 [5] Basic.cshtml)
+                    IntermediateToken - (159:7,36 [3] Basic.cshtml) - Html -  />
+                    IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt
new file mode 100644
index 0000000000..372b49cb6f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt
@@ -0,0 +1,34 @@
+Source Location: (13:0,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+|this.ToString()|
+Generated Location: (1030:26,13 [15] )
+|this.ToString()|
+
+Source Location: (54:2,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+|string.Format("{0}", "Hello")|
+Generated Location: (1166:31,6 [29] )
+|string.Format("{0}", "Hello")|
+
+Source Location: (95:4,2 [25] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+| 
+    var cls = "foo";
+|
+Generated Location: (1312:36,2 [25] )
+| 
+    var cls = "foo";
+|
+
+Source Location: (134:7,11 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+|if(cls != null) { |
+Generated Location: (1460:42,11 [18] )
+|if(cls != null) { |
+
+Source Location: (153:7,30 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+|cls|
+Generated Location: (1622:47,30 [3] )
+|cls|
+
+Source Location: (156:7,33 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
+| }|
+Generated Location: (1773:52,33 [2] )
+| }|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
new file mode 100644
index 0000000000..8e6b1a7bd7
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
@@ -0,0 +1,95 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6d079dd6c39f39d17a2faff14404b37ab7e8b8fc"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"6d079dd6c39f39d17a2faff14404b37ab7e8b8fc", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(0, 4, true);
+            WriteLiteral("<div");
+            EndContext();
+            BeginWriteAttribute("class", " class=\"", 4, "\"", 28, 1);
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+WriteAttributeValue("", 12, this.ToString(), 12, 16, false);
+
+#line default
+#line hidden
+            EndWriteAttribute();
+            BeginContext(29, 24, true);
+            WriteLiteral(">\r\n    Hello world\r\n    ");
+            EndContext();
+            BeginContext(54, 29, false);
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+Write(string.Format("{0}", "Hello"));
+
+#line default
+#line hidden
+            EndContext();
+            BeginContext(83, 10, true);
+            WriteLiteral("\r\n</div>\r\n");
+            EndContext();
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+   
+    var cls = "foo";
+
+#line default
+#line hidden
+            BeginContext(123, 2, true);
+            WriteLiteral("<p");
+            EndContext();
+            BeginWriteAttribute("class", " class=\"", 125, "\"", 158, 1);
+            WriteAttributeValue("", 133, new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_attribute_value_writer) => {
+                PushWriter(__razor_attribute_value_writer);
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+           if(cls != null) { 
+
+#line default
+#line hidden
+                BeginContext(153, 3, false);
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+                        Write(cls);
+
+#line default
+#line hidden
+                EndContext();
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
+                                  }
+
+#line default
+#line hidden
+                PopWriter();
+            }
+            ), 133, 25, false);
+            EndWriteAttribute();
+            BeginContext(159, 5, true);
+            WriteLiteral(" />\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
new file mode 100644
index 0000000000..9173f6251b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
@@ -0,0 +1,76 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(0, 4, true);
+                HtmlContent - (0:0,0 [4] Basic.cshtml)
+                    IntermediateToken - (0:0,0 [4] Basic.cshtml) - Html - <div
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                HtmlAttribute - (4:0,4 [25] Basic.cshtml) -  class=" - "
+                    CSharpExpressionAttributeValue - (12:0,12 [16] Basic.cshtml) - 
+                        IntermediateToken - (13:0,13 [15] Basic.cshtml) - CSharp - this.ToString()
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(29, 24, true);
+                HtmlContent - (29:0,29 [24] Basic.cshtml)
+                    IntermediateToken - (29:0,29 [1] Basic.cshtml) - Html - >
+                    IntermediateToken - (30:0,30 [19] Basic.cshtml) - Html - \n    Hello world\n
+                    IntermediateToken - (49:2,0 [4] Basic.cshtml) - Html -     
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(54, 29, false);
+                CSharpExpression - (54:2,5 [29] Basic.cshtml)
+                    IntermediateToken - (54:2,5 [29] Basic.cshtml) - CSharp - string.Format("{0}", "Hello")
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(83, 10, true);
+                HtmlContent - (83:2,34 [10] Basic.cshtml)
+                    IntermediateToken - (83:2,34 [2] Basic.cshtml) - Html - \n
+                    IntermediateToken - (85:3,0 [6] Basic.cshtml) - Html - </div>
+                    IntermediateToken - (91:3,6 [2] Basic.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - (95:4,2 [25] Basic.cshtml)
+                    IntermediateToken - (95:4,2 [25] Basic.cshtml) - CSharp -  \n    var cls = "foo";\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(123, 2, true);
+                HtmlContent - (123:7,0 [2] Basic.cshtml)
+                    IntermediateToken - (123:7,0 [2] Basic.cshtml) - Html - <p
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                HtmlAttribute - (125:7,2 [34] Basic.cshtml) -  class=" - "
+                    CSharpCodeAttributeValue - (133:7,10 [25] Basic.cshtml) - 
+                        IntermediateToken - (134:7,11 [18] Basic.cshtml) - CSharp - if(cls != null) { 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(153, 3, false);
+                        CSharpExpression - (153:7,30 [3] Basic.cshtml)
+                            IntermediateToken - (153:7,30 [3] Basic.cshtml) - CSharp - cls
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        IntermediateToken - (156:7,33 [2] Basic.cshtml) - CSharp -  }
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(159, 5, true);
+                HtmlContent - (159:7,36 [5] Basic.cshtml)
+                    IntermediateToken - (159:7,36 [3] Basic.cshtml) - Html -  />
+                    IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml
new file mode 100644
index 0000000000..224242197b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml
@@ -0,0 +1,15 @@
+@* These test files validate that end-to-end, incomplete directives don't throw. *@
+
+@page
+@page 
+@page "
+
+@model
+@model 
+
+@inject
+@inject 
+@inject MyService<TModel>
+
+@namespace
+@namespace 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
new file mode 100644
index 0000000000..dd100bee00
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -0,0 +1,71 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
+MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        ((System.Action)(() => {
+ }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..1cfef392ae
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.diagnostics.txt
@@ -0,0 +1,12 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(4,1): Error RZ2001: The 'page' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(5,1): Error RZ2001: The 'page' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(5,7): Error RZ1016: The 'page' directive expects a string surrounded by double quotes.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(7,7): Error RZ1013: The 'model' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(8,1): Error RZ2001: The 'model' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(8,8): Error RZ1013: The 'model' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(10,8): Error RZ1013: The 'inject' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(11,9): Error RZ1013: The 'inject' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(12,26): Error RZ1015: The 'inject' directive expects an identifier.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(14,11): Error RZ1014: The 'namespace' directive expects a namespace name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(15,1): Error RZ2001: The 'namespace' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(15,12): Error RZ1014: The 'namespace' directive expects a namespace name.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
new file mode 100644
index 0000000000..2aeddc2fa2
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt
@@ -0,0 +1,84 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (119:6,6 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (128:7,7 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (139:9,7 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (149:10,8 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
+                DirectiveToken - (176:11,25 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (190:13,10 [0] IncompleteDirectives.cshtml) - 
+                DirectiveToken - (203:14,11 [0] IncompleteDirectives.cshtml) - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml) - page
+                MalformedDirective - (102:4,0 [6] IncompleteDirectives.cshtml) - page
+                HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)
+                    IntermediateToken - (108:4,6 [5] IncompleteDirectives.cshtml) - Html - "\n\n
+                MalformedDirective - (113:6,0 [6] IncompleteDirectives.cshtml) - model
+                    DirectiveToken - (119:6,6 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (119:6,6 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (119:6,6 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (121:7,0 [7] IncompleteDirectives.cshtml) - model
+                    DirectiveToken - (128:7,7 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (128:7,7 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (128:7,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (132:9,0 [7] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (139:9,7 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (139:9,7 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (139:9,7 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (141:10,0 [8] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (149:10,8 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (149:10,8 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (149:10,8 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (151:11,0 [25] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
+                    DirectiveToken - (176:11,25 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (176:11,25 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (176:11,25 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                MalformedDirective - (180:13,0 [10] IncompleteDirectives.cshtml) - namespace
+                    DirectiveToken - (190:13,10 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (190:13,10 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (190:13,10 [2] IncompleteDirectives.cshtml) - Html - \n
+                MalformedDirective - (192:14,0 [11] IncompleteDirectives.cshtml) - namespace
+                    DirectiveToken - (203:14,11 [0] IncompleteDirectives.cshtml) - 
+                HtmlContent - (203:14,11 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (203:14,11 [2] IncompleteDirectives.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives Model => ViewData.Model;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
new file mode 100644
index 0000000000..4bb61bf781
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -0,0 +1,40 @@
+Source Location: (119:6,6 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (671:18,0 [0] )
+||
+
+Source Location: (128:7,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (724:21,0 [0] )
+||
+
+Source Location: (139:9,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (777:24,0 [0] )
+||
+
+Source Location: (149:10,8 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (830:27,0 [0] )
+||
+
+Source Location: (159:11,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+|MyService<TModel>|
+Generated Location: (980:31,0 [17] )
+|MyService<TModel>|
+
+Source Location: (176:11,25 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (1133:38,0 [0] )
+||
+
+Source Location: (190:13,10 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (1186:41,0 [0] )
+||
+
+Source Location: (203:14,11 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
+||
+Generated Location: (1239:44,0 [0] )
+||
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
new file mode 100644
index 0000000000..743eed291e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
@@ -0,0 +1,65 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5add9dba0a182cd75498c5b24f64a2547e7f49b0"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives), null)]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"5add9dba0a182cd75498c5b24f64a2547e7f49b0", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(83, 4, true);
+            WriteLiteral("\r\n\r\n");
+            EndContext();
+            BeginContext(108, 5, true);
+            WriteLiteral("\"\r\n\r\n");
+            EndContext();
+            BeginContext(119, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(128, 4, true);
+            WriteLiteral("\r\n\r\n");
+            EndContext();
+            BeginContext(139, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(149, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(176, 4, true);
+            WriteLiteral("\r\n\r\n");
+            EndContext();
+            BeginContext(190, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(203, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..1cfef392ae
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.diagnostics.txt
@@ -0,0 +1,12 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(4,1): Error RZ2001: The 'page' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(5,1): Error RZ2001: The 'page' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(5,7): Error RZ1016: The 'page' directive expects a string surrounded by double quotes.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(7,7): Error RZ1013: The 'model' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(8,1): Error RZ2001: The 'model' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(8,8): Error RZ1013: The 'model' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(10,8): Error RZ1013: The 'inject' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(11,9): Error RZ1013: The 'inject' directive expects a type name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(12,26): Error RZ1015: The 'inject' directive expects an identifier.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(14,11): Error RZ1014: The 'namespace' directive expects a namespace name.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(15,1): Error RZ2001: The 'namespace' directive may only occur once per document.
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml(15,12): Error RZ1014: The 'namespace' directive expects a namespace name.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
new file mode 100644
index 0000000000..bd3bdd87e2
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
@@ -0,0 +1,95 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives), null)]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(83, 4, true);
+                HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml) - page
+                MalformedDirective - (102:4,0 [6] IncompleteDirectives.cshtml) - page
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(108, 5, true);
+                HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)
+                    IntermediateToken - (108:4,6 [5] IncompleteDirectives.cshtml) - Html - "\n\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (113:6,0 [6] IncompleteDirectives.cshtml) - model
+                    DirectiveToken - (119:6,6 [0] IncompleteDirectives.cshtml) - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(119, 2, true);
+                HtmlContent - (119:6,6 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (119:6,6 [2] IncompleteDirectives.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (121:7,0 [7] IncompleteDirectives.cshtml) - model
+                    DirectiveToken - (128:7,7 [0] IncompleteDirectives.cshtml) - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(128, 4, true);
+                HtmlContent - (128:7,7 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (128:7,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (132:9,0 [7] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (139:9,7 [0] IncompleteDirectives.cshtml) - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(139, 2, true);
+                HtmlContent - (139:9,7 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (139:9,7 [2] IncompleteDirectives.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (141:10,0 [8] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (149:10,8 [0] IncompleteDirectives.cshtml) - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(149, 2, true);
+                HtmlContent - (149:10,8 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (149:10,8 [2] IncompleteDirectives.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (151:11,0 [25] IncompleteDirectives.cshtml) - inject
+                    DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
+                    DirectiveToken - (176:11,25 [0] IncompleteDirectives.cshtml) - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(176, 4, true);
+                HtmlContent - (176:11,25 [4] IncompleteDirectives.cshtml)
+                    IntermediateToken - (176:11,25 [4] IncompleteDirectives.cshtml) - Html - \n\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (180:13,0 [10] IncompleteDirectives.cshtml) - namespace
+                    DirectiveToken - (190:13,10 [0] IncompleteDirectives.cshtml) - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(190, 2, true);
+                HtmlContent - (190:13,10 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (190:13,10 [2] IncompleteDirectives.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                MalformedDirective - (192:14,0 [11] IncompleteDirectives.cshtml) - namespace
+                    DirectiveToken - (203:14,11 [0] IncompleteDirectives.cshtml) - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(203, 2, true);
+                HtmlContent - (203:14,11 [2] IncompleteDirectives.cshtml)
+                    IntermediateToken - (203:14,11 [2] IncompleteDirectives.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives Model => ViewData.Model;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml
new file mode 100644
index 0000000000..38efd570da
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml
@@ -0,0 +1,2 @@
+@inherits MyBasePageForViews<TModel>
+@model MyModel
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
new file mode 100644
index 0000000000..7cdbaf3326
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel : MyBasePageForViews<MyModel>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
+MyBasePageForViews<TModel> __typeHelper = default(MyBasePageForViews<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
+MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<MyModel> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt
new file mode 100644
index 0000000000..3310acfa76
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt
@@ -0,0 +1,39 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel - MyBasePageForViews<MyModel> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (10:0,10 [26] InheritsViewModel.cshtml) - MyBasePageForViews<TModel>
+                DirectiveToken - (45:1,7 [7] InheritsViewModel.cshtml) - MyModel
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
new file mode 100644
index 0000000000..6a313a909d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (10:0,10 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
+|MyBasePageForViews<TModel>|
+Generated Location: (740:19,0 [26] )
+|MyBasePageForViews<TModel>|
+
+Source Location: (45:1,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
+|MyModel|
+Generated Location: (1004:27,0 [7] )
+|MyModel|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs
new file mode 100644
index 0000000000..9680177b77
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs
@@ -0,0 +1,36 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3ff83e2f0d946feb387a8ea03a529c64350014f8"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"3ff83e2f0d946feb387a8ea03a529c64350014f8", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel : MyBasePageForViews<MyModel>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<MyModel> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt
new file mode 100644
index 0000000000..2468ef4662
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel - MyBasePageForViews<MyModel> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml
new file mode 100644
index 0000000000..295e4cf3ab
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml
@@ -0,0 +1,2 @@
+@page
+@model MyModel
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
new file mode 100644
index 0000000000..f174a0fc2f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
@@ -0,0 +1,50 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports : MyPageModel<MyModel>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml"
+MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<MyModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel>)PageContext?.ViewData;
+        public MyModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt
new file mode 100644
index 0000000000..bcbf42ae26
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt
@@ -0,0 +1,43 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports - MyPageModel<MyModel> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (10:0,10 [19] TestFiles\IntegrationTests\CodeGenerationIntegrationTest\_ViewImports.cshtml) - MyPageModel<TModel>
+                DirectiveToken - (14:1,7 [7] InheritsWithViewImports.cshtml) - MyModel
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public MyModel Model => ViewData.Model;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e7daecd874
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (14:1,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml)
+|MyModel|
+Generated Location: (745:19,0 [7] )
+|MyModel|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs
new file mode 100644
index 0000000000..c1ea0b5c3e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs
@@ -0,0 +1,39 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "d196fc1c66d46d35e35af9b01c737e12bcce6782"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports), null)]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"d196fc1c66d46d35e35af9b01c737e12bcce6782", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"f311ecbb5c4d63980a59c24af5ffe8baa1c3f99a", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports : MyPageModel<MyModel>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<MyModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel>)PageContext?.ViewData;
+        public MyModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt
new file mode 100644
index 0000000000..2704223a57
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt
@@ -0,0 +1,25 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports), null)]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports - MyPageModel<MyModel> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<MyModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public MyModel Model => ViewData.Model;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml
new file mode 100644
index 0000000000..0aa749dd3f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml
@@ -0,0 +1 @@
+@inject MyApp MyPropertyName
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml
new file mode 100644
index 0000000000..d699f1e754
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml
@@ -0,0 +1,3 @@
+@model MyModel
+@inject MyApp MyPropertyName
+@inject MyService<TModel> Html
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
new file mode 100644
index 0000000000..2120622373
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
@@ -0,0 +1,82 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+global::System.Object MyPropertyName = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
+global::System.Object Html = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt
new file mode 100644
index 0000000000..c1d70d5d89
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt
@@ -0,0 +1,43 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [7] InjectWithModel.cshtml) - MyModel
+                DirectiveToken - (24:1,8 [5] InjectWithModel.cshtml) - MyApp
+                DirectiveToken - (30:1,14 [14] InjectWithModel.cshtml) - MyPropertyName
+                DirectiveToken - (54:2,8 [17] InjectWithModel.cshtml) - MyService<TModel>
+                DirectiveToken - (72:2,26 [4] InjectWithModel.cshtml) - Html
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
new file mode 100644
index 0000000000..c4838ff64d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
@@ -0,0 +1,25 @@
+Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|MyModel|
+Generated Location: (766:19,0 [7] )
+|MyModel|
+
+Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|MyApp|
+Generated Location: (990:27,0 [5] )
+|MyApp|
+
+Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|MyPropertyName|
+Generated Location: (1232:35,22 [14] )
+|MyPropertyName|
+
+Source Location: (54:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|MyService<TModel>|
+Generated Location: (1438:43,0 [17] )
+|MyService<TModel>|
+
+Source Location: (72:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
+|Html|
+Generated Location: (1704:51,22 [4] )
+|Html|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs
new file mode 100644
index 0000000000..36974edf08
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.codegen.cs
@@ -0,0 +1,38 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2cafb599699b78d76f0355b6f528050b4720789d"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"2cafb599699b78d76f0355b6f528050b4720789d", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt
new file mode 100644
index 0000000000..d018107ae2
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml
new file mode 100644
index 0000000000..8cd61913e4
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml
@@ -0,0 +1,5 @@
+@model MyModel
+@inject MyApp MyPropertyName;   
+@inject MyService<TModel> Html;  
+@inject MyApp MyPropertyName2  ;  
+@inject MyService<TModel> Html2  ;  
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
new file mode 100644
index 0000000000..ea95a4e7eb
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
@@ -0,0 +1,118 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyModel __typeHelper = default(MyModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+global::System.Object MyPropertyName = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+global::System.Object Html = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+global::System.Object MyPropertyName2 = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+MyService<TModel> __typeHelper = default(MyService<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
+global::System.Object Html2 = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html2 { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName2 { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt
new file mode 100644
index 0000000000..5c4540f366
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt
@@ -0,0 +1,49 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [7] InjectWithSemicolon.cshtml) - MyModel
+                DirectiveToken - (24:1,8 [5] InjectWithSemicolon.cshtml) - MyApp
+                DirectiveToken - (30:1,14 [14] InjectWithSemicolon.cshtml) - MyPropertyName
+                DirectiveToken - (58:2,8 [17] InjectWithSemicolon.cshtml) - MyService<TModel>
+                DirectiveToken - (76:2,26 [4] InjectWithSemicolon.cshtml) - Html
+                DirectiveToken - (93:3,8 [5] InjectWithSemicolon.cshtml) - MyApp
+                DirectiveToken - (99:3,14 [15] InjectWithSemicolon.cshtml) - MyPropertyName2
+                DirectiveToken - (129:4,8 [17] InjectWithSemicolon.cshtml) - MyService<TModel>
+                DirectiveToken - (147:4,26 [5] InjectWithSemicolon.cshtml) - Html2
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
new file mode 100644
index 0000000000..6a90f75f3e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
@@ -0,0 +1,45 @@
+Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyModel|
+Generated Location: (774:19,0 [7] )
+|MyModel|
+
+Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyApp|
+Generated Location: (1002:27,0 [5] )
+|MyApp|
+
+Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyPropertyName|
+Generated Location: (1248:35,22 [14] )
+|MyPropertyName|
+
+Source Location: (58:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyService<TModel>|
+Generated Location: (1458:43,0 [17] )
+|MyService<TModel>|
+
+Source Location: (76:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|Html|
+Generated Location: (1728:51,22 [4] )
+|Html|
+
+Source Location: (93:3,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyApp|
+Generated Location: (1928:59,0 [5] )
+|MyApp|
+
+Source Location: (99:3,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyPropertyName2|
+Generated Location: (2174:67,22 [15] )
+|MyPropertyName2|
+
+Source Location: (129:4,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|MyService<TModel>|
+Generated Location: (2385:75,0 [17] )
+|MyService<TModel>|
+
+Source Location: (147:4,26 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
+|Html2|
+Generated Location: (2655:83,22 [5] )
+|Html2|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs
new file mode 100644
index 0000000000..b8eb5c371d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.codegen.cs
@@ -0,0 +1,42 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8a53bde02f202036e674a23018e04268a3a844bb"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"8a53bde02f202036e674a23018e04268a3a844bb", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html2 { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName2 { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyService<MyModel> Html { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt
new file mode 100644
index 0000000000..898557c170
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
new file mode 100644
index 0000000000..7b2f4fedc6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
+MyApp __typeHelper = default(MyApp);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
+global::System.Object MyPropertyName = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt
new file mode 100644
index 0000000000..0b8beeae9b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt
@@ -0,0 +1,40 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (8:0,8 [5] Inject.cshtml) - MyApp
+                DirectiveToken - (14:0,14 [14] Inject.cshtml) - MyPropertyName
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
new file mode 100644
index 0000000000..10ed356ecf
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (8:0,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
+|MyApp|
+Generated Location: (748:19,0 [5] )
+|MyApp|
+
+Source Location: (14:0,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
+|MyPropertyName|
+Generated Location: (981:27,22 [14] )
+|MyPropertyName|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs
new file mode 100644
index 0000000000..e3493199a4
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.codegen.cs
@@ -0,0 +1,38 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "592a6d8544c71b828d4a3fbf92d398cd3ea72790"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"592a6d8544c71b828d4a3fbf92d398cd3ea72790", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public MyApp MyPropertyName { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt
new file mode 100644
index 0000000000..e05f9d2df9
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml
new file mode 100644
index 0000000000..6dfb72bc31
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml
@@ -0,0 +1 @@
+@namespace Test.
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs
new file mode 100644
index 0000000000..d99c176c52
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.cs
@@ -0,0 +1,40 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..90446dc58b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml(1,12): Error RZ1014: The 'namespace' directive expects a namespace name.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt
new file mode 100644
index 0000000000..6f9220aab4
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt
@@ -0,0 +1,40 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                MalformedDirective - (0:0,0 [11] InvalidNamespaceAtEOF.cshtml) - namespace
+                HtmlContent - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml)
+                    IntermediateToken - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml) - Html - Test.
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
new file mode 100644
index 0000000000..2accba6951
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
@@ -0,0 +1,39 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "010d175bb6c3f7fa6f2ae04c1fecb4e3bfbf928b"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"010d175bb6c3f7fa6f2ae04c1fecb4e3bfbf928b", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(11, 5, true);
+            WriteLiteral("Test.");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..90446dc58b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml(1,12): Error RZ1014: The 'namespace' directive expects a namespace name.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
new file mode 100644
index 0000000000..e99ab2d9c2
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
@@ -0,0 +1,27 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                MalformedDirective - (0:0,0 [11] InvalidNamespaceAtEOF.cshtml) - namespace
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(11, 5, true);
+                HtmlContent - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml)
+                    IntermediateToken - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml) - Html - Test.
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml
new file mode 100644
index 0000000000..9b4f9d5559
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml
@@ -0,0 +1,4 @@
+@page "foo
+
+<h1>About Us</h1>
+<p>We are awesome.</p>
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.cs
new file mode 100644
index 0000000000..15befce0d0
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.diagnostics.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..637d1e902b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml(1,7): Error RZ1016: The 'page' directive expects a string surrounded by double quotes.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt
new file mode 100644
index 0000000000..c3fbc6082e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt
@@ -0,0 +1,51 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                MalformedDirective - (0:0,0 [6] MalformedPageDirective.cshtml) - page
+                HtmlContent - (6:0,6 [49] MalformedPageDirective.cshtml)
+                    IntermediateToken - (6:0,6 [8] MalformedPageDirective.cshtml) - Html - "foo\n\n
+                    IntermediateToken - (14:2,0 [4] MalformedPageDirective.cshtml) - Html - <h1>
+                    IntermediateToken - (18:2,4 [8] MalformedPageDirective.cshtml) - Html - About Us
+                    IntermediateToken - (26:2,12 [5] MalformedPageDirective.cshtml) - Html - </h1>
+                    IntermediateToken - (31:2,17 [2] MalformedPageDirective.cshtml) - Html - \n
+                    IntermediateToken - (33:3,0 [3] MalformedPageDirective.cshtml) - Html - <p>
+                    IntermediateToken - (36:3,3 [15] MalformedPageDirective.cshtml) - Html - We are awesome.
+                    IntermediateToken - (51:3,18 [4] MalformedPageDirective.cshtml) - Html - </p>
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective Model => ViewData.Model;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs
new file mode 100644
index 0000000000..7835a2dae2
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs
@@ -0,0 +1,41 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "464e008b9a04181fe1e9f2cc6826095698de4739"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective), null)]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"464e008b9a04181fe1e9f2cc6826095698de4739", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(6, 49, true);
+            WriteLiteral("\"foo\r\n\r\n<h1>About Us</h1>\r\n<p>We are awesome.</p>");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.diagnostics.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..637d1e902b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml(1,7): Error RZ1016: The 'page' directive expects a string surrounded by double quotes.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
new file mode 100644
index 0000000000..0692442d42
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
@@ -0,0 +1,38 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective), null)]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                MalformedDirective - (0:0,0 [6] MalformedPageDirective.cshtml) - page
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(6, 49, true);
+                HtmlContent - (6:0,6 [49] MalformedPageDirective.cshtml)
+                    IntermediateToken - (6:0,6 [8] MalformedPageDirective.cshtml) - Html - "foo\n\n
+                    IntermediateToken - (14:2,0 [4] MalformedPageDirective.cshtml) - Html - <h1>
+                    IntermediateToken - (18:2,4 [8] MalformedPageDirective.cshtml) - Html - About Us
+                    IntermediateToken - (26:2,12 [5] MalformedPageDirective.cshtml) - Html - </h1>
+                    IntermediateToken - (31:2,17 [2] MalformedPageDirective.cshtml) - Html - \n
+                    IntermediateToken - (33:3,0 [3] MalformedPageDirective.cshtml) - Html - <p>
+                    IntermediateToken - (36:3,3 [15] MalformedPageDirective.cshtml) - Html - We are awesome.
+                    IntermediateToken - (51:3,18 [4] MalformedPageDirective.cshtml) - Html - </p>
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective Model => ViewData.Model;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml
new file mode 100644
index 0000000000..4b73b2dc53
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml
@@ -0,0 +1 @@
+@model System.Collections.IEnumerable
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
new file mode 100644
index 0000000000..c488b1e443
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
@@ -0,0 +1,6 @@
+@model DateTime
+
+@addTagHelper "InputTestTagHelper, AppCode"
+
+<input-test for="Date" />
+<input-test for="@Model" />
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
new file mode 100644
index 0000000000..82441cd663
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
@@ -0,0 +1,69 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
+    {
+        private global::InputTestTagHelper __InputTestTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+DateTime __typeHelper = default(DateTime);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+global::System.Object __typeHelper = "InputTestTagHelper, AppCode";
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
+
+#line default
+#line hidden
+            __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => Model);
+
+#line default
+#line hidden
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt
new file mode 100644
index 0000000000..37627e94ea
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt
@@ -0,0 +1,68 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [8] ModelExpressionTagHelper.cshtml) - DateTime
+                DirectiveToken - (33:2,14 [29] ModelExpressionTagHelper.cshtml) - "InputTestTagHelper, AppCode"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (17:1,0 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (17:1,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                HtmlContent - (62:2,43 [4] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (62:2,43 [4] ModelExpressionTagHelper.cshtml) - Html - \n\n
+                TagHelper - (66:4,0 [25] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTestTagHelper
+                    DefaultTagHelperProperty - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                            IntermediateToken -  - CSharp - __model.
+                            IntermediateToken - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - CSharp - Date
+                            IntermediateToken -  - CSharp - )
+                    DefaultTagHelperExecute - 
+                HtmlContent - (91:4,25 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (91:4,25 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                TagHelper - (93:5,0 [27] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTestTagHelper
+                    DefaultTagHelperProperty - (110:5,17 [6] ModelExpressionTagHelper.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                            IntermediateToken - (111:5,18 [5] ModelExpressionTagHelper.cshtml) - CSharp - Model
+                            IntermediateToken -  - CSharp - )
+                    DefaultTagHelperExecute - 
+                HtmlContent - (120:5,27 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (120:5,27 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
new file mode 100644
index 0000000000..63a7d6ccc1
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
+|DateTime|
+Generated Location: (851:20,0 [8] )
+|DateTime|
+
+Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
+|"InputTestTagHelper, AppCode"|
+Generated Location: (1123:28,37 [29] )
+|"InputTestTagHelper, AppCode"|
+
+Source Location: (83:4,17 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
+|Date|
+Generated Location: (1802:44,102 [4] )
+|Date|
+
+Source Location: (111:5,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
+|Model|
+Generated Location: (2118:50,94 [5] )
+|Model|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
new file mode 100644
index 0000000000..799bbc1362
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
@@ -0,0 +1,107 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "741fc99adb54ad906c5cdc5391aeffb51a1e767b"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"741fc99adb54ad906c5cdc5391aeffb51a1e767b", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
+    {
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::InputTestTagHelper __InputTestTagHelper;
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(17, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(64, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(66, 25, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+            __tagHelperExecutionContext.Add(__InputTestTagHelper);
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
+
+#line default
+#line hidden
+            __tagHelperExecutionContext.AddTagHelperAttribute("for", __InputTestTagHelper.For, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(91, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(93, 27, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            }
+            );
+            __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+            __tagHelperExecutionContext.Add(__InputTestTagHelper);
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => Model);
+
+#line default
+#line hidden
+            __tagHelperExecutionContext.AddTagHelperAttribute("for", __InputTestTagHelper.For, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(120, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
new file mode 100644
index 0000000000..1fb7820a75
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
@@ -0,0 +1,73 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(17, 2, true);
+                HtmlContent - (17:1,0 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (17:1,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(64, 2, true);
+                HtmlContent - (64:3,0 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (64:3,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(66, 25, false);
+                TagHelper - (66:4,0 [25] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTestTagHelper
+                    DefaultTagHelperProperty - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                            IntermediateToken -  - CSharp - __model.
+                            IntermediateToken - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - CSharp - Date
+                            IntermediateToken -  - CSharp - )
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(91, 2, true);
+                HtmlContent - (91:4,25 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (91:4,25 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(93, 27, false);
+                TagHelper - (93:5,0 [27] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTestTagHelper
+                    DefaultTagHelperProperty - (110:5,17 [6] ModelExpressionTagHelper.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - 
+                            IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                            IntermediateToken - (111:5,18 [5] ModelExpressionTagHelper.cshtml) - CSharp - Model
+                            IntermediateToken -  - CSharp - )
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(120, 2, true);
+                HtmlContent - (120:5,27 [2] ModelExpressionTagHelper.cshtml)
+                    IntermediateToken - (120:5,27 [2] ModelExpressionTagHelper.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
new file mode 100644
index 0000000000..63c2a52c6f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
@@ -0,0 +1,48 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml"
+System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<System.Collections.IEnumerable> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt
new file mode 100644
index 0000000000..1ebdc00df2
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt
@@ -0,0 +1,38 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [30] Model.cshtml) - System.Collections.IEnumerable
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
new file mode 100644
index 0000000000..7d84cf754d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (7:0,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml)
+|System.Collections.IEnumerable|
+Generated Location: (769:19,0 [30] )
+|System.Collections.IEnumerable|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs
new file mode 100644
index 0000000000..ae8dc1fe65
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.codegen.cs
@@ -0,0 +1,36 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2c1e88396568d309c236020e59bf2abacfadd612"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"2c1e88396568d309c236020e59bf2abacfadd612", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<System.Collections.IEnumerable> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt
new file mode 100644
index 0000000000..2b7dcff085
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt
@@ -0,0 +1,20 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml
new file mode 100644
index 0000000000..350f93b776
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml
@@ -0,0 +1,2 @@
+@model ThisShouldBeGenerated
+@model System.Collections.IEnumerable
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
new file mode 100644
index 0000000000..e8f705cef7
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.cs
@@ -0,0 +1,56 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MultipleModels : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<ThisShouldBeGenerated>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
+ThisShouldBeGenerated __typeHelper = default(ThisShouldBeGenerated);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml"
+System.Collections.IEnumerable __typeHelper = default(System.Collections.IEnumerable);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<ThisShouldBeGenerated> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..2fe8233c66
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml(2,1): Error RZ2001: The 'model' directive may only occur once per document.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt
new file mode 100644
index 0000000000..f63a69601b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt
@@ -0,0 +1,41 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MultipleModels - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<ThisShouldBeGenerated> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [21] MultipleModels.cshtml) - ThisShouldBeGenerated
+                DirectiveToken - (37:1,7 [30] MultipleModels.cshtml) - System.Collections.IEnumerable
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                MalformedDirective - (30:1,0 [39] MultipleModels.cshtml) - model
+                    DirectiveToken - (37:1,7 [30] MultipleModels.cshtml) - System.Collections.IEnumerable
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
new file mode 100644
index 0000000000..79d7e257c7
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (7:0,7 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml)
+|ThisShouldBeGenerated|
+Generated Location: (778:19,0 [21] )
+|ThisShouldBeGenerated|
+
+Source Location: (37:1,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels.cshtml)
+|System.Collections.IEnumerable|
+Generated Location: (1029:27,0 [30] )
+|System.Collections.IEnumerable|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml
new file mode 100644
index 0000000000..ecee97de58
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml
@@ -0,0 +1,3 @@
+@page
+@namespace Test.Namespace
+<h1>Hi There!</h1>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs
new file mode 100644
index 0000000000..9d7181bfad
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.cs
@@ -0,0 +1,50 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test.Namespace
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml"
+global::System.Object __typeHelper = nameof(Test.Namespace);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt
new file mode 100644
index 0000000000..9238a0a419
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt
@@ -0,0 +1,47 @@
+Document - 
+    NamespaceDeclaration -  - Test.Namespace
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (18:1,11 [14] PageWithNamespace.cshtml) - Test.Namespace
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (34:2,0 [20] PageWithNamespace.cshtml)
+                    IntermediateToken - (34:2,0 [4] PageWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (38:2,4 [9] PageWithNamespace.cshtml) - Html - Hi There!
+                    IntermediateToken - (47:2,13 [5] PageWithNamespace.cshtml) - Html - </h1>
+                    IntermediateToken - (52:2,18 [2] PageWithNamespace.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace Model => ViewData.Model;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt
new file mode 100644
index 0000000000..b41240c9c5
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (18:1,11 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml)
+|Test.Namespace|
+Generated Location: (809:19,44 [14] )
+|Test.Namespace|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs
new file mode 100644
index 0000000000..9c1a5b03f5
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs
@@ -0,0 +1,41 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1edfb1ba4f5f6c70e2c72f4f23baf4dc0ae14377"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml", typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace), null)]
+namespace Test.Namespace
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"1edfb1ba4f5f6c70e2c72f4f23baf4dc0ae14377", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(34, 20, true);
+            WriteLiteral("<h1>Hi There!</h1>\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
new file mode 100644
index 0000000000..53b89427ee
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
@@ -0,0 +1,33 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace.cshtml", typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace), null)]
+    NamespaceDeclaration -  - Test.Namespace
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(34, 20, true);
+                HtmlContent - (34:2,0 [20] PageWithNamespace.cshtml)
+                    IntermediateToken - (34:2,0 [4] PageWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (38:2,4 [9] PageWithNamespace.cshtml) - Html - Hi There!
+                    IntermediateToken - (47:2,13 [5] PageWithNamespace.cshtml) - Html - </h1>
+                    IntermediateToken - (52:2,18 [2] PageWithNamespace.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace Model => ViewData.Model;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml
new file mode 100644
index 0000000000..5172f8f791
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml
@@ -0,0 +1,2 @@
+<div>Some text here.</div>
+@page
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.cs
new file mode 100644
index 0000000000..ec8a4fd5c9
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.diagnostics.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.diagnostics.txt
new file mode 100644
index 0000000000..393b35646e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml(2,1): Error RZ3906: The '@page' directive must precede all other elements defined in a Razor file.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt
new file mode 100644
index 0000000000..c21d9fc82c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.ir.txt
@@ -0,0 +1,46 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (0:0,0 [28] RazorPageWithNoLeadingPageDirective.cshtml)
+                    IntermediateToken - (0:0,0 [5] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div>
+                    IntermediateToken - (5:0,5 [15] RazorPageWithNoLeadingPageDirective.cshtml) - Html - Some text here.
+                    IntermediateToken - (20:0,20 [6] RazorPageWithNoLeadingPageDirective.cshtml) - Html - </div>
+                    IntermediateToken - (26:0,26 [2] RazorPageWithNoLeadingPageDirective.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective Model => ViewData.Model;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.mappings.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs
new file mode 100644
index 0000000000..107beef619
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs
@@ -0,0 +1,41 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "40c0ffad85d8fef63edfb5d91a08bd1b3609ba6f"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective), null)]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"40c0ffad85d8fef63edfb5d91a08bd1b3609ba6f", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(0, 28, true);
+            WriteLiteral("<div>Some text here.</div>\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.diagnostics.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.diagnostics.txt
new file mode 100644
index 0000000000..393b35646e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.diagnostics.txt
@@ -0,0 +1 @@
+TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml(2,1): Error RZ3906: The '@page' directive must precede all other elements defined in a Razor file.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
new file mode 100644
index 0000000000..764b704909
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
@@ -0,0 +1,33 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective), null)]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(0, 28, true);
+                HtmlContent - (0:0,0 [28] RazorPageWithNoLeadingPageDirective.cshtml)
+                    IntermediateToken - (0:0,0 [5] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div>
+                    IntermediateToken - (5:0,5 [15] RazorPageWithNoLeadingPageDirective.cshtml) - Html - Some text here.
+                    IntermediateToken - (20:0,20 [6] RazorPageWithNoLeadingPageDirective.cshtml) - Html - </div>
+                    IntermediateToken - (26:0,26 [2] RazorPageWithNoLeadingPageDirective.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective Model => ViewData.Model;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml
new file mode 100644
index 0000000000..2bc617c509
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml
@@ -0,0 +1,40 @@
+@page
+
+@model NewModel
+@addTagHelper "*, AppCode"
+@using Microsoft.AspNetCore.Mvc.RazorPages
+
+@functions {
+    public class NewModel : PageModel
+    {
+        public IActionResult OnPost(Customer customer)
+        {
+            Name = customer.Name;
+            return Redirect("~/customers/inlinepagemodels/");
+        }
+
+        public string Name { get; set; }
+    }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+}
+
+<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">@Model.Name</label>
+        <div class="col-md-10">
+            <input class="form-control" />
+            <span class="text-danger"></span>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-10">
+            <button type="submit" class="btn btn-primary">Save</button>
+        </div>
+    </div>
+</form>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml
new file mode 100644
index 0000000000..63d5955e72
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml
@@ -0,0 +1,13 @@
+@page "/About"
+
+@model NewModel
+@using Microsoft.AspNetCore.Mvc.RazorPages
+
+@functions {
+    public class NewModel : PageModel
+    {
+        public string Name { get; set; }
+    }
+}
+
+<h1>New Customer @Model.Name</h1>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
new file mode 100644
index 0000000000..8f5d082e6a
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.cs
@@ -0,0 +1,78 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+#line default
+#line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("RouteTemplate", "/About")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+global::System.Object __typeHelper = "/About";
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+NewModel __typeHelper = default(NewModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+            __o = Model.Name;
+
+#line default
+#line hidden
+        }
+        #pragma warning restore 1998
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+            
+    public class NewModel : PageModel
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<NewModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+        public NewModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt
new file mode 100644
index 0000000000..c71b835bf9
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.ir.txt
@@ -0,0 +1,60 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (36:3,1 [41] RazorPagesWithRouteTemplate.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
+        RazorCompiledItemMetadataAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (6:0,6 [8] RazorPagesWithRouteTemplate.cshtml) - "/About"
+                DirectiveToken - (25:2,7 [8] RazorPagesWithRouteTemplate.cshtml) - NewModel
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (16:1,0 [2] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (16:1,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
+                HtmlContent - (77:3,42 [4] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (77:3,42 [4] RazorPagesWithRouteTemplate.cshtml) - Html - \n\n
+                HtmlContent - (191:10,1 [21] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (191:10,1 [4] RazorPagesWithRouteTemplate.cshtml) - Html - \n\n
+                    IntermediateToken - (195:12,0 [4] RazorPagesWithRouteTemplate.cshtml) - Html - <h1>
+                    IntermediateToken - (199:12,4 [13] RazorPagesWithRouteTemplate.cshtml) - Html - New Customer 
+                CSharpExpression - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml) - CSharp - Model.Name
+                HtmlContent - (223:12,28 [7] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (223:12,28 [5] RazorPagesWithRouteTemplate.cshtml) - Html - </h1>
+                    IntermediateToken - (228:12,33 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
+            CSharpCode - (93:5,12 [97] RazorPagesWithRouteTemplate.cshtml)
+                IntermediateToken - (93:5,12 [97] RazorPagesWithRouteTemplate.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public string Name { get; set; }\n    }\n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public NewModel Model => ViewData.Model;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
new file mode 100644
index 0000000000..cc5e9cad30
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.mappings.txt
@@ -0,0 +1,35 @@
+Source Location: (36:3,1 [41] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
+|using Microsoft.AspNetCore.Mvc.RazorPages|
+Generated Location: (492:14,0 [41] )
+|using Microsoft.AspNetCore.Mvc.RazorPages|
+
+Source Location: (6:0,6 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
+|"/About"|
+Generated Location: (1108:25,37 [8] )
+|"/About"|
+
+Source Location: (25:2,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
+|NewModel|
+Generated Location: (1313:33,0 [8] )
+|NewModel|
+
+Source Location: (213:12,18 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
+|Model.Name|
+Generated Location: (1841:48,18 [10] )
+|Model.Name|
+
+Source Location: (93:5,12 [97] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml)
+|
+    public class NewModel : PageModel
+    {
+        public string Name { get; set; }
+    }
+|
+Generated Location: (2049:55,12 [97] )
+|
+    public class NewModel : PageModel
+    {
+        public string Name { get; set; }
+    }
+|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
new file mode 100644
index 0000000000..bff519edb2
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
@@ -0,0 +1,72 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "547900310554f446d88da593a245719ee9dbb12f"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate), @"/About")]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+#line default
+#line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("RouteTemplate", "/About")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"547900310554f446d88da593a245719ee9dbb12f", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(16, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(79, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(193, 19, true);
+            WriteLiteral("\r\n<h1>New Customer ");
+            EndContext();
+            BeginContext(213, 10, false);
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+            Write(Model.Name);
+
+#line default
+#line hidden
+            EndContext();
+            BeginContext(223, 7, true);
+            WriteLiteral("</h1>\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
+            
+    public class NewModel : PageModel
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<NewModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+        public NewModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
new file mode 100644
index 0000000000..5d54680b90
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
@@ -0,0 +1,61 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate), @"/About")]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (36:3,1 [43] RazorPagesWithRouteTemplate.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
+        RazorCompiledItemMetadataAttribute - 
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(16, 2, true);
+                HtmlContent - (16:1,0 [2] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (16:1,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(79, 2, true);
+                HtmlContent - (79:4,0 [2] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (79:4,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(193, 19, true);
+                HtmlContent - (193:11,0 [19] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (193:11,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
+                    IntermediateToken - (195:12,0 [4] RazorPagesWithRouteTemplate.cshtml) - Html - <h1>
+                    IntermediateToken - (199:12,4 [13] RazorPagesWithRouteTemplate.cshtml) - Html - New Customer 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(213, 10, false);
+                CSharpExpression - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml) - CSharp - Model.Name
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(223, 7, true);
+                HtmlContent - (223:12,28 [7] RazorPagesWithRouteTemplate.cshtml)
+                    IntermediateToken - (223:12,28 [5] RazorPagesWithRouteTemplate.cshtml) - Html - </h1>
+                    IntermediateToken - (228:12,33 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            CSharpCode - (93:5,12 [97] RazorPagesWithRouteTemplate.cshtml)
+                IntermediateToken - (93:5,12 [97] RazorPagesWithRouteTemplate.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public string Name { get; set; }\n    }\n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public NewModel Model => ViewData.Model;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml
new file mode 100644
index 0000000000..b78cc65ec7
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml
@@ -0,0 +1,36 @@
+@page
+
+@addTagHelper "*, AppCode"
+@using Microsoft.AspNetCore.Mvc.RazorPages
+
+@functions {
+    public IActionResult OnPost(Customer customer)
+    {
+        Name = customer.Name;
+        return Redirect("~/customers/inlinepagemodels/");
+    }
+
+    public string Name { get; set; }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+}
+
+<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">@Name</label>
+        <div class="col-md-10">
+            <input class="form-control" />
+            <span class="text-danger"></span>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-10">
+            <button type="submit" class="btn btn-primary">Save</button>
+        </div>
+    </div>
+</form>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
new file mode 100644
index 0000000000..aeb2631c46
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.cs
@@ -0,0 +1,83 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+#line default
+#line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        private global::DivTagHelper __DivTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+global::System.Object __typeHelper = "*, AppCode";
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+#line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+                                         __o = Name;
+
+#line default
+#line hidden
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+        }
+        #pragma warning restore 1998
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+            
+    public IActionResult OnPost(Customer customer)
+    {
+        Name = customer.Name;
+        return Redirect("~/customers/inlinepagemodels/");
+    }
+
+    public string Name { get; set; }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt
new file mode 100644
index 0000000000..913b80d2aa
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt
@@ -0,0 +1,143 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (38:3,1 [41] RazorPagesWithoutModel.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (23:2,14 [12] RazorPagesWithoutModel.cshtml) - "*, AppCode"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (7:1,0 [2] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (7:1,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                HtmlContent - (35:2,26 [2] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (35:2,26 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                HtmlContent - (79:3,42 [4] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (79:3,42 [4] RazorPagesWithoutModel.cshtml) - Html - \n\n
+                HtmlContent - (379:18,1 [77] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (379:18,1 [4] RazorPagesWithoutModel.cshtml) - Html - \n\n
+                    IntermediateToken - (383:20,0 [4] RazorPagesWithoutModel.cshtml) - Html - <h1>
+                    IntermediateToken - (387:20,4 [12] RazorPagesWithoutModel.cshtml) - Html - New Customer
+                    IntermediateToken - (399:20,16 [5] RazorPagesWithoutModel.cshtml) - Html - </h1>
+                    IntermediateToken - (404:20,21 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    IntermediateToken - (406:21,0 [5] RazorPagesWithoutModel.cshtml) - Html - <form
+                    IntermediateToken - (411:21,5 [14] RazorPagesWithoutModel.cshtml) - Html -  method="post"
+                    IntermediateToken - (425:21,19 [24] RazorPagesWithoutModel.cshtml) - Html -  class="form-horizontal"
+                    IntermediateToken - (449:21,43 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                    IntermediateToken - (450:21,44 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                TagHelper - (456:22,4 [31] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (468:22,16 [11] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (468:22,16 [11] RazorPagesWithoutModel.cshtml) - Html - text-danger
+                    DefaultTagHelperExecute - 
+                HtmlContent - (487:22,35 [6] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (487:22,35 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                TagHelper - (493:23,4 [237] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (517:23,28 [48] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (517:23,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            IntermediateToken - (527:24,8 [6] RazorPagesWithoutModel.cshtml) - Html - <label
+                            IntermediateToken - (533:24,14 [31] RazorPagesWithoutModel.cshtml) - Html -  class="col-md-2 control-label"
+                            IntermediateToken - (564:24,45 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                        CSharpExpression - (566:24,47 [4] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (566:24,47 [4] RazorPagesWithoutModel.cshtml) - CSharp - Name
+                        HtmlContent - (570:24,51 [18] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (570:24,51 [8] RazorPagesWithoutModel.cshtml) - Html - </label>
+                            IntermediateToken - (578:24,59 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                        TagHelper - (588:25,8 [130] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (611:25,31 [101] RazorPagesWithoutModel.cshtml)
+                                    IntermediateToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    IntermediateToken - (625:26,12 [6] RazorPagesWithoutModel.cshtml) - Html - <input
+                                    IntermediateToken - (631:26,18 [21] RazorPagesWithoutModel.cshtml) - Html -  class="form-control"
+                                    IntermediateToken - (652:26,39 [3] RazorPagesWithoutModel.cshtml) - Html -  />
+                                    IntermediateToken - (655:26,42 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    IntermediateToken - (669:27,12 [5] RazorPagesWithoutModel.cshtml) - Html - <span
+                                    IntermediateToken - (674:27,17 [20] RazorPagesWithoutModel.cshtml) - Html -  class="text-danger"
+                                    IntermediateToken - (694:27,37 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                                    IntermediateToken - (695:27,38 [7] RazorPagesWithoutModel.cshtml) - Html - </span>
+                                    IntermediateToken - (702:27,45 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (600:25,20 [9] RazorPagesWithoutModel.cshtml)
+                                    IntermediateToken - (600:25,20 [9] RazorPagesWithoutModel.cshtml) - Html - col-md-10
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (718:28,14 [6] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (718:28,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (505:23,16 [10] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (505:23,16 [10] RazorPagesWithoutModel.cshtml) - Html - form-group
+                    DefaultTagHelperExecute - 
+                HtmlContent - (730:29,10 [6] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (730:29,10 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                TagHelper - (736:30,4 [174] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (760:30,28 [10] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (760:30,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                        TagHelper - (770:31,8 [128] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (809:31,47 [83] RazorPagesWithoutModel.cshtml)
+                                    IntermediateToken - (809:31,47 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    IntermediateToken - (823:32,12 [7] RazorPagesWithoutModel.cshtml) - Html - <button
+                                    IntermediateToken - (830:32,19 [14] RazorPagesWithoutModel.cshtml) - Html -  type="submit"
+                                    IntermediateToken - (844:32,33 [24] RazorPagesWithoutModel.cshtml) - Html -  class="btn btn-primary"
+                                    IntermediateToken - (868:32,57 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                                    IntermediateToken - (869:32,58 [4] RazorPagesWithoutModel.cshtml) - Html - Save
+                                    IntermediateToken - (873:32,62 [9] RazorPagesWithoutModel.cshtml) - Html - </button>
+                                    IntermediateToken - (882:32,71 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (782:31,20 [25] RazorPagesWithoutModel.cshtml)
+                                    IntermediateToken - (782:31,20 [25] RazorPagesWithoutModel.cshtml) - Html - col-md-offset-2 col-md-10
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (898:33,14 [6] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (898:33,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (748:30,16 [10] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (748:30,16 [10] RazorPagesWithoutModel.cshtml) - Html - form-group
+                    DefaultTagHelperExecute - 
+                HtmlContent - (910:34,10 [11] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (910:34,10 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    IntermediateToken - (912:35,0 [7] RazorPagesWithoutModel.cshtml) - Html - </form>
+                    IntermediateToken - (919:35,7 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+            CSharpCode - (95:5,12 [283] RazorPagesWithoutModel.cshtml)
+                IntermediateToken - (95:5,12 [283] RazorPagesWithoutModel.cshtml) - CSharp - \n    public IActionResult OnPost(Customer customer)\n    {\n        Name = customer.Name;\n        return Redirect("~/customers/inlinepagemodels/");\n    }\n\n    public string Name { get; set; }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel Model => ViewData.Model;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
new file mode 100644
index 0000000000..33f7baa377
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.mappings.txt
@@ -0,0 +1,46 @@
+Source Location: (38:3,1 [41] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
+|using Microsoft.AspNetCore.Mvc.RazorPages|
+Generated Location: (487:14,0 [41] )
+|using Microsoft.AspNetCore.Mvc.RazorPages|
+
+Source Location: (23:2,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
+|"*, AppCode"|
+Generated Location: (1035:25,37 [12] )
+|"*, AppCode"|
+
+Source Location: (566:24,47 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
+|Name|
+Generated Location: (1629:41,47 [4] )
+|Name|
+
+Source Location: (95:5,12 [283] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml)
+|
+    public IActionResult OnPost(Customer customer)
+    {
+        Name = customer.Name;
+        return Redirect("~/customers/inlinepagemodels/");
+    }
+
+    public string Name { get; set; }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+|
+Generated Location: (2110:52,12 [283] )
+|
+    public IActionResult OnPost(Customer customer)
+    {
+        Name = customer.Name;
+        return Redirect("~/customers/inlinepagemodels/");
+    }
+
+    public string Name { get; set; }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
new file mode 100644
index 0000000000..f11c563667
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
@@ -0,0 +1,204 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8bf3954ad78688478de155359db8af32627ee2b8"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel), null)]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+#line default
+#line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"8bf3954ad78688478de155359db8af32627ee2b8", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("text-danger"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("col-md-10"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("form-group"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("col-md-offset-2 col-md-10"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::DivTagHelper __DivTagHelper;
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(7, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(81, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(381, 75, true);
+            WriteLiteral("\r\n<h1>New Customer</h1>\r\n<form method=\"post\" class=\"form-horizontal\">\r\n    ");
+            EndContext();
+            BeginContext(456, 31, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(487, 6, true);
+            WriteLiteral("\r\n    ");
+            EndContext();
+            BeginContext(493, 237, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                BeginContext(517, 48, true);
+                WriteLiteral("\r\n        <label class=\"col-md-2 control-label\">");
+                EndContext();
+                BeginContext(566, 4, false);
+#line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+                                         Write(Name);
+
+#line default
+#line hidden
+                EndContext();
+                BeginContext(570, 18, true);
+                WriteLiteral("</label>\r\n        ");
+                EndContext();
+                BeginContext(588, 130, false);
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                    BeginContext(611, 101, true);
+                    WriteLiteral("\r\n            <input class=\"form-control\" />\r\n            <span class=\"text-danger\"></span>\r\n        ");
+                    EndContext();
+                }
+                );
+                __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+                __tagHelperExecutionContext.Add(__DivTagHelper);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                EndContext();
+                BeginContext(718, 6, true);
+                WriteLiteral("\r\n    ");
+                EndContext();
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(730, 6, true);
+            WriteLiteral("\r\n    ");
+            EndContext();
+            BeginContext(736, 174, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                BeginContext(760, 10, true);
+                WriteLiteral("\r\n        ");
+                EndContext();
+                BeginContext(770, 128, false);
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                    BeginContext(809, 83, true);
+                    WriteLiteral("\r\n            <button type=\"submit\" class=\"btn btn-primary\">Save</button>\r\n        ");
+                    EndContext();
+                }
+                );
+                __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+                __tagHelperExecutionContext.Add(__DivTagHelper);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                EndContext();
+                BeginContext(898, 6, true);
+                WriteLiteral("\r\n    ");
+                EndContext();
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(910, 11, true);
+            WriteLiteral("\r\n</form>\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
+            
+    public IActionResult OnPost(Customer customer)
+    {
+        Name = customer.Name;
+        return Redirect("~/customers/inlinepagemodels/");
+    }
+
+    public string Name { get; set; }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel>)PageContext?.ViewData;
+        public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
new file mode 100644
index 0000000000..519006aec3
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
@@ -0,0 +1,193 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel), null)]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (38:3,1 [43] RazorPagesWithoutModel.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - class - text-danger - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - class - col-md-10 - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - class - form-group - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_3 - class - col-md-offset-2 col-md-10 - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(7, 2, true);
+                HtmlContent - (7:1,0 [2] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (7:1,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(81, 2, true);
+                HtmlContent - (81:4,0 [2] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (81:4,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(381, 75, true);
+                HtmlContent - (381:19,0 [75] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (381:19,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    IntermediateToken - (383:20,0 [4] RazorPagesWithoutModel.cshtml) - Html - <h1>
+                    IntermediateToken - (387:20,4 [12] RazorPagesWithoutModel.cshtml) - Html - New Customer
+                    IntermediateToken - (399:20,16 [5] RazorPagesWithoutModel.cshtml) - Html - </h1>
+                    IntermediateToken - (404:20,21 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    IntermediateToken - (406:21,0 [5] RazorPagesWithoutModel.cshtml) - Html - <form
+                    IntermediateToken - (411:21,5 [14] RazorPagesWithoutModel.cshtml) - Html -  method="post"
+                    IntermediateToken - (425:21,19 [24] RazorPagesWithoutModel.cshtml) - Html -  class="form-horizontal"
+                    IntermediateToken - (449:21,43 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                    IntermediateToken - (450:21,44 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(456, 31, false);
+                TagHelper - (456:22,4 [31] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(487, 6, true);
+                HtmlContent - (487:22,35 [6] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (487:22,35 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(493, 237, false);
+                TagHelper - (493:23,4 [237] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(517, 48, true);
+                        HtmlContent - (517:23,28 [48] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (517:23,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                            IntermediateToken - (527:24,8 [6] RazorPagesWithoutModel.cshtml) - Html - <label
+                            IntermediateToken - (533:24,14 [31] RazorPagesWithoutModel.cshtml) - Html -  class="col-md-2 control-label"
+                            IntermediateToken - (564:24,45 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(566, 4, false);
+                        CSharpExpression - (566:24,47 [4] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (566:24,47 [4] RazorPagesWithoutModel.cshtml) - CSharp - Name
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(570, 18, true);
+                        HtmlContent - (570:24,51 [18] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (570:24,51 [8] RazorPagesWithoutModel.cshtml) - Html - </label>
+                            IntermediateToken - (578:24,59 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(588, 130, false);
+                        TagHelper - (588:25,8 [130] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                CSharpCode - 
+                                    IntermediateToken -  - CSharp - BeginContext(611, 101, true);
+                                HtmlContent - (611:25,31 [101] RazorPagesWithoutModel.cshtml)
+                                    IntermediateToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    IntermediateToken - (625:26,12 [6] RazorPagesWithoutModel.cshtml) - Html - <input
+                                    IntermediateToken - (631:26,18 [21] RazorPagesWithoutModel.cshtml) - Html -  class="form-control"
+                                    IntermediateToken - (652:26,39 [3] RazorPagesWithoutModel.cshtml) - Html -  />
+                                    IntermediateToken - (655:26,42 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    IntermediateToken - (669:27,12 [5] RazorPagesWithoutModel.cshtml) - Html - <span
+                                    IntermediateToken - (674:27,17 [20] RazorPagesWithoutModel.cshtml) - Html -  class="text-danger"
+                                    IntermediateToken - (694:27,37 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                                    IntermediateToken - (695:27,38 [7] RazorPagesWithoutModel.cshtml) - Html - </span>
+                                    IntermediateToken - (702:27,45 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                                CSharpCode - 
+                                    IntermediateToken -  - CSharp - EndContext();
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                            DefaultTagHelperExecute - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(718, 6, true);
+                        HtmlContent - (718:28,14 [6] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (718:28,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(730, 6, true);
+                HtmlContent - (730:29,10 [6] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (730:29,10 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(736, 174, false);
+                TagHelper - (736:30,4 [174] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(760, 10, true);
+                        HtmlContent - (760:30,28 [10] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (760:30,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(770, 128, false);
+                        TagHelper - (770:31,8 [128] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                CSharpCode - 
+                                    IntermediateToken -  - CSharp - BeginContext(809, 83, true);
+                                HtmlContent - (809:31,47 [83] RazorPagesWithoutModel.cshtml)
+                                    IntermediateToken - (809:31,47 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
+                                    IntermediateToken - (823:32,12 [7] RazorPagesWithoutModel.cshtml) - Html - <button
+                                    IntermediateToken - (830:32,19 [14] RazorPagesWithoutModel.cshtml) - Html -  type="submit"
+                                    IntermediateToken - (844:32,33 [24] RazorPagesWithoutModel.cshtml) - Html -  class="btn btn-primary"
+                                    IntermediateToken - (868:32,57 [1] RazorPagesWithoutModel.cshtml) - Html - >
+                                    IntermediateToken - (869:32,58 [4] RazorPagesWithoutModel.cshtml) - Html - Save
+                                    IntermediateToken - (873:32,62 [9] RazorPagesWithoutModel.cshtml) - Html - </button>
+                                    IntermediateToken - (882:32,71 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
+                                CSharpCode - 
+                                    IntermediateToken -  - CSharp - EndContext();
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
+                            DefaultTagHelperExecute - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(898, 6, true);
+                        HtmlContent - (898:33,14 [6] RazorPagesWithoutModel.cshtml)
+                            IntermediateToken - (898:33,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(910, 11, true);
+                HtmlContent - (910:34,10 [11] RazorPagesWithoutModel.cshtml)
+                    IntermediateToken - (910:34,10 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                    IntermediateToken - (912:35,0 [7] RazorPagesWithoutModel.cshtml) - Html - </form>
+                    IntermediateToken - (919:35,7 [2] RazorPagesWithoutModel.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            CSharpCode - (95:5,12 [283] RazorPagesWithoutModel.cshtml)
+                IntermediateToken - (95:5,12 [283] RazorPagesWithoutModel.cshtml) - CSharp - \n    public IActionResult OnPost(Customer customer)\n    {\n        Name = customer.Name;\n        return Redirect("~/customers/inlinepagemodels/");\n    }\n\n    public string Name { get; set; }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel Model => ViewData.Model;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
new file mode 100644
index 0000000000..d7acbdf7d1
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.cs
@@ -0,0 +1,94 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+#line default
+#line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        private global::DivTagHelper __DivTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+NewModel __typeHelper = default(NewModel);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+global::System.Object __typeHelper = "*, AppCode";
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+#line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+                                         __o = Model.Name;
+
+#line default
+#line hidden
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+        }
+        #pragma warning restore 1998
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+            
+    public class NewModel : PageModel
+    {
+        public IActionResult OnPost(Customer customer)
+        {
+            Name = customer.Name;
+            return Redirect("~/customers/inlinepagemodels/");
+        }
+
+        public string Name { get; set; }
+    }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<NewModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+        public NewModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt
new file mode 100644
index 0000000000..2266b746f6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt
@@ -0,0 +1,144 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (55:4,1 [41] RazorPages.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (16:2,7 [8] RazorPages.cshtml) - NewModel
+                DirectiveToken - (40:3,14 [12] RazorPages.cshtml) - "*, AppCode"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (7:1,0 [2] RazorPages.cshtml)
+                    IntermediateToken - (7:1,0 [2] RazorPages.cshtml) - Html - \n
+                HtmlContent - (52:3,26 [2] RazorPages.cshtml)
+                    IntermediateToken - (52:3,26 [2] RazorPages.cshtml) - Html - \n
+                HtmlContent - (96:4,42 [4] RazorPages.cshtml)
+                    IntermediateToken - (96:4,42 [4] RazorPages.cshtml) - Html - \n\n
+                HtmlContent - (473:22,1 [78] RazorPages.cshtml)
+                    IntermediateToken - (473:22,1 [4] RazorPages.cshtml) - Html - \n\n
+                    IntermediateToken - (477:24,0 [4] RazorPages.cshtml) - Html - <h1>
+                    IntermediateToken - (481:24,4 [12] RazorPages.cshtml) - Html - New Customer
+                    IntermediateToken - (493:24,16 [5] RazorPages.cshtml) - Html - </h1>
+                    IntermediateToken - (498:24,21 [2] RazorPages.cshtml) - Html - \n
+                    IntermediateToken - (500:25,0 [5] RazorPages.cshtml) - Html - <form
+                    IntermediateToken - (505:25,5 [14] RazorPages.cshtml) - Html -  method="post"
+                    IntermediateToken - (519:25,19 [24] RazorPages.cshtml) - Html -  class="form-horizontal"
+                    IntermediateToken - (543:25,43 [2] RazorPages.cshtml) - Html -  >
+                    IntermediateToken - (545:25,45 [6] RazorPages.cshtml) - Html - \n    
+                TagHelper - (551:26,4 [31] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (563:26,16 [11] RazorPages.cshtml)
+                            IntermediateToken - (563:26,16 [11] RazorPages.cshtml) - Html - text-danger
+                    DefaultTagHelperExecute - 
+                HtmlContent - (582:26,35 [6] RazorPages.cshtml)
+                    IntermediateToken - (582:26,35 [6] RazorPages.cshtml) - Html - \n    
+                TagHelper - (588:27,4 [243] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (612:27,28 [48] RazorPages.cshtml)
+                            IntermediateToken - (612:27,28 [10] RazorPages.cshtml) - Html - \n        
+                            IntermediateToken - (622:28,8 [6] RazorPages.cshtml) - Html - <label
+                            IntermediateToken - (628:28,14 [31] RazorPages.cshtml) - Html -  class="col-md-2 control-label"
+                            IntermediateToken - (659:28,45 [1] RazorPages.cshtml) - Html - >
+                        CSharpExpression - (661:28,47 [10] RazorPages.cshtml)
+                            IntermediateToken - (661:28,47 [10] RazorPages.cshtml) - CSharp - Model.Name
+                        HtmlContent - (671:28,57 [18] RazorPages.cshtml)
+                            IntermediateToken - (671:28,57 [8] RazorPages.cshtml) - Html - </label>
+                            IntermediateToken - (679:28,65 [10] RazorPages.cshtml) - Html - \n        
+                        TagHelper - (689:29,8 [130] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (712:29,31 [101] RazorPages.cshtml)
+                                    IntermediateToken - (712:29,31 [14] RazorPages.cshtml) - Html - \n            
+                                    IntermediateToken - (726:30,12 [6] RazorPages.cshtml) - Html - <input
+                                    IntermediateToken - (732:30,18 [21] RazorPages.cshtml) - Html -  class="form-control"
+                                    IntermediateToken - (753:30,39 [3] RazorPages.cshtml) - Html -  />
+                                    IntermediateToken - (756:30,42 [14] RazorPages.cshtml) - Html - \n            
+                                    IntermediateToken - (770:31,12 [5] RazorPages.cshtml) - Html - <span
+                                    IntermediateToken - (775:31,17 [20] RazorPages.cshtml) - Html -  class="text-danger"
+                                    IntermediateToken - (795:31,37 [1] RazorPages.cshtml) - Html - >
+                                    IntermediateToken - (796:31,38 [7] RazorPages.cshtml) - Html - </span>
+                                    IntermediateToken - (803:31,45 [10] RazorPages.cshtml) - Html - \n        
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (701:29,20 [9] RazorPages.cshtml)
+                                    IntermediateToken - (701:29,20 [9] RazorPages.cshtml) - Html - col-md-10
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (819:32,14 [6] RazorPages.cshtml)
+                            IntermediateToken - (819:32,14 [6] RazorPages.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (600:27,16 [10] RazorPages.cshtml)
+                            IntermediateToken - (600:27,16 [10] RazorPages.cshtml) - Html - form-group
+                    DefaultTagHelperExecute - 
+                HtmlContent - (831:33,10 [6] RazorPages.cshtml)
+                    IntermediateToken - (831:33,10 [6] RazorPages.cshtml) - Html - \n    
+                TagHelper - (837:34,4 [174] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        HtmlContent - (861:34,28 [10] RazorPages.cshtml)
+                            IntermediateToken - (861:34,28 [10] RazorPages.cshtml) - Html - \n        
+                        TagHelper - (871:35,8 [128] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                HtmlContent - (910:35,47 [83] RazorPages.cshtml)
+                                    IntermediateToken - (910:35,47 [14] RazorPages.cshtml) - Html - \n            
+                                    IntermediateToken - (924:36,12 [7] RazorPages.cshtml) - Html - <button
+                                    IntermediateToken - (931:36,19 [14] RazorPages.cshtml) - Html -  type="submit"
+                                    IntermediateToken - (945:36,33 [24] RazorPages.cshtml) - Html -  class="btn btn-primary"
+                                    IntermediateToken - (969:36,57 [1] RazorPages.cshtml) - Html - >
+                                    IntermediateToken - (970:36,58 [4] RazorPages.cshtml) - Html - Save
+                                    IntermediateToken - (974:36,62 [9] RazorPages.cshtml) - Html - </button>
+                                    IntermediateToken - (983:36,71 [10] RazorPages.cshtml) - Html - \n        
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                                HtmlContent - (883:35,20 [25] RazorPages.cshtml)
+                                    IntermediateToken - (883:35,20 [25] RazorPages.cshtml) - Html - col-md-offset-2 col-md-10
+                            DefaultTagHelperExecute - 
+                        HtmlContent - (999:37,14 [6] RazorPages.cshtml)
+                            IntermediateToken - (999:37,14 [6] RazorPages.cshtml) - Html - \n    
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    DefaultTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (849:34,16 [10] RazorPages.cshtml)
+                            IntermediateToken - (849:34,16 [10] RazorPages.cshtml) - Html - form-group
+                    DefaultTagHelperExecute - 
+                HtmlContent - (1011:38,10 [11] RazorPages.cshtml)
+                    IntermediateToken - (1011:38,10 [2] RazorPages.cshtml) - Html - \n
+                    IntermediateToken - (1013:39,0 [7] RazorPages.cshtml) - Html - </form>
+                    IntermediateToken - (1020:39,7 [2] RazorPages.cshtml) - Html - \n
+            CSharpCode - (112:6,12 [360] RazorPages.cshtml)
+                IntermediateToken - (112:6,12 [360] RazorPages.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public IActionResult OnPost(Customer customer)\n        {\n            Name = customer.Name;\n            return Redirect("~/customers/inlinepagemodels/");\n        }\n\n        public string Name { get; set; }\n    }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public NewModel Model => ViewData.Model;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
new file mode 100644
index 0000000000..0af8c77dfd
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.mappings.txt
@@ -0,0 +1,57 @@
+Source Location: (55:4,1 [41] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
+|using Microsoft.AspNetCore.Mvc.RazorPages|
+Generated Location: (475:14,0 [41] )
+|using Microsoft.AspNetCore.Mvc.RazorPages|
+
+Source Location: (16:2,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
+|NewModel|
+Generated Location: (962:25,0 [8] )
+|NewModel|
+
+Source Location: (40:3,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
+|"*, AppCode"|
+Generated Location: (1220:33,37 [12] )
+|"*, AppCode"|
+
+Source Location: (661:28,47 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
+|Model.Name|
+Generated Location: (1802:49,47 [10] )
+|Model.Name|
+
+Source Location: (112:6,12 [360] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml)
+|
+    public class NewModel : PageModel
+    {
+        public IActionResult OnPost(Customer customer)
+        {
+            Name = customer.Name;
+            return Redirect("~/customers/inlinepagemodels/");
+        }
+
+        public string Name { get; set; }
+    }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+|
+Generated Location: (2277:60,12 [360] )
+|
+    public class NewModel : PageModel
+    {
+        public IActionResult OnPost(Customer customer)
+        {
+            Name = customer.Name;
+            return Redirect("~/customers/inlinepagemodels/");
+        }
+
+        public string Name { get; set; }
+    }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
new file mode 100644
index 0000000000..ca08b5e268
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
@@ -0,0 +1,207 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "d33caff161b646a61b273d7c544111395b652557"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages), @"mvc.1.0.razor-page", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages), null)]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+#line default
+#line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"d33caff161b646a61b273d7c544111395b652557", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("text-danger"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("col-md-10"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("form-group"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlString("col-md-offset-2 col-md-10"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::DivTagHelper __DivTagHelper;
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(7, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(98, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(475, 76, true);
+            WriteLiteral("\r\n<h1>New Customer</h1>\r\n<form method=\"post\" class=\"form-horizontal\" >\r\n    ");
+            EndContext();
+            BeginContext(551, 31, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(582, 6, true);
+            WriteLiteral("\r\n    ");
+            EndContext();
+            BeginContext(588, 243, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                BeginContext(612, 48, true);
+                WriteLiteral("\r\n        <label class=\"col-md-2 control-label\">");
+                EndContext();
+                BeginContext(661, 10, false);
+#line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+                                         Write(Model.Name);
+
+#line default
+#line hidden
+                EndContext();
+                BeginContext(671, 18, true);
+                WriteLiteral("</label>\r\n        ");
+                EndContext();
+                BeginContext(689, 130, false);
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                    BeginContext(712, 101, true);
+                    WriteLiteral("\r\n            <input class=\"form-control\" />\r\n            <span class=\"text-danger\"></span>\r\n        ");
+                    EndContext();
+                }
+                );
+                __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+                __tagHelperExecutionContext.Add(__DivTagHelper);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                EndContext();
+                BeginContext(819, 6, true);
+                WriteLiteral("\r\n    ");
+                EndContext();
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(831, 6, true);
+            WriteLiteral("\r\n    ");
+            EndContext();
+            BeginContext(837, 174, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                BeginContext(861, 10, true);
+                WriteLiteral("\r\n        ");
+                EndContext();
+                BeginContext(871, 128, false);
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                    BeginContext(910, 83, true);
+                    WriteLiteral("\r\n            <button type=\"submit\" class=\"btn btn-primary\">Save</button>\r\n        ");
+                    EndContext();
+                }
+                );
+                __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+                __tagHelperExecutionContext.Add(__DivTagHelper);
+                __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                EndContext();
+                BeginContext(999, 6, true);
+                WriteLiteral("\r\n    ");
+                EndContext();
+            }
+            );
+            __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
+            __tagHelperExecutionContext.Add(__DivTagHelper);
+            __tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+            BeginContext(1011, 11, true);
+            WriteLiteral("\r\n</form>\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
+            
+    public class NewModel : PageModel
+    {
+        public IActionResult OnPost(Customer customer)
+        {
+            Name = customer.Name;
+            return Redirect("~/customers/inlinepagemodels/");
+        }
+
+        public string Name { get; set; }
+    }
+
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+
+#line default
+#line hidden
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<NewModel> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+        public NewModel Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
new file mode 100644
index 0000000000..cc1bc6f718
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
@@ -0,0 +1,193 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages), null)]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (55:4,1 [43] RazorPages.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_0 - class - text-danger - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_1 - class - col-md-10 - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - class - form-group - HtmlAttributeValueStyle.DoubleQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_3 - class - col-md-offset-2 col-md-10 - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(7, 2, true);
+                HtmlContent - (7:1,0 [2] RazorPages.cshtml)
+                    IntermediateToken - (7:1,0 [2] RazorPages.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(98, 2, true);
+                HtmlContent - (98:5,0 [2] RazorPages.cshtml)
+                    IntermediateToken - (98:5,0 [2] RazorPages.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(475, 76, true);
+                HtmlContent - (475:23,0 [76] RazorPages.cshtml)
+                    IntermediateToken - (475:23,0 [2] RazorPages.cshtml) - Html - \n
+                    IntermediateToken - (477:24,0 [4] RazorPages.cshtml) - Html - <h1>
+                    IntermediateToken - (481:24,4 [12] RazorPages.cshtml) - Html - New Customer
+                    IntermediateToken - (493:24,16 [5] RazorPages.cshtml) - Html - </h1>
+                    IntermediateToken - (498:24,21 [2] RazorPages.cshtml) - Html - \n
+                    IntermediateToken - (500:25,0 [5] RazorPages.cshtml) - Html - <form
+                    IntermediateToken - (505:25,5 [14] RazorPages.cshtml) - Html -  method="post"
+                    IntermediateToken - (519:25,19 [24] RazorPages.cshtml) - Html -  class="form-horizontal"
+                    IntermediateToken - (543:25,43 [2] RazorPages.cshtml) - Html -  >
+                    IntermediateToken - (545:25,45 [6] RazorPages.cshtml) - Html - \n    
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(551, 31, false);
+                TagHelper - (551:26,4 [31] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(582, 6, true);
+                HtmlContent - (582:26,35 [6] RazorPages.cshtml)
+                    IntermediateToken - (582:26,35 [6] RazorPages.cshtml) - Html - \n    
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(588, 243, false);
+                TagHelper - (588:27,4 [243] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(612, 48, true);
+                        HtmlContent - (612:27,28 [48] RazorPages.cshtml)
+                            IntermediateToken - (612:27,28 [10] RazorPages.cshtml) - Html - \n        
+                            IntermediateToken - (622:28,8 [6] RazorPages.cshtml) - Html - <label
+                            IntermediateToken - (628:28,14 [31] RazorPages.cshtml) - Html -  class="col-md-2 control-label"
+                            IntermediateToken - (659:28,45 [1] RazorPages.cshtml) - Html - >
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(661, 10, false);
+                        CSharpExpression - (661:28,47 [10] RazorPages.cshtml)
+                            IntermediateToken - (661:28,47 [10] RazorPages.cshtml) - CSharp - Model.Name
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(671, 18, true);
+                        HtmlContent - (671:28,57 [18] RazorPages.cshtml)
+                            IntermediateToken - (671:28,57 [8] RazorPages.cshtml) - Html - </label>
+                            IntermediateToken - (679:28,65 [10] RazorPages.cshtml) - Html - \n        
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(689, 130, false);
+                        TagHelper - (689:29,8 [130] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                CSharpCode - 
+                                    IntermediateToken -  - CSharp - BeginContext(712, 101, true);
+                                HtmlContent - (712:29,31 [101] RazorPages.cshtml)
+                                    IntermediateToken - (712:29,31 [14] RazorPages.cshtml) - Html - \n            
+                                    IntermediateToken - (726:30,12 [6] RazorPages.cshtml) - Html - <input
+                                    IntermediateToken - (732:30,18 [21] RazorPages.cshtml) - Html -  class="form-control"
+                                    IntermediateToken - (753:30,39 [3] RazorPages.cshtml) - Html -  />
+                                    IntermediateToken - (756:30,42 [14] RazorPages.cshtml) - Html - \n            
+                                    IntermediateToken - (770:31,12 [5] RazorPages.cshtml) - Html - <span
+                                    IntermediateToken - (775:31,17 [20] RazorPages.cshtml) - Html -  class="text-danger"
+                                    IntermediateToken - (795:31,37 [1] RazorPages.cshtml) - Html - >
+                                    IntermediateToken - (796:31,38 [7] RazorPages.cshtml) - Html - </span>
+                                    IntermediateToken - (803:31,45 [10] RazorPages.cshtml) - Html - \n        
+                                CSharpCode - 
+                                    IntermediateToken -  - CSharp - EndContext();
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
+                            DefaultTagHelperExecute - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(819, 6, true);
+                        HtmlContent - (819:32,14 [6] RazorPages.cshtml)
+                            IntermediateToken - (819:32,14 [6] RazorPages.cshtml) - Html - \n    
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(831, 6, true);
+                HtmlContent - (831:33,10 [6] RazorPages.cshtml)
+                    IntermediateToken - (831:33,10 [6] RazorPages.cshtml) - Html - \n    
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(837, 174, false);
+                TagHelper - (837:34,4 [174] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(861, 10, true);
+                        HtmlContent - (861:34,28 [10] RazorPages.cshtml)
+                            IntermediateToken - (861:34,28 [10] RazorPages.cshtml) - Html - \n        
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(871, 128, false);
+                        TagHelper - (871:35,8 [128] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
+                            DefaultTagHelperBody - 
+                                CSharpCode - 
+                                    IntermediateToken -  - CSharp - BeginContext(910, 83, true);
+                                HtmlContent - (910:35,47 [83] RazorPages.cshtml)
+                                    IntermediateToken - (910:35,47 [14] RazorPages.cshtml) - Html - \n            
+                                    IntermediateToken - (924:36,12 [7] RazorPages.cshtml) - Html - <button
+                                    IntermediateToken - (931:36,19 [14] RazorPages.cshtml) - Html -  type="submit"
+                                    IntermediateToken - (945:36,33 [24] RazorPages.cshtml) - Html -  class="btn btn-primary"
+                                    IntermediateToken - (969:36,57 [1] RazorPages.cshtml) - Html - >
+                                    IntermediateToken - (970:36,58 [4] RazorPages.cshtml) - Html - Save
+                                    IntermediateToken - (974:36,62 [9] RazorPages.cshtml) - Html - </button>
+                                    IntermediateToken - (983:36,71 [10] RazorPages.cshtml) - Html - \n        
+                                CSharpCode - 
+                                    IntermediateToken -  - CSharp - EndContext();
+                            DefaultTagHelperCreate -  - DivTagHelper
+                            PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
+                            DefaultTagHelperExecute - 
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - BeginContext(999, 6, true);
+                        HtmlContent - (999:37,14 [6] RazorPages.cshtml)
+                            IntermediateToken - (999:37,14 [6] RazorPages.cshtml) - Html - \n    
+                        CSharpCode - 
+                            IntermediateToken -  - CSharp - EndContext();
+                    DefaultTagHelperCreate -  - DivTagHelper
+                    PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(1011, 11, true);
+                HtmlContent - (1011:38,10 [11] RazorPages.cshtml)
+                    IntermediateToken - (1011:38,10 [2] RazorPages.cshtml) - Html - \n
+                    IntermediateToken - (1013:39,0 [7] RazorPages.cshtml) - Html - </form>
+                    IntermediateToken - (1020:39,7 [2] RazorPages.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            CSharpCode - (112:6,12 [360] RazorPages.cshtml)
+                IntermediateToken - (112:6,12 [360] RazorPages.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public IActionResult OnPost(Customer customer)\n        {\n            Name = customer.Name;\n            return Redirect("~/customers/inlinepagemodels/");\n        }\n\n        public string Name { get; set; }\n    }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<NewModel>)PageContext?.ViewData;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - public NewModel Model => ViewData.Model;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml
new file mode 100644
index 0000000000..7438788ff4
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml
@@ -0,0 +1,14 @@
+@model DateTime
+
+@addTagHelper "InputTestTagHelper, AppCode"
+
+@{ 
+    Layout = "_SectionTestLayout.cshtml";
+}
+
+<div>Some body</div>
+
+@section Section1 {
+    <div>This is in Section 1</div>
+    <input-test for="Date" />
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
new file mode 100644
index 0000000000..3ca46af8a7
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
@@ -0,0 +1,80 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
+    {
+        private global::InputTestTagHelper __InputTestTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+DateTime __typeHelper = default(DateTime);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+global::System.Object __typeHelper = "InputTestTagHelper, AppCode";
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+global::System.Object Section1 = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+   
+    Layout = "_SectionTestLayout.cshtml";
+
+#line default
+#line hidden
+            DefineSection("Section1", async(__razor_section_writer) => {
+                __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
+
+#line default
+#line hidden
+            }
+            );
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
new file mode 100644
index 0000000000..312d7bb7ae
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
@@ -0,0 +1,73 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (7:0,7 [8] Sections.cshtml) - DateTime
+                DirectiveToken - (33:2,14 [29] Sections.cshtml) - "InputTestTagHelper, AppCode"
+                DirectiveToken - (152:10,9 [8] Sections.cshtml) - Section1
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (17:1,0 [2] Sections.cshtml)
+                    IntermediateToken - (17:1,0 [2] Sections.cshtml) - Html - \n
+                HtmlContent - (62:2,43 [4] Sections.cshtml)
+                    IntermediateToken - (62:2,43 [4] Sections.cshtml) - Html - \n\n
+                CSharpCode - (68:4,2 [46] Sections.cshtml)
+                    IntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp -  \n    Layout = "_SectionTestLayout.cshtml";\n
+                HtmlContent - (117:7,0 [26] Sections.cshtml)
+                    IntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
+                    IntermediateToken - (119:8,0 [5] Sections.cshtml) - Html - <div>
+                    IntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
+                    IntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
+                    IntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
+                Section -  - Section1
+                    HtmlContent - (162:10,19 [43] Sections.cshtml)
+                        IntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n    
+                        IntermediateToken - (168:11,4 [5] Sections.cshtml) - Html - <div>
+                        IntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
+                        IntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
+                        IntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n    
+                    TagHelper - (205:12,4 [25] Sections.cshtml) - input-test - TagMode.SelfClosing
+                        DefaultTagHelperBody - 
+                        DefaultTagHelperCreate -  - InputTestTagHelper
+                        DefaultTagHelperProperty - (222:12,21 [4] Sections.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                            CSharpExpression - 
+                                IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                                IntermediateToken -  - CSharp - __model.
+                                IntermediateToken - (222:12,21 [4] Sections.cshtml) - CSharp - Date
+                                IntermediateToken -  - CSharp - )
+                        DefaultTagHelperExecute - 
+                    HtmlContent - (230:12,29 [2] Sections.cshtml)
+                        IntermediateToken - (230:12,29 [2] Sections.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
new file mode 100644
index 0000000000..1cc991810c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
@@ -0,0 +1,29 @@
+Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|DateTime|
+Generated Location: (819:20,0 [8] )
+|DateTime|
+
+Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|"InputTestTagHelper, AppCode"|
+Generated Location: (1075:28,37 [29] )
+|"InputTestTagHelper, AppCode"|
+
+Source Location: (152:10,9 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|Section1|
+Generated Location: (1305:36,22 [8] )
+|Section1|
+
+Source Location: (68:4,2 [46] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+| 
+    Layout = "_SectionTestLayout.cshtml";
+|
+Generated Location: (1771:51,2 [46] )
+| 
+    Layout = "_SectionTestLayout.cshtml";
+|
+
+Source Location: (222:12,21 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
+|Date|
+Generated Location: (2196:59,102 [4] )
+|Date|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
new file mode 100644
index 0000000000..5d5ab480d6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
@@ -0,0 +1,99 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4b7b87da15db4343c99430c0813fd6bc03643453"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"4b7b87da15db4343c99430c0813fd6bc03643453", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
+    {
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::InputTestTagHelper __InputTestTagHelper;
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(17, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(64, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+   
+    Layout = "_SectionTestLayout.cshtml";
+
+#line default
+#line hidden
+            BeginContext(117, 26, true);
+            WriteLiteral("\r\n<div>Some body</div>\r\n\r\n");
+            EndContext();
+            DefineSection("Section1", async() => {
+                BeginContext(162, 43, true);
+                WriteLiteral("\r\n    <div>This is in Section 1</div>\r\n    ");
+                EndContext();
+                BeginContext(205, 25, false);
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                }
+                );
+                __InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
+                __tagHelperExecutionContext.Add(__InputTestTagHelper);
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
+__InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Date);
+
+#line default
+#line hidden
+                __tagHelperExecutionContext.AddTagHelperAttribute("for", __InputTestTagHelper.For, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+                await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+                if (!__tagHelperExecutionContext.Output.IsContentModified)
+                {
+                    await __tagHelperExecutionContext.SetOutputContentAsync();
+                }
+                Write(__tagHelperExecutionContext.Output);
+                __tagHelperExecutionContext = __tagHelperScopeManager.End();
+                EndContext();
+                BeginContext(230, 2, true);
+                WriteLiteral("\r\n");
+                EndContext();
+            }
+            );
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<DateTime> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
new file mode 100644
index 0000000000..8a5b810749
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
@@ -0,0 +1,77 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(17, 2, true);
+                HtmlContent - (17:1,0 [2] Sections.cshtml)
+                    IntermediateToken - (17:1,0 [2] Sections.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(64, 2, true);
+                HtmlContent - (64:3,0 [2] Sections.cshtml)
+                    IntermediateToken - (64:3,0 [2] Sections.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - (68:4,2 [46] Sections.cshtml)
+                    IntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp -  \n    Layout = "_SectionTestLayout.cshtml";\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(117, 26, true);
+                HtmlContent - (117:7,0 [26] Sections.cshtml)
+                    IntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
+                    IntermediateToken - (119:8,0 [5] Sections.cshtml) - Html - <div>
+                    IntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
+                    IntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
+                    IntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                Section -  - Section1
+                    CSharpCode - 
+                        IntermediateToken -  - CSharp - BeginContext(162, 43, true);
+                    HtmlContent - (162:10,19 [43] Sections.cshtml)
+                        IntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n    
+                        IntermediateToken - (168:11,4 [5] Sections.cshtml) - Html - <div>
+                        IntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
+                        IntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
+                        IntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n    
+                    CSharpCode - 
+                        IntermediateToken -  - CSharp - EndContext();
+                    CSharpCode - 
+                        IntermediateToken -  - CSharp - BeginContext(205, 25, false);
+                    TagHelper - (205:12,4 [25] Sections.cshtml) - input-test - TagMode.SelfClosing
+                        DefaultTagHelperBody - 
+                        DefaultTagHelperCreate -  - InputTestTagHelper
+                        DefaultTagHelperProperty - (222:12,21 [4] Sections.cshtml) - for - Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression InputTestTagHelper.For - HtmlAttributeValueStyle.DoubleQuotes
+                            CSharpExpression - 
+                                IntermediateToken -  - CSharp - ModelExpressionProvider.CreateModelExpression(ViewData, __model => 
+                                IntermediateToken -  - CSharp - __model.
+                                IntermediateToken - (222:12,21 [4] Sections.cshtml) - CSharp - Date
+                                IntermediateToken -  - CSharp - )
+                        DefaultTagHelperExecute - 
+                    CSharpCode - 
+                        IntermediateToken -  - CSharp - EndContext();
+                    CSharpCode - 
+                        IntermediateToken -  - CSharp - BeginContext(230, 2, true);
+                    HtmlContent - (230:12,29 [2] Sections.cshtml)
+                        IntermediateToken - (230:12,29 [2] Sections.cshtml) - Html - \n
+                    CSharpCode - 
+                        IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml
new file mode 100644
index 0000000000..ed2648a986
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml
@@ -0,0 +1,4 @@
+@using System.ComponentModel
+@using System.Collections
+@using System
+@using System
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.cs
new file mode 100644
index 0000000000..ad57e4a82b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.cs
@@ -0,0 +1,59 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System.ComponentModel;
+
+#line default
+#line hidden
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System.Collections;
+
+#line default
+#line hidden
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System;
+
+#line default
+#line hidden
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System;
+
+#line default
+#line hidden
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.ir.txt
new file mode 100644
index 0000000000..0163b00a81
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.ir.txt
@@ -0,0 +1,46 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (1:0,1 [27] UsingDirectives.cshtml) - System.ComponentModel
+        UsingDirective - (31:1,1 [24] UsingDirectives.cshtml) - System.Collections
+        UsingDirective - (58:2,1 [12] UsingDirectives.cshtml) - System
+        UsingDirective - (73:3,1 [12] UsingDirectives.cshtml) - System
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (28:0,28 [2] UsingDirectives.cshtml)
+                    IntermediateToken - (28:0,28 [2] UsingDirectives.cshtml) - Html - \n
+                HtmlContent - (55:1,25 [2] UsingDirectives.cshtml)
+                    IntermediateToken - (55:1,25 [2] UsingDirectives.cshtml) - Html - \n
+                HtmlContent - (70:2,13 [2] UsingDirectives.cshtml)
+                    IntermediateToken - (70:2,13 [2] UsingDirectives.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.mappings.txt
new file mode 100644
index 0000000000..71a6bf2b2d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.mappings.txt
@@ -0,0 +1,20 @@
+Source Location: (1:0,1 [27] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml)
+|using System.ComponentModel|
+Generated Location: (461:13,0 [27] )
+|using System.ComponentModel|
+
+Source Location: (31:1,1 [24] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml)
+|using System.Collections|
+Generated Location: (613:18,0 [24] )
+|using System.Collections|
+
+Source Location: (58:2,1 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml)
+|using System|
+Generated Location: (762:23,0 [12] )
+|using System|
+
+Source Location: (73:3,1 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml)
+|using System|
+Generated Location: (899:28,0 [12] )
+|using System|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs
new file mode 100644
index 0000000000..1310cb0d8c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.codegen.cs
@@ -0,0 +1,55 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "452979e8e4dd77a84a4c50425dd3a162e265990d"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives))]
+namespace AspNetCore
+{
+    #line hidden
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System.ComponentModel;
+
+#line default
+#line hidden
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System.Collections;
+
+#line default
+#line hidden
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System;
+
+#line default
+#line hidden
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml"
+using System;
+
+#line default
+#line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"452979e8e4dd77a84a4c50425dd3a162e265990d", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.ir.txt
new file mode 100644
index 0000000000..c3b71e0393
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_Runtime.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        UsingDirective - (1:0,1 [29] UsingDirectives.cshtml) - System.ComponentModel
+        UsingDirective - (31:1,1 [26] UsingDirectives.cshtml) - System.Collections
+        UsingDirective - (58:2,1 [14] UsingDirectives.cshtml) - System
+        UsingDirective - (73:3,1 [12] UsingDirectives.cshtml) - System
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UsingDirectives - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml
new file mode 100644
index 0000000000..0430ccfc69
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml
@@ -0,0 +1,6 @@
+@addTagHelper "*, AppCode"
+@{
+    var foo = "Hello";
+}
+
+<vc:test first-name="@foo" bar=" World"></vc:test>
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
new file mode 100644
index 0000000000..b6196f6651
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
@@ -0,0 +1,84 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        private global::AllTagHelper __AllTagHelper;
+        private global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper __TestViewComponentTagHelper;
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+global::System.Object __typeHelper = "*, AppCode";
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+  
+    var foo = "Hello";
+
+#line default
+#line hidden
+            __AllTagHelper = CreateTagHelper<global::AllTagHelper>();
+            __TestViewComponentTagHelper = CreateTagHelper<global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper>();
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+                __o = foo;
+
+#line default
+#line hidden
+            __TestViewComponentTagHelper.firstName = string.Empty;
+            __AllTagHelper.Bar = " World";
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+        [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("vc:test")]
+        public class __Generated__TestViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
+        {
+            private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+            public __Generated__TestViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
+            {
+                _helper = helper;
+            }
+            [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
+            public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
+            public System.String firstName { get; set; }
+            public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+            {
+                (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+                var content = await _helper.InvokeAsync("Test", new { firstName });
+                output.TagName = null;
+                output.Content.SetHtmlContent(content);
+            }
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt
new file mode 100644
index 0000000000..8e7497e7d6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt
@@ -0,0 +1,59 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::AllTagHelper - __AllTagHelper
+            FieldDeclaration -  - private - global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper - __TestViewComponentTagHelper
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (14:0,14 [12] ViewComponentTagHelper.cshtml) - "*, AppCode"
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (26:0,26 [2] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (26:0,26 [2] ViewComponentTagHelper.cshtml) - Html - \n
+                CSharpCode - (30:1,2 [26] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (30:1,2 [26] ViewComponentTagHelper.cshtml) - CSharp - \n    var foo = "Hello";\n
+                HtmlContent - (59:4,0 [2] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (59:4,0 [2] ViewComponentTagHelper.cshtml) - Html - \n
+                TagHelper - (61:5,0 [50] ViewComponentTagHelper.cshtml) - vc:test - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - AllTagHelper
+                    DefaultTagHelperCreate -  - AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper
+                    DefaultTagHelperProperty - (82:5,21 [4] ViewComponentTagHelper.cshtml) - first-name - string TestViewComponentTagHelper.firstName - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (83:5,22 [3] ViewComponentTagHelper.cshtml)
+                            IntermediateToken - (83:5,22 [3] ViewComponentTagHelper.cshtml) - CSharp - foo
+                    DefaultTagHelperProperty - (93:5,32 [6] ViewComponentTagHelper.cshtml) - bar - string AllTagHelper.Bar - HtmlAttributeValueStyle.DoubleQuotes
+                        HtmlContent - (93:5,32 [6] ViewComponentTagHelper.cshtml)
+                            IntermediateToken - (93:5,32 [6] ViewComponentTagHelper.cshtml) - Html -  World
+                    DefaultTagHelperExecute - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            ViewComponentTagHelper - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
new file mode 100644
index 0000000000..9c5fd32efb
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.mappings.txt
@@ -0,0 +1,19 @@
+Source Location: (14:0,14 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
+|"*, AppCode"|
+Generated Location: (1057:21,37 [12] )
+|"*, AppCode"|
+
+Source Location: (30:1,2 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
+|
+    var foo = "Hello";
+|
+Generated Location: (1534:36,2 [26] )
+|
+    var foo = "Hello";
+|
+
+Source Location: (83:5,22 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml)
+|foo|
+Generated Location: (1985:44,22 [3] )
+|foo|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
new file mode 100644
index 0000000000..28241f9687
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
@@ -0,0 +1,112 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "bf860c3a5e96240c9d41a0b950e49c1a165ca44d"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"bf860c3a5e96240c9d41a0b950e49c1a165ca44d", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        private global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper __TestViewComponentTagHelper;
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("bar", " World", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+        #line hidden
+        #pragma warning disable 0169
+        private string __tagHelperStringValueBuffer;
+        #pragma warning restore 0169
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperRunner();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __backed__tagHelperScopeManager = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager
+        {
+            get
+            {
+                if (__backed__tagHelperScopeManager == null)
+                {
+                    __backed__tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperScopeManager(StartTagHelperWritingScope, EndTagHelperWritingScope);
+                }
+                return __backed__tagHelperScopeManager;
+            }
+        }
+        private global::AllTagHelper __AllTagHelper;
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+  
+    var foo = "Hello";
+
+#line default
+#line hidden
+            BeginContext(59, 2, true);
+            WriteLiteral("\r\n");
+            EndContext();
+            BeginContext(61, 50, false);
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("vc:test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            }
+            );
+            __AllTagHelper = CreateTagHelper<global::AllTagHelper>();
+            __tagHelperExecutionContext.Add(__AllTagHelper);
+            __TestViewComponentTagHelper = CreateTagHelper<global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper>();
+            __tagHelperExecutionContext.Add(__TestViewComponentTagHelper);
+            BeginWriteTagHelperAttribute();
+#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml"
+         WriteLiteral(foo);
+
+#line default
+#line hidden
+            __tagHelperStringValueBuffer = EndWriteTagHelperAttribute();
+            __TestViewComponentTagHelper.firstName = __tagHelperStringValueBuffer;
+            __tagHelperExecutionContext.AddTagHelperAttribute("first-name", __TestViewComponentTagHelper.firstName, global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
+            __AllTagHelper.Bar = (string)__tagHelperAttribute_0.Value;
+            __tagHelperExecutionContext.AddTagHelperAttribute(__tagHelperAttribute_0);
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            if (!__tagHelperExecutionContext.Output.IsContentModified)
+            {
+                await __tagHelperExecutionContext.SetOutputContentAsync();
+            }
+            Write(__tagHelperExecutionContext.Output);
+            __tagHelperExecutionContext = __tagHelperScopeManager.End();
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+        [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("vc:test")]
+        public class __Generated__TestViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
+        {
+            private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+            public __Generated__TestViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
+            {
+                _helper = helper;
+            }
+            [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
+            public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
+            public System.String firstName { get; set; }
+            public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+            {
+                (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+                var content = await _helper.InvokeAsync("Test", new { firstName });
+                output.TagName = null;
+                output.Content.SetHtmlContent(content);
+            }
+        }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
new file mode 100644
index 0000000000..4c215a09d3
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
@@ -0,0 +1,46 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            FieldDeclaration -  - private - global::AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper - __TestViewComponentTagHelper
+            PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_0 - bar -  World - HtmlAttributeValueStyle.DoubleQuotes
+            DefaultTagHelperRuntime - 
+            FieldDeclaration -  - private - global::AllTagHelper - __AllTagHelper
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - (30:1,2 [26] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (30:1,2 [26] ViewComponentTagHelper.cshtml) - CSharp - \n    var foo = "Hello";\n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(59, 2, true);
+                HtmlContent - (59:4,0 [2] ViewComponentTagHelper.cshtml)
+                    IntermediateToken - (59:4,0 [2] ViewComponentTagHelper.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(61, 50, false);
+                TagHelper - (61:5,0 [50] ViewComponentTagHelper.cshtml) - vc:test - TagMode.StartTagAndEndTag
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - AllTagHelper
+                    DefaultTagHelperCreate -  - AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper.__Generated__TestViewComponentTagHelper
+                    DefaultTagHelperProperty - (82:5,21 [4] ViewComponentTagHelper.cshtml) - first-name - string TestViewComponentTagHelper.firstName - HtmlAttributeValueStyle.DoubleQuotes
+                        CSharpExpression - (83:5,22 [3] ViewComponentTagHelper.cshtml)
+                            IntermediateToken - (83:5,22 [3] ViewComponentTagHelper.cshtml) - CSharp - foo
+                    PreallocatedTagHelperProperty - (93:5,32 [6] ViewComponentTagHelper.cshtml) - __tagHelperAttribute_0 - bar - Bar
+                    DefaultTagHelperExecute - 
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            ViewComponentTagHelper - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml
new file mode 100644
index 0000000000..eaf33e48ec
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml
@@ -0,0 +1,2 @@
+@namespace Test.Namespace
+<h1>Hi There!</h1>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs
new file mode 100644
index 0000000000..209d3361f0
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.cs
@@ -0,0 +1,48 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test.Namespace
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml"
+global::System.Object __typeHelper = nameof(Test.Namespace);
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt
new file mode 100644
index 0000000000..42d53bcd1b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt
@@ -0,0 +1,43 @@
+Document - 
+    NamespaceDeclaration -  - Test.Namespace
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (11:0,11 [14] ViewWithNamespace.cshtml) - Test.Namespace
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                HtmlContent - (27:1,0 [20] ViewWithNamespace.cshtml)
+                    IntermediateToken - (27:1,0 [4] ViewWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (31:1,4 [9] ViewWithNamespace.cshtml) - Html - Hi There!
+                    IntermediateToken - (40:1,13 [5] ViewWithNamespace.cshtml) - Html - </h1>
+                    IntermediateToken - (45:1,18 [2] ViewWithNamespace.cshtml) - Html - \n
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt
new file mode 100644
index 0000000000..2b7a295e01
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (11:0,11 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml)
+|Test.Namespace|
+Generated Location: (818:19,44 [14] )
+|Test.Namespace|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs
new file mode 100644
index 0000000000..fb4ec5e55e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs
@@ -0,0 +1,39 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "471b74bb73c8ae8e0ed24c654340198b9b4a1ec8"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml", typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace))]
+namespace Test.Namespace
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"471b74bb73c8ae8e0ed24c654340198b9b4a1ec8", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(27, 20, true);
+            WriteLiteral("<h1>Hi There!</h1>\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
new file mode 100644
index 0000000000..471464c580
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
@@ -0,0 +1,29 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace.cshtml", typeof(Test.Namespace.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace))]
+    NamespaceDeclaration -  - Test.Namespace
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - BeginContext(27, 20, true);
+                HtmlContent - (27:1,0 [20] ViewWithNamespace.cshtml)
+                    IntermediateToken - (27:1,0 [4] ViewWithNamespace.cshtml) - Html - <h1>
+                    IntermediateToken - (31:1,4 [9] ViewWithNamespace.cshtml) - Html - Hi There!
+                    IntermediateToken - (40:1,13 [5] ViewWithNamespace.cshtml) - Html - </h1>
+                    IntermediateToken - (45:1,18 [2] ViewWithNamespace.cshtml) - Html - \n
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - EndContext();
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml
new file mode 100644
index 0000000000..f4e110d289
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml
@@ -0,0 +1 @@
+@inject IHtmlHelper<TModel> Helper
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
new file mode 100644
index 0000000000..1f60d924cc
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace AspNetCore
+{
+    #line hidden
+    using TModel = global::System.Object;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml"
+IHtmlHelper<TModel> __typeHelper = default(IHtmlHelper<TModel>);
+
+#line default
+#line hidden
+        }
+        ))();
+        ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml"
+global::System.Object Helper = null;
+
+#line default
+#line hidden
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public IHtmlHelper<dynamic> Helper { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt
new file mode 100644
index 0000000000..b677049ce1
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt
@@ -0,0 +1,40 @@
+Document - 
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective -  - TModel = global::System.Object
+        UsingDirective - (1:0,1 [12] ) - System
+        UsingDirective - (16:1,1 [32] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [17] ) - System.Linq
+        UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            DesignTimeDirective - 
+                DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
+                DirectiveToken - (294:7,71 [4] ) - Html
+                DirectiveToken - (308:8,8 [54] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper
+                DirectiveToken - (363:8,63 [4] ) - Json
+                DirectiveToken - (377:9,8 [53] ) - global::Microsoft.AspNetCore.Mvc.IViewComponentHelper
+                DirectiveToken - (431:9,62 [9] ) - Component
+                DirectiveToken - (450:10,8 [43] ) - global::Microsoft.AspNetCore.Mvc.IUrlHelper
+                DirectiveToken - (494:10,52 [3] ) - Url
+                DirectiveToken - (507:11,8 [70] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider
+                DirectiveToken - (578:11,79 [23] ) - ModelExpressionProvider
+                DirectiveToken - (617:12,14 [96] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (729:13,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (832:14,14 [87] ) - Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor
+                DirectiveToken - (8:0,8 [19] _ViewImports.cshtml) - IHtmlHelper<TModel>
+                DirectiveToken - (28:0,28 [6] _ViewImports.cshtml) - Helper
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
new file mode 100644
index 0000000000..dc03ca32da
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (8:0,8 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml)
+|IHtmlHelper<TModel>|
+Generated Location: (760:19,0 [19] )
+|IHtmlHelper<TModel>|
+
+Source Location: (28:0,28 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml)
+|Helper|
+Generated Location: (1027:27,22 [6] )
+|Helper|
+
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs
new file mode 100644
index 0000000000..346428fa0d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.codegen.cs
@@ -0,0 +1,38 @@
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "74c90591b68437a0868e91dc714ea9827ab8e03a"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports))]
+namespace AspNetCore
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"74c90591b68437a0868e91dc714ea9827ab8e03a", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml")]
+    public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public IHtmlHelper<dynamic> Helper { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt
new file mode 100644
index 0000000000..addc2754ec
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt
@@ -0,0 +1,21 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml", typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports))]
+    NamespaceDeclaration -  - AspNetCore
+        UsingDirective - (1:0,1 [14] ) - System
+        UsingDirective - (16:1,1 [34] ) - System.Collections.Generic
+        UsingDirective - (51:2,1 [19] ) - System.Linq
+        UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc
+        UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering
+        UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
+            MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
+            Inject - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs
similarity index 100%
rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs
rename to src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml
similarity index 100%
rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml
rename to src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.cshtml
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt
similarity index 100%
rename from src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt
rename to src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ViewComponentTagHelperDescriptorFactoryTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ViewComponentTagHelperDescriptorFactoryTest.cs
new file mode 100644
index 0000000000..d27fdb3129
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ViewComponentTagHelperDescriptorFactoryTest.cs
@@ -0,0 +1,485 @@
+// 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.Collections.Generic;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class ViewComponentTagHelperDescriptorFactoryTest
+    {
+        private static readonly Assembly _assembly = typeof(ViewComponentTagHelperDescriptorFactoryTest).GetTypeInfo().Assembly;
+
+        [Fact]
+        public void CreateDescriptor_UnderstandsStringParameters()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(StringParameterViewComponent).FullName);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__StringParameterViewComponentTagHelper",
+                typeof(StringParameterViewComponent).GetTypeInfo().Assembly.GetName().Name)
+                .TypeName("__Generated__StringParameterViewComponentTagHelper")
+                .DisplayName("StringParameterViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:string-parameter")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("foo"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("bar")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("foo")
+                    .PropertyName("foo")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string StringParameterViewComponentTagHelper.foo"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bar")
+                    .PropertyName("bar")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string StringParameterViewComponentTagHelper.bar"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "StringParameter")
+                .Build();
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_UnderstandsVariousParameterTypes()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(VariousParameterViewComponent).FullName);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__VariousParameterViewComponentTagHelper",
+                typeof(VariousParameterViewComponent).GetTypeInfo().Assembly.GetName().Name)
+                .TypeName("__Generated__VariousParameterViewComponentTagHelper")
+                .DisplayName("VariousParameterViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:various-parameter")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("test-enum"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("test-string"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("baz")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("test-enum")
+                    .PropertyName("testEnum")
+                    .TypeName(typeof(VariousParameterViewComponent).FullName + "." + nameof(VariousParameterViewComponent.TestEnum))
+                    .AsEnum()
+                    .DisplayName(typeof(VariousParameterViewComponent).FullName + "." + nameof(VariousParameterViewComponent.TestEnum) + " VariousParameterViewComponentTagHelper.testEnum"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("test-string")
+                    .PropertyName("testString")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string VariousParameterViewComponentTagHelper.testString"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("baz")
+                    .PropertyName("baz")
+                    .TypeName(typeof(int).FullName)
+                    .DisplayName("int VariousParameterViewComponentTagHelper.baz"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "VariousParameter")
+                .Build();
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_UnderstandsGenericParameters()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(GenericParameterViewComponent).FullName);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__GenericParameterViewComponentTagHelper",
+                typeof(GenericParameterViewComponent).GetTypeInfo().Assembly.GetName().Name)
+                .TypeName("__Generated__GenericParameterViewComponentTagHelper")
+                .DisplayName("GenericParameterViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:generic-parameter")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("foo")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("foo")
+                    .PropertyName("Foo")
+                    .TypeName("System.Collections.Generic.List<System.String>")
+                    .DisplayName("System.Collections.Generic.List<System.String> GenericParameterViewComponentTagHelper.Foo"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bar")
+                    .PropertyName("Bar")
+                    .TypeName("System.Collections.Generic.Dictionary<System.String, System.Int32>")
+                    .AsDictionaryAttribute("bar-", typeof(int).FullName)
+                    .DisplayName("System.Collections.Generic.Dictionary<System.String, System.Int32> GenericParameterViewComponentTagHelper.Bar"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "GenericParameter")
+                .Build();
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForSyncViewComponentWithInvokeInBaseType_Works()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__SyncDerivedViewComponentTagHelper",
+                typeof(SyncDerivedViewComponent).GetTypeInfo().Assembly.GetName().Name)
+                .TypeName("__Generated__SyncDerivedViewComponentTagHelper")
+                .DisplayName("SyncDerivedViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:sync-derived")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("foo"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("bar")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("foo")
+                    .PropertyName("foo")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string SyncDerivedViewComponentTagHelper.foo"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bar")
+                    .PropertyName("bar")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string SyncDerivedViewComponentTagHelper.bar"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "SyncDerived")
+                .Build();
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(SyncDerivedViewComponent).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForAsyncViewComponentWithInvokeInBaseType_Works()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__AsyncDerivedViewComponentTagHelper",
+                typeof(AsyncDerivedViewComponent).Assembly.GetName().Name)
+                .TypeName("__Generated__AsyncDerivedViewComponentTagHelper")
+                .DisplayName("AsyncDerivedViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("vc:async-derived"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "AsyncDerived")
+                .Build();
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncDerivedViewComponent).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Equal(expectedDescriptor, descriptor, TagHelperDescriptorComparer.CaseSensitive);
+        }
+
+        [Fact]
+        public void CreateDescriptor_AddsDiagnostic_ForViewComponentWithNoInvokeMethod()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(ViewComponentWithoutInvokeMethod).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_CannotFindMethod.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_AddsDiagnostic_ForViewComponentWithNoInstanceInvokeMethod()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(StaticInvokeAsyncViewComponent).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_CannotFindMethod.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_AddsDiagnostic_ForViewComponentWithNoPublicInvokeMethod()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(NonPublicInvokeAsyncViewComponent).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_CannotFindMethod.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvokeAsync_UnderstandsGenericTask()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncViewComponentWithGenericTask).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Empty(descriptor.GetAllDiagnostics());
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvokeAsync_UnderstandsNonGenericTask()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncViewComponentWithNonGenericTask).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            Assert.Empty(descriptor.GetAllDiagnostics());
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvokeAsync_DoesNotUnderstandVoid()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncViewComponentWithString).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_AsyncMethod_ShouldReturnTask.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvokeAsync_DoesNotUnderstandString()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(AsyncViewComponentWithString).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_AsyncMethod_ShouldReturnTask.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvoke_DoesNotUnderstandVoid()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(SyncViewComponentWithVoid).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_SyncMethod_ShouldReturnValue.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvoke_DoesNotUnderstandNonGenericTask()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(SyncViewComponentWithNonGenericTask).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_SyncMethod_CannotReturnTask.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponentWithInvoke_DoesNotUnderstandGenericTask()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(SyncViewComponentWithGenericTask).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_SyncMethod_CannotReturnTask.Id, diagnostic.Id);
+        }
+
+        [Fact]
+        public void CreateDescriptor_ForViewComponent_WithAmbiguousMethods()
+        {
+            // Arrange
+            var testCompilation = TestCompilation.Create(_assembly);
+            var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
+
+            var viewComponent = testCompilation.GetTypeByMetadataName(typeof(DerivedViewComponentWithAmbiguity).FullName);
+
+            // Act
+            var descriptor = factory.CreateDescriptor(viewComponent);
+
+            // Assert
+            var diagnostic = Assert.Single(descriptor.GetAllDiagnostics());
+            Assert.Equal(RazorExtensionsDiagnosticFactory.ViewComponent_AmbiguousMethods.Id, diagnostic.Id);
+        }
+    }
+
+    public class StringParameterViewComponent
+    {
+        public string Invoke(string foo, string bar) => null;
+    }
+
+    public class VariousParameterViewComponent
+    {
+        public string Invoke(TestEnum testEnum, string testString, int baz = 5) => null;
+
+        public enum TestEnum
+        {
+            A = 1,
+            B = 2,
+            C = 3
+        }
+    }
+
+    public class GenericParameterViewComponent
+    {
+        public string Invoke(List<string> Foo, Dictionary<string, int> Bar) => null;
+    }
+
+    public class ViewComponentWithoutInvokeMethod
+    {
+    }
+
+    public class AsyncViewComponentWithGenericTask
+    {
+        public Task<string> InvokeAsync() => null;
+    }
+
+    public class AsyncViewComponentWithNonGenericTask
+    {
+        public Task InvokeAsync() => null;
+    }
+
+    public class AsyncViewComponentWithVoid
+    {
+        public void InvokeAsync() { }
+    }
+
+    public class AsyncViewComponentWithString
+    {
+        public string InvokeAsync() => null;
+    }
+
+    public class SyncViewComponentWithVoid
+    {
+        public void Invoke() { }
+    }
+
+    public class SyncViewComponentWithNonGenericTask
+    {
+        public Task Invoke() => null;
+    }
+
+    public class SyncViewComponentWithGenericTask
+    {
+        public Task<string> Invoke() => null;
+    }
+
+    public class SyncDerivedViewComponent : StringParameterViewComponent
+    {
+    }
+
+    public class AsyncDerivedViewComponent : AsyncViewComponentWithNonGenericTask
+    {
+    }
+
+    public class DerivedViewComponentWithAmbiguity : AsyncViewComponentWithNonGenericTask
+    {
+        public string Invoke() => null;
+    }
+
+    public class StaticInvokeAsyncViewComponent
+    {
+        public static Task<string> InvokeAsync() => null;
+    }
+
+    public class NonPublicInvokeAsyncViewComponent
+    {
+        protected Task<string> InvokeAsync() => null;
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ViewComponentTagHelperDescriptorProviderTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ViewComponentTagHelperDescriptorProviderTest.cs
new file mode 100644
index 0000000000..6c15d62a1f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ViewComponentTagHelperDescriptorProviderTest.cs
@@ -0,0 +1,72 @@
+// 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.IO;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Razor;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    // This is just a basic integration test. There are detailed tests for the VCTH visitor and descriptor factory.
+    public class ViewComponentTagHelperDescriptorProviderTest
+    {
+        [Fact]
+        public void DescriptorProvider_FindsVCTH()
+        {
+            // Arrange
+            var code = @"
+        public class StringParameterViewComponent
+        {
+            public string Invoke(string foo, string bar) => null;
+        }
+";
+
+            var compilation = MvcShim.BaseCompilation.AddSyntaxTrees(CSharpSyntaxTree.ParseText(code));
+
+            var context = TagHelperDescriptorProviderContext.Create();
+            context.SetCompilation(compilation);
+
+            var provider = new ViewComponentTagHelperDescriptorProvider()
+            {
+                Engine = RazorProjectEngine.CreateEmpty().Engine,
+            };
+
+            var expectedDescriptor = TagHelperDescriptorBuilder.Create(
+                ViewComponentTagHelperConventions.Kind,
+                "__Generated__StringParameterViewComponentTagHelper",
+                TestCompilation.AssemblyName)
+                .TypeName("__Generated__StringParameterViewComponentTagHelper")
+                .DisplayName("StringParameterViewComponentTagHelper")
+                .TagMatchingRuleDescriptor(rule =>
+                    rule
+                    .RequireTagName("vc:string-parameter")
+                    .RequireAttributeDescriptor(attribute => attribute.Name("foo"))
+                    .RequireAttributeDescriptor(attribute => attribute.Name("bar")))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("foo")
+                    .PropertyName("foo")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string StringParameterViewComponentTagHelper.foo"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                    .Name("bar")
+                    .PropertyName("bar")
+                    .TypeName(typeof(string).FullName)
+                    .DisplayName("string StringParameterViewComponentTagHelper.bar"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "StringParameter")
+                .Build();
+
+            // Act
+            provider.Execute(context);
+
+            // Assert
+            Assert.Single(context.Results, d => TagHelperDescriptorComparer.CaseSensitive.Equals(d, expectedDescriptor));
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ViewComponentTagHelperPassTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ViewComponentTagHelperPassTest.cs
new file mode 100644
index 0000000000..00330a4eef
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ViewComponentTagHelperPassTest.cs
@@ -0,0 +1,275 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class ViewComponentTagHelperPassTest
+    {
+        [Fact]
+        public void ViewComponentTagHelperPass_Execute_IgnoresRegularTagHelper()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper TestTagHelper, TestAssembly
+<p foo=""17"">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
+                    .TypeName("TestTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .Name("Foo")
+                        .TypeName("System.Int32"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .Build()
+            };
+
+            var projectEngine = CreateProjectEngine(tagHelpers);
+            var pass = new ViewComponentTagHelperPass()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var @class = FindClassNode(irDocument);
+            Assert.Equal(3, @class.Children.Count); // No class node created for a VCTH
+            for (var i = 0; i < @class.Children.Count; i++)
+            {
+                Assert.IsNotType<ViewComponentTagHelperIntermediateNode>(@class.Children[i]);
+            }
+        }
+
+        [Fact]
+        public void ViewComponentTagHelperPass_Execute_CreatesViewComponentTagHelper()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper TestTagHelper, TestAssembly
+<tagcloud foo=""17"">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                    .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .Name("Foo")
+                        .TypeName("System.Int32")
+                        .PropertyName("Foo"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                    .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                    .Build()
+            };
+
+            var projectEngine = CreateProjectEngine(tagHelpers);
+            var pass = new ViewComponentTagHelperPass()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+
+            var vcthFullName = "AspNetCore.test.__Generated__TagCloudViewComponentTagHelper";
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            Assert.Equal(vcthFullName, Assert.IsType<DefaultTagHelperCreateIntermediateNode>(tagHelper.Children[1]).TypeName);
+            Assert.Equal("Foo", Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(tagHelper.Children[2]).PropertyName);
+
+
+            var @class = FindClassNode(irDocument);
+            Assert.Equal(4, @class.Children.Count);
+
+            Assert.IsType<ViewComponentTagHelperIntermediateNode>(@class.Children.Last());
+        }
+
+        [Fact]
+        public void ViewComponentTagHelperPass_Execute_CreatesViewComponentTagHelper_WithIndexer()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper TestTagHelper, TestAssembly
+<tagcloud tag-foo=""17"">");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                    .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .Name("Foo")
+                        .TypeName("System.Collections.Generic.Dictionary<System.String, System.Int32>")
+                        .PropertyName("Tags")
+                        .AsDictionaryAttribute("foo-", "System.Int32"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                    .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                    .Build()
+            };
+
+            var projectEngine = CreateProjectEngine(tagHelpers);
+            var pass = new ViewComponentTagHelperPass()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+
+            var vcthFullName = "AspNetCore.test.__Generated__TagCloudViewComponentTagHelper";
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var tagHelper = FindTagHelperNode(irDocument);
+            Assert.Equal(vcthFullName, Assert.IsType<DefaultTagHelperCreateIntermediateNode>(tagHelper.Children[1]).TypeName);
+            Assert.IsType<DefaultTagHelperHtmlAttributeIntermediateNode>(tagHelper.Children[2]);
+
+            var @class = FindClassNode(irDocument);
+            Assert.Equal(4, @class.Children.Count);
+
+            Assert.IsType<ViewComponentTagHelperIntermediateNode>(@class.Children[3]);
+        }
+
+        [Fact]
+        public void ViewComponentTagHelperPass_Execute_CreatesViewComponentTagHelper_Nested()
+        {
+            // Arrange
+            var codeDocument = CreateDocument(@"
+@addTagHelper *, TestAssembly
+<p foo=""17""><tagcloud foo=""17""></p>");
+
+            var tagHelpers = new[]
+            {
+                TagHelperDescriptorBuilder.Create("PTestTagHelper", "TestAssembly")
+                    .TypeName("PTestTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .PropertyName("Foo")
+                        .Name("Foo")
+                        .TypeName("System.Int32"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"))
+                    .Build(),
+                TagHelperDescriptorBuilder.Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                    .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                    .BoundAttributeDescriptor(attribute => attribute
+                        .PropertyName("Foo")
+                        .Name("Foo")
+                        .TypeName("System.Int32"))
+                    .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                    .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                    .Build()
+            };
+
+            var projectEngine = CreateProjectEngine(tagHelpers);
+            var pass = new ViewComponentTagHelperPass()
+            {
+                Engine = projectEngine.Engine,
+            };
+
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            
+            var vcthFullName = "AspNetCore.test.__Generated__TagCloudViewComponentTagHelper";
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            var outerTagHelper = FindTagHelperNode(irDocument);
+            Assert.Equal("PTestTagHelper", Assert.IsType<DefaultTagHelperCreateIntermediateNode>(outerTagHelper.Children[1]).TypeName);
+            Assert.Equal("Foo", Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(outerTagHelper.Children[2]).PropertyName);
+
+            var vcth = FindTagHelperNode(outerTagHelper.Children[0]);
+            Assert.Equal(vcthFullName, Assert.IsType<DefaultTagHelperCreateIntermediateNode>(vcth.Children[1]).TypeName);
+            Assert.Equal("Foo", Assert.IsType<DefaultTagHelperPropertyIntermediateNode>(vcth.Children[2]).PropertyName);
+
+
+            var @class = FindClassNode(irDocument);
+            Assert.Equal(5, @class.Children.Count);
+
+            Assert.IsType<ViewComponentTagHelperIntermediateNode>(@class.Children.Last());
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return RazorCodeDocument.Create(source);
+        }
+
+        private RazorProjectEngine CreateProjectEngine(params TagHelperDescriptor[] tagHelpers)
+        {
+            return RazorProjectEngine.Create(b =>
+            {
+                b.Features.Add(new MvcViewDocumentClassifierPass());
+
+                b.Features.Add(new TestTagHelperFeature(tagHelpers));
+            });
+        }
+
+        private DocumentIntermediateNode CreateIRDocument(RazorProjectEngine projectEngine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < projectEngine.Phases.Count; i++)
+            {
+                var phase = projectEngine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorDirectiveClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            // We also expect the default tag helper pass to run first.
+            var documentNode = codeDocument.GetDocumentIntermediateNode();
+
+            var defaultTagHelperPass = projectEngine.EngineFeatures.OfType<DefaultTagHelperOptimizationPass>().Single();
+            defaultTagHelperPass.Execute(codeDocument, documentNode);
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private ClassDeclarationIntermediateNode FindClassNode(IntermediateNode node)
+        {
+            var visitor = new ClassDeclarationNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private TagHelperIntermediateNode FindTagHelperNode(IntermediateNode node)
+        {
+            var visitor = new TagHelperNodeVisitor();
+            visitor.Visit(node);
+            return visitor.Node;
+        }
+
+        private class ClassDeclarationNodeVisitor : IntermediateNodeWalker
+        {
+            public ClassDeclarationIntermediateNode Node { get; set; }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+
+        private class TagHelperNodeVisitor : IntermediateNodeWalker
+        {
+            public TagHelperIntermediateNode Node { get; set; }
+
+            public override void VisitTagHelper(TagHelperIntermediateNode node)
+            {
+                Node = node;
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ViewComponentTagHelperTargetExtensionTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ViewComponentTagHelperTargetExtensionTest.cs
new file mode 100644
index 0000000000..c5c148b6a5
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ViewComponentTagHelperTargetExtensionTest.cs
@@ -0,0 +1,120 @@
+// 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 Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class ViewComponentTagHelperTargetExtensionTest
+    {
+        [Fact]
+        public void WriteViewComponentTagHelper_GeneratesViewComponentTagHelper()
+        {
+            // Arrange
+            var tagHelper = TagHelperDescriptorBuilder
+                .Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                .BoundAttributeDescriptor(attribute => attribute
+                    .Name("Foo")
+                    .TypeName("System.Int32")
+                    .PropertyName("Foo"))
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                .Build();
+
+            var extension = new ViewComponentTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var node = new ViewComponentTagHelperIntermediateNode()
+            {
+                ClassName = "__Generated__TagCloudViewComponentTagHelper",
+                TagHelper = tagHelper
+            };
+
+            // Act
+            extension.WriteViewComponentTagHelper(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+                @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
+public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
+{
+    private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+    public __Generated__TagCloudViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
+    {
+        _helper = helper;
+    }
+    [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
+    public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
+    public System.Int32 Foo { get; set; }
+    public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+    {
+        (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+        var content = await _helper.InvokeAsync(""TagCloud"", new { Foo });
+        output.TagName = null;
+        output.Content.SetHtmlContent(content);
+    }
+}
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public void WriteViewComponentTagHelper_GeneratesViewComponentTagHelper_WithIndexer()
+        {
+            // Arrange
+            var tagHelper = TagHelperDescriptorBuilder
+                .Create(ViewComponentTagHelperConventions.Kind, "TestTagHelper", "TestAssembly")
+                .TypeName("__Generated__TagCloudViewComponentTagHelper")
+                .BoundAttributeDescriptor(attribute => attribute
+                    .Name("Foo")
+                    .TypeName("System.Collections.Generic.Dictionary<System.String, System.Int32>")
+                    .PropertyName("Tags")
+                    .AsDictionaryAttribute("foo-", "System.Int32"))
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("tagcloud"))
+                .AddMetadata(ViewComponentTagHelperMetadata.Name, "TagCloud")
+                .Build();
+
+            var extension = new ViewComponentTagHelperTargetExtension();
+            var context = TestCodeRenderingContext.CreateRuntime();
+            var node = new ViewComponentTagHelperIntermediateNode()
+            {
+                ClassName = "__Generated__TagCloudViewComponentTagHelper",
+                TagHelper = tagHelper
+            };
+
+            // Act
+            extension.WriteViewComponentTagHelper(context, node);
+
+            // Assert
+            var csharp = context.CodeWriter.GenerateCode();
+            Assert.Equal(
+                @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
+public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
+{
+    private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+    public __Generated__TagCloudViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
+    {
+        _helper = helper;
+    }
+    [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
+    public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
+    public System.Collections.Generic.Dictionary<System.String, System.Int32> Tags { get; set; }
+     = new System.Collections.Generic.Dictionary<System.String, System.Int32>();
+    public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+    {
+        (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+        var content = await _helper.InvokeAsync(""TagCloud"", new { Tags });
+        output.TagName = null;
+        output.Content.SetHtmlContent(content);
+    }
+}
+",
+                csharp,
+                ignoreLineEndingDifferences: true);
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ViewComponentTypeVisitorTest.cs b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ViewComponentTypeVisitorTest.cs
new file mode 100644
index 0000000000..206b74375d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/ViewComponentTypeVisitorTest.cs
@@ -0,0 +1,202 @@
+// 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;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
+{
+    public class ViewComponentTypeVisitorTest
+    {
+        private static readonly Assembly _assembly = typeof(ViewComponentTypeVisitorTest).GetTypeInfo().Assembly;
+
+        private static Compilation Compilation { get; } = TestCompilation.Create(_assembly);
+
+        // In practice MVC will provide a marker attribute for ViewComponents. To prevent a circular reference between MVC and Razor
+        // we can use a test class as a marker.
+        private static INamedTypeSymbol TestViewComponentAttributeSymbol { get; } = Compilation.GetTypeByMetadataName(typeof(TestViewComponentAttribute).FullName);
+        private static INamedTypeSymbol TestNonViewComponentAttributeSymbol { get; } = Compilation.GetTypeByMetadataName(typeof(TestNonViewComponentAttribute).FullName);
+
+        [Fact]
+        public void IsViewComponent_PlainViewComponent_ReturnsTrue()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Valid_PlainViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.True(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_DecoratedViewComponent_ReturnsTrue()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Valid_DecoratedVC).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.True(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_InheritedViewComponent_ReturnsTrue()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Valid_InheritedVC).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.True(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_AbstractViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_AbstractViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_GenericViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_GenericViewComponent<>).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_InternalViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_InternalViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_DecoratedNonViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_DecoratedViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        [Fact]
+        public void IsViewComponent_InheritedNonViewComponent_ReturnsFalse()
+        {
+            // Arrange
+            var testVisitor = new ViewComponentTypeVisitor(
+                TestViewComponentAttributeSymbol,
+                TestNonViewComponentAttributeSymbol,
+                new List<INamedTypeSymbol>());
+            var tagHelperSymbol = Compilation.GetTypeByMetadataName(typeof(Invalid_InheritedViewComponent).FullName);
+
+            // Act
+            var isViewComponent = testVisitor.IsViewComponent(tagHelperSymbol);
+
+            // Assert
+            Assert.False(isViewComponent);
+        }
+
+        public abstract class Invalid_AbstractViewComponent
+        {
+        }
+
+        public class Invalid_GenericViewComponent<T>
+        {
+        }
+
+        internal class Invalid_InternalViewComponent
+        {
+        }
+
+        public class Valid_PlainViewComponent
+        {
+        }
+
+        [TestViewComponent]
+        public class Valid_DecoratedVC
+        {
+        }
+
+        public class Valid_InheritedVC : Valid_DecoratedVC
+        {
+        }
+
+        [TestNonViewComponent]
+        public class Invalid_DecoratedViewComponent
+        {
+        }
+
+        [TestViewComponent]
+        public class Invalid_InheritedViewComponent : Invalid_DecoratedViewComponent
+        {
+        }
+
+        public class TestViewComponentAttribute : Attribute
+        {
+        }
+
+        public class TestNonViewComponentAttribute : Attribute
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/xunit.runner.json b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/xunit.runner.json
new file mode 100644
index 0000000000..fcf172c8fc
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/xunit.runner.json
@@ -0,0 +1,4 @@
+{
+  "methodDisplay": "method",
+  "shadowCopy": false
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Components/ComponentDocumentClassifierPassTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Components/ComponentDocumentClassifierPassTest.cs
new file mode 100644
index 0000000000..3b9ceb447b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Components/ComponentDocumentClassifierPassTest.cs
@@ -0,0 +1,207 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    public class ComponentDocumentClassifierPassTest
+    {
+        [Fact]
+        public void Execute_SetsDocumentKind()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.razor"));
+            codeDocument.SetInputDocumentKind(InputDocumentKind.Component);
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new ComponentDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+
+            // Assert
+            Assert.Equal(ComponentDocumentClassifierPass.ComponentDocumentKind, irDocument.DocumentKind);
+        }
+
+        [Fact]
+        public void ComponentDocumentClassifierPass_SetsNamespace()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "/MyApp/Test.razor", relativePath: "Test.razor");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+            codeDocument.SetInputDocumentKind(InputDocumentKind.Component);
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new ComponentDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("MyApp", visitor.Namespace.Content);
+        }
+
+        [Fact]
+        public void ComponentDocumentClassifierPass_SetsClass()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: "/MyApp/Test.razor", relativePath: "Test.razor");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+            codeDocument.SetInputDocumentKind(InputDocumentKind.Component);
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new ComponentDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal($"global::{CodeGenerationConstants.RazorComponent.FullTypeName}", visitor.Class.BaseType);
+            Assert.Equal(new[] { "public", "sealed" }, visitor.Class.Modifiers);
+            Assert.Equal("Test", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void ComponentDocumentClassifierPass_UsesRelativePathToGenerateTypeNameAndNamespace()
+        {
+            // Arrange
+            var relativePath = "/Pages/Announcements/Banner.razor";
+            var properties = new RazorSourceDocumentProperties(filePath: $"/MyApp{relativePath}", relativePath: relativePath);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+            codeDocument.SetInputDocumentKind(InputDocumentKind.Component);
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new ComponentDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("Banner", visitor.Class.ClassName);
+            Assert.Equal("MyApp.Pages.Announcements", visitor.Namespace.Content);
+        }
+
+        [Fact]
+        public void ComponentDocumentClassifierPass_SanitizesClassName()
+        {
+            // Arrange
+            var properties = new RazorSourceDocumentProperties(filePath: @"x:\path.with+invalid-chars.razor", relativePath: "path.with+invalid-chars.razor");
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", properties));
+            codeDocument.SetInputDocumentKind(InputDocumentKind.Component);
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new ComponentDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal("path_with_invalid_chars", visitor.Class.ClassName);
+        }
+
+        [Fact]
+        public void ComponentDocumentClassifierPass_SetsUpMainMethod()
+        {
+            // Arrange
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "Test.razor"));
+            codeDocument.SetInputDocumentKind(InputDocumentKind.Component);
+
+            var projectEngine = CreateProjectEngine();
+            var irDocument = CreateIRDocument(projectEngine, codeDocument);
+            var pass = new ComponentDocumentClassifierPass
+            {
+                Engine = projectEngine.Engine
+            };
+
+            // Act
+            pass.Execute(codeDocument, irDocument);
+            var visitor = new Visitor();
+            visitor.Visit(irDocument);
+
+            // Assert
+            Assert.Equal(CodeGenerationConstants.RazorComponent.BuildRenderTree, visitor.Method.MethodName);
+            Assert.Equal("void", visitor.Method.ReturnType);
+            Assert.Equal(new[] { "public", "override" }, visitor.Method.Modifiers);
+        }
+
+        private static RazorProjectEngine CreateProjectEngine() => RazorProjectEngine.Create();
+
+        private static DocumentIntermediateNode CreateIRDocument(RazorProjectEngine projectEngine, RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < projectEngine.Phases.Count; i++)
+            {
+                var phase = projectEngine.Phases[i];
+                phase.Execute(codeDocument);
+
+                if (phase is IRazorIntermediateNodeLoweringPhase)
+                {
+                    break;
+                }
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private class Visitor : IntermediateNodeWalker
+        {
+            public NamespaceDeclarationIntermediateNode Namespace { get; private set; }
+
+            public ClassDeclarationIntermediateNode Class { get; private set; }
+
+            public MethodDeclarationIntermediateNode Method { get; private set; }
+
+            public override void VisitMethodDeclaration(MethodDeclarationIntermediateNode node)
+            {
+                Method = node;
+            }
+
+            public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node)
+            {
+                Namespace = node;
+                base.VisitNamespaceDeclaration(node);
+            }
+
+            public override void VisitClassDeclaration(ClassDeclarationIntermediateNode node)
+            {
+                Class = node;
+                base.VisitClassDeclaration(node);
+            }
+        }
+
+        private class TestComponentDocumentClassifierPass : ComponentDocumentClassifierPass
+        {
+            public new bool IsMatch(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+                => base.IsMatch(codeDocument, documentNode);
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIntermediateNodeLoweringPhaseIntegrationTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIntermediateNodeLoweringPhaseIntegrationTest.cs
index 32eaa5f743..4d008b89d9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIntermediateNodeLoweringPhaseIntegrationTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIntermediateNodeLoweringPhaseIntegrationTest.cs
@@ -465,7 +465,6 @@ namespace Microsoft.AspNetCore.Razor.Language
             {
                 builder?.Invoke(b);
 
-                FunctionsDirective.Register(b);
                 SectionDirective.Register(b);
                 b.AddTagHelpers(tagHelpers);
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorTagHelperBinderPhaseTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorTagHelperBinderPhaseTest.cs
index 65b5b49fe9..43c21817a9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorTagHelperBinderPhaseTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorTagHelperBinderPhaseTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language
@@ -45,8 +46,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             // Assert
             var rewrittenTree = codeDocument.GetSyntaxTree();
-            var directiveValue = rewrittenTree.Root.Children.OfType<Block>().First().Children.Last() as Span;
-            var chunkGenerator = Assert.IsType<AddTagHelperChunkGenerator>(directiveValue.ChunkGenerator);
+            var erroredNode = rewrittenTree.Root.DescendantNodes().First(n => n.GetSpanContext()?.ChunkGenerator is AddTagHelperChunkGenerator);
+            var chunkGenerator = Assert.IsType<AddTagHelperChunkGenerator>(erroredNode.GetSpanContext().ChunkGenerator);
             Assert.Equal(expectedDiagnostics, chunkGenerator.Diagnostics);
         }
 
@@ -84,8 +85,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             // Assert
             var rewrittenTree = codeDocument.GetSyntaxTree();
-            var directiveValue = rewrittenTree.Root.Children.OfType<Block>().First().Children.Last() as Span;
-            var chunkGenerator = Assert.IsType<RemoveTagHelperChunkGenerator>(directiveValue.ChunkGenerator);
+            var erroredNode = rewrittenTree.Root.DescendantNodes().First(n => n.GetSpanContext()?.ChunkGenerator is RemoveTagHelperChunkGenerator);
+            var chunkGenerator = Assert.IsType<RemoveTagHelperChunkGenerator>(erroredNode.GetSpanContext().ChunkGenerator);
             Assert.Equal(expectedDiagnostics, chunkGenerator.Diagnostics);
         }
 
@@ -123,8 +124,8 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             // Assert
             var rewrittenTree = codeDocument.GetSyntaxTree();
-            var directiveValue = rewrittenTree.Root.Children.OfType<Block>().First().Children.Last() as Span;
-            var chunkGenerator = Assert.IsType<TagHelperPrefixDirectiveChunkGenerator>(directiveValue.ChunkGenerator);
+            var erroredNode = rewrittenTree.Root.DescendantNodes().First(n => n.GetSpanContext()?.ChunkGenerator is TagHelperPrefixDirectiveChunkGenerator);
+            var chunkGenerator = Assert.IsType<TagHelperPrefixDirectiveChunkGenerator>(erroredNode.GetSpanContext().ChunkGenerator);
             Assert.Equal(expectedDiagnostics, chunkGenerator.Diagnostics);
         }
 
@@ -162,13 +163,11 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             // Assert
             var rewrittenTree = codeDocument.GetSyntaxTree();
+            var descendantNodes = rewrittenTree.Root.DescendantNodes();
             Assert.Empty(rewrittenTree.Diagnostics);
-            Assert.Equal(3, rewrittenTree.Root.Children.Count);
-            var formTagHelper = Assert.IsType<TagHelperBlock>(rewrittenTree.Root.Children[2]);
-            Assert.Equal("form", formTagHelper.TagName);
-            Assert.Equal(3, formTagHelper.Children.Count);
-            var inputTagHelper = Assert.IsType<TagHelperBlock>(formTagHelper.Children[1]);
-            Assert.Equal("input", inputTagHelper.TagName);
+            var tagHelperNodes = descendantNodes.Where(n => n is MarkupTagHelperElementSyntax tagHelper).Cast<MarkupTagHelperElementSyntax>().ToArray();
+            Assert.Equal("form", tagHelperNodes[0].TagHelperInfo.TagName);
+            Assert.Equal("input", tagHelperNodes[1].TagHelperInfo.TagName);
         }
 
         [Fact]
@@ -204,13 +203,11 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             // Assert
             var rewrittenTree = codeDocument.GetSyntaxTree();
+            var descendantNodes = rewrittenTree.Root.DescendantNodes();
             Assert.Empty(rewrittenTree.Diagnostics);
-            Assert.Equal(3, rewrittenTree.Root.Children.Count);
-            var formTagHelper = Assert.IsType<TagHelperBlock>(rewrittenTree.Root.Children[2]);
-            Assert.Equal("form", formTagHelper.TagName);
-            Assert.Equal(3, formTagHelper.Children.Count);
-            var inputTagHelper = Assert.IsType<TagHelperBlock>(formTagHelper.Children[1]);
-            Assert.Equal("input", inputTagHelper.TagName);
+            var tagHelperNodes = descendantNodes.Where(n => n is MarkupTagHelperElementSyntax tagHelper).Cast<MarkupTagHelperElementSyntax>().ToArray();
+            Assert.Equal("form", tagHelperNodes[0].TagHelperInfo.TagName);
+            Assert.Equal("input", tagHelperNodes[1].TagHelperInfo.TagName);
         }
 
         [Fact]
@@ -246,13 +243,11 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             // Assert
             var rewrittenTree = codeDocument.GetSyntaxTree();
+            var descendantNodes = rewrittenTree.Root.DescendantNodes();
             Assert.Empty(rewrittenTree.Diagnostics);
-            Assert.Equal(3, rewrittenTree.Root.Children.Count);
-            var formTagHelper = Assert.IsType<TagHelperBlock>(rewrittenTree.Root.Children[2]);
-            Assert.Equal("form", formTagHelper.TagName);
-            Assert.Equal(3, formTagHelper.Children.Count);
-            var inputTagHelper = Assert.IsType<TagHelperBlock>(formTagHelper.Children[1]);
-            Assert.Equal("input", inputTagHelper.TagName);
+            var tagHelperNodes = descendantNodes.Where(n => n is MarkupTagHelperElementSyntax tagHelper).Cast<MarkupTagHelperElementSyntax>().ToArray();
+            Assert.Equal("form", tagHelperNodes[0].TagHelperInfo.TagName);
+            Assert.Equal("input", tagHelperNodes[1].TagHelperInfo.TagName);
         }
 
         [Fact]
@@ -288,10 +283,10 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             // Assert
             var rewrittenTree = codeDocument.GetSyntaxTree();
+            var descendantNodes = rewrittenTree.Root.DescendantNodes();
             Assert.Empty(rewrittenTree.Diagnostics);
-            Assert.Equal(7, rewrittenTree.Root.Children.Count);
-            var rewrittenNodes = rewrittenTree.Root.Children.OfType<TagHelperBlock>();
-            Assert.Empty(rewrittenNodes);
+            var tagHelperNodes = descendantNodes.Where(n => n is MarkupTagHelperElementSyntax tagHelper).Cast<MarkupTagHelperElementSyntax>().ToArray();
+            Assert.Empty(tagHelperNodes);
         }
 
         [Fact]
@@ -339,12 +334,13 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             // Assert
             var rewrittenTree = codeDocument.GetSyntaxTree();
+            var descendantNodes = rewrittenTree.Root.DescendantNodes();
             Assert.Empty(rewrittenTree.Diagnostics);
-            Assert.Equal(3, rewrittenTree.Root.Children.Count);
+            var tagHelperNodes = descendantNodes.Where(n => n is MarkupTagHelperElementSyntax tagHelper).Cast<MarkupTagHelperElementSyntax>().ToArray();
 
-            var formTagHelper = Assert.IsType<TagHelperBlock>(rewrittenTree.Root.Children[2]);
-            Assert.Equal("form", formTagHelper.TagName);
-            Assert.Equal(2, formTagHelper.Binding.GetBoundRules(descriptor).Count());
+            var formTagHelper = Assert.Single(tagHelperNodes);
+            Assert.Equal("form", formTagHelper.TagHelperInfo.TagName);
+            Assert.Equal(2, formTagHelper.TagHelperInfo.BindingResult.GetBoundRules(descriptor).Count());
         }
 
         [Fact]
@@ -392,12 +388,13 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             // Assert
             var rewrittenTree = codeDocument.GetSyntaxTree();
+            var descendantNodes = rewrittenTree.Root.DescendantNodes();
             Assert.Empty(rewrittenTree.Diagnostics);
-            Assert.Equal(3, rewrittenTree.Root.Children.Count);
+            var tagHelperNodes = descendantNodes.Where(n => n is MarkupTagHelperElementSyntax tagHelper).Cast<MarkupTagHelperElementSyntax>().ToArray();
 
-            var formTagHelper = Assert.IsType<TagHelperBlock>(rewrittenTree.Root.Children[2]);
-            Assert.Equal("form", formTagHelper.TagName);
-            Assert.Equal(2, formTagHelper.Binding.GetBoundRules(descriptor).Count());
+            var formTagHelper = Assert.Single(tagHelperNodes);
+            Assert.Equal("form", formTagHelper.TagHelperInfo.TagName);
+            Assert.Equal(2, formTagHelper.TagHelperInfo.BindingResult.GetBoundRules(descriptor).Count());
         }
 
         [Fact]
@@ -437,15 +434,12 @@ namespace Microsoft.AspNetCore.Razor.Language
 
             // Assert
             var rewrittenTree = codeDocument.GetSyntaxTree();
+            var descendantNodes = rewrittenTree.Root.DescendantNodes();
             Assert.Empty(rewrittenTree.Diagnostics);
-            Assert.Equal(3, rewrittenTree.Root.Children.Count);
-            var formTagHelper = Assert.IsType<TagHelperBlock>(rewrittenTree.Root.Children[2]);
-            Assert.Equal("form", formTagHelper.TagName);
-            Assert.Collection(
-                formTagHelper.Children,
-                node => Assert.IsNotType<TagHelperBlock>(node),
-                node => Assert.IsNotType<TagHelperBlock>(node),
-                node => Assert.IsNotType<TagHelperBlock>(node));
+            var tagHelperNodes = descendantNodes.Where(n => n is MarkupTagHelperElementSyntax tagHelper).Cast<MarkupTagHelperElementSyntax>().ToArray();
+
+            var formTagHelper = Assert.Single(tagHelperNodes);
+            Assert.Equal("form", formTagHelper.TagHelperInfo.TagName);
         }
 
         [Fact]
@@ -691,7 +685,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             var visitor = new DefaultRazorTagHelperBinderPhase.DirectiveVisitor(tagHelpers: new List<TagHelperDescriptor>());
 
             // Act
-            visitor.VisitBlock(syntaxTree.Root);
+            visitor.Visit(syntaxTree.Root);
 
             // Assert
             Assert.Equal(expectedPrefix, visitor.TagHelperPrefix);
@@ -857,7 +851,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             var visitor = new DefaultRazorTagHelperBinderPhase.DirectiveVisitor((TagHelperDescriptor[])tagHelpers);
 
             // Act
-            visitor.VisitBlock(syntaxTree.Root);
+            visitor.Visit(syntaxTree.Root);
 
             // Assert
             Assert.Equal(expected.Count(), visitor.Matches.Count());
@@ -1001,7 +995,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             var visitor = new DefaultRazorTagHelperBinderPhase.DirectiveVisitor((TagHelperDescriptor[])tagHelpers);
 
             // Act
-            visitor.VisitBlock(syntaxTree.Root);
+            visitor.Visit(syntaxTree.Root);
 
             // Assert
             Assert.Empty(visitor.Matches);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DirectiveTokenEditHandlerTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DirectiveTokenEditHandlerTest.cs
index 0ddfa731e4..1f0336d008 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DirectiveTokenEditHandlerTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/DirectiveTokenEditHandlerTest.cs
@@ -1,10 +1,10 @@
 // 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;
 using System.Collections.Generic;
-using System.Text;
+using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Test
@@ -18,11 +18,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Test
         public void CanAcceptChange_ProvisionallyAcceptsNonWhitespaceChanges(int index, int length, string newText)
         {
             // Arrange
-            var factory = new SpanFactory();
             var directiveTokenHandler = new TestDirectiveTokenEditHandler();
-            var target = factory.Span(SpanKindInternal.Code, "SomeNamespace", markup: false)
-                .With(directiveTokenHandler)
-                .Accepts(AcceptedCharactersInternal.NonWhiteSpace);
+            directiveTokenHandler.AcceptedCharacters = AcceptedCharactersInternal.NonWhitespace;
+
+            var target = GetSyntaxNode(directiveTokenHandler, "SomeNamespace");
+            
             var sourceChange = new SourceChange(index, length, newText);
 
             // Act
@@ -39,11 +39,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Test
         public void CanAcceptChange_RejectsWhitespaceChanges(int index, int length, string newText)
         {
             // Arrange
-            var factory = new SpanFactory();
             var directiveTokenHandler = new TestDirectiveTokenEditHandler();
-            var target = factory.Span(SpanKindInternal.Code, "Some Namespace", markup: false)
-                .With(directiveTokenHandler)
-                .Accepts(AcceptedCharactersInternal.NonWhiteSpace);
+            directiveTokenHandler.AcceptedCharacters = AcceptedCharactersInternal.NonWhitespace;
+
+            var target = GetSyntaxNode(directiveTokenHandler, "Some Namespace");
+
             var sourceChange = new SourceChange(index, length, newText);
 
             // Act
@@ -53,14 +53,34 @@ namespace Microsoft.AspNetCore.Razor.Language.Test
             Assert.Equal(PartialParseResultInternal.Rejected, result);
         }
 
+        private static CSharpStatementLiteralSyntax GetSyntaxNode(DirectiveTokenEditHandler editHandler, string content)
+        {
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
+            var tokens = CSharpLanguageCharacteristics.Instance.TokenizeString(content).ToArray();
+            foreach (var token in tokens)
+            {
+                builder.Add((SyntaxToken)token.CreateRed());
+            }
+            var node = SyntaxFactory.CSharpStatementLiteral(builder.ToList());
+
+            var context = new SpanContext(SpanChunkGenerator.Null, editHandler);
+
+            return node.WithSpanContext(context);
+        }
+
         private class TestDirectiveTokenEditHandler : DirectiveTokenEditHandler
         {
-            public TestDirectiveTokenEditHandler() : base(content => SpanConstructor.TestTokenizer(content))
+            public TestDirectiveTokenEditHandler() : base(content => TestTokenizer(content))
             {
             }
 
-            public new PartialParseResultInternal CanAcceptChange(Span target, SourceChange change)
+            public new PartialParseResultInternal CanAcceptChange(SyntaxNode target, SourceChange change)
                 => base.CanAcceptChange(target, change);
+
+            internal static IEnumerable<Syntax.InternalSyntax.SyntaxToken> TestTokenizer(string str)
+            {
+                yield return Syntax.InternalSyntax.SyntaxFactory.Token(SyntaxKind.Marker, str);
+            }
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/DesignTimeDirectiveTargetExtensionTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/DesignTimeDirectiveTargetExtensionTest.cs
index e06f7a5dcc..d8f65c3d7b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/DesignTimeDirectiveTargetExtensionTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/DesignTimeDirectiveTargetExtensionTest.cs
@@ -58,7 +58,11 @@ private void __RazorDirectiveTokenHelpers__() {
 @"#pragma warning disable 219
 private void __RazorDirectiveTokenHelpers__() {
 ((System.Action)(() => {
+#line 1 ""test.cshtml""
 System.String __typeHelper = default(System.String);
+
+#line default
+#line hidden
 }
 ))();
 }
@@ -93,7 +97,11 @@ System.String __typeHelper = default(System.String);
 @"#pragma warning disable 219
 private void __RazorDirectiveTokenHelpers__() {
 ((System.Action)(() => {
+#line 1 ""test.cshtml""
 global::System.Object __typeHelper = nameof(System.Collections.Generic);
+
+#line default
+#line hidden
 }
 ))();
 }
@@ -128,7 +136,11 @@ global::System.Object __typeHelper = nameof(System.Collections.Generic);
 @"#pragma warning disable 219
 private void __RazorDirectiveTokenHelpers__() {
 ((System.Action)(() => {
+#line 1 ""test.cshtml""
 global::System.Object Foo = null;
+
+#line default
+#line hidden
 }
 ))();
 }
@@ -170,11 +182,19 @@ global::System.Object Foo = null;
 @"#pragma warning disable 219
 private void __RazorDirectiveTokenHelpers__() {
 ((System.Action)(() => {
+#line 1 ""test.cshtml""
 global::System.Object __typeHelper = ""Value"";
+
+#line default
+#line hidden
 }
 ))();
 ((System.Action)(() => {
+#line 1 ""test.cshtml""
 global::System.Object __typeHelper = ""Value"";
+
+#line default
+#line hidden
 }
 ))();
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/FunctionsDirectivePassTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/FunctionsDirectivePassTest.cs
index 78e27786f4..06c8bd60e2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/FunctionsDirectivePassTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Extensions/FunctionsDirectivePassTest.cs
@@ -76,10 +76,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions
 
         private static RazorProjectEngine CreateProjectEngine()
         {
-            return RazorProjectEngine.Create(b =>
-            {
-                FunctionsDirective.Register(b);
-            });
+            return RazorProjectEngine.Create();
         }
 
         private static DocumentIntermediateNode Lower(RazorCodeDocument codeDocument, RazorProjectEngine projectEngine)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/HtmlNodeOptimizationPassTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/HtmlNodeOptimizationPassTest.cs
index 4ece47b0cd..bf08903e5a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/HtmlNodeOptimizationPassTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/HtmlNodeOptimizationPassTest.cs
@@ -4,33 +4,13 @@
 using System;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
     public class HtmlNodeOptimizationPassTest
     {
-        [Fact]
-        public void Execute_CollapsesConditionalAttributes()
-        {
-            // Assert
-            var content = "<input value='hello world' />";
-            var sourceDocument = TestRazorSourceDocument.Create(content);
-            var originalTree = RazorSyntaxTree.Parse(sourceDocument);
-            var pass = new HtmlNodeOptimizationPass();
-            var codeDocument = RazorCodeDocument.Create(sourceDocument);
-
-            // Act
-            var outputTree = pass.Execute(codeDocument, originalTree);
-
-            // Assert
-            var tag = Assert.Single(outputTree.Root.Children);
-            var tagBlock = Assert.IsType<Block>(tag);
-            Assert.Equal(BlockKindInternal.Tag, tagBlock.Type);
-            Assert.Equal(3, tagBlock.Children.Count);
-            Assert.IsType<Span>(tagBlock.Children[1]);
-        }
-
         [Fact]
         public void Execute_RewritesWhitespace()
         {
@@ -45,9 +25,11 @@ namespace Microsoft.AspNetCore.Razor.Language
             var outputTree = pass.Execute(codeDocument, originalTree);
 
             // Assert
-            Assert.Equal(4, outputTree.Root.Children.Count);
-            var whitespace = Assert.IsType<Span>(outputTree.Root.Children[1]);
-            Assert.True(whitespace.Content.All(char.IsWhiteSpace));
+            var document = Assert.IsType<RazorDocumentSyntax>(outputTree.Root);
+            var block = Assert.IsType<MarkupBlockSyntax>(document.Document);
+            Assert.Equal(4, block.Children.Count);
+            var whitespace = Assert.IsType<MarkupTextLiteralSyntax>(block.Children[1]);
+            Assert.True(whitespace.GetContent().All(char.IsWhiteSpace));
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/CodeGenerationIntegrationTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/CodeGenerationIntegrationTest.cs
index 6ead22dfae..bef1a254bb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/CodeGenerationIntegrationTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -10,7 +10,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 {
     public class CodeGenerationIntegrationTest : IntegrationTestBase
     {
-
+        public CodeGenerationIntegrationTest()
+            : base(generateBaselines: null)
+        {
+        }
+        
         #region Runtime
         [Fact]
         public void IncompleteDirectives_Runtime()
@@ -880,7 +884,6 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                 // Some of these tests use templates
                 builder.AddTargetExtension(new TemplateTargetExtension());
 
-                FunctionsDirective.Register(builder);
                 InheritsDirective.Register(builder);
                 SectionDirective.Register(builder);
             });
@@ -905,8 +908,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 
                 // Some of these tests use templates
                 builder.AddTargetExtension(new TemplateTargetExtension());
-
-                FunctionsDirective.Register(builder);
+                
                 InheritsDirective.Register(builder);
                 SectionDirective.Register(builder);
             });
@@ -931,7 +933,6 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                 // Some of these tests use templates
                 builder.AddTargetExtension(new TemplateTargetExtension());
 
-                FunctionsDirective.Register(builder);
                 InheritsDirective.Register(builder);
                 SectionDirective.Register(builder);
             });
@@ -957,7 +958,6 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                 // Some of these tests use templates
                 builder.AddTargetExtension(new TemplateTargetExtension());
 
-                FunctionsDirective.Register(builder);
                 InheritsDirective.Register(builder);
                 SectionDirective.Register(builder);
             });
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/ComponentIntegrationTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/ComponentIntegrationTest.cs
new file mode 100644
index 0000000000..9b68d1fb34
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/ComponentIntegrationTest.cs
@@ -0,0 +1,50 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Components;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
+{
+    public class ComponentIntegrationTest : IntegrationTestBase
+    {
+        public ComponentIntegrationTest()
+            : base(generateBaselines: null)
+        {
+            Configuration = RazorConfiguration.Default;
+            FileExtension = ".razor";
+        }
+
+        protected override RazorConfiguration Configuration { get; }
+
+        [Fact]
+        public void BasicTest()
+        {
+            var projectEngine = CreateProjectEngine(engine =>
+            {
+                engine.Features.Add(new InputDocumentKindClassifierPass());
+            });
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var codeDocument = projectEngine.Process(projectItem);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
+            AssertCSharpDocumentMatchesBaseline(codeDocument.GetCSharpDocument());
+        }
+
+        private class InputDocumentKindClassifierPass : RazorEngineFeatureBase, IRazorDocumentClassifierPass
+        {
+            // Run before other document classifiers
+            public int Order => -1000;
+
+            public void Execute(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+            {
+                codeDocument.SetInputDocumentKind(InputDocumentKind.Component);
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/ExtensibleDirectiveTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/ExtensibleDirectiveTest.cs
index e26ce3b6fd..11bfe9793e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/ExtensibleDirectiveTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/ExtensibleDirectiveTest.cs
@@ -8,6 +8,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
     // Extensible directives only have codegen for design time, so we're only testing that.
     public class ExtensibleDirectiveTest : IntegrationTestBase
     {
+        public ExtensibleDirectiveTest()
+            : base(generateBaselines: null)
+        {
+        }
+
         [Fact]
         public void NamespaceToken()
         {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/SuppressPrimaryMethodBodyntegrationTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/SuppressPrimaryMethodBodyntegrationTest.cs
new file mode 100644
index 0000000000..a008ca3f74
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/SuppressPrimaryMethodBodyntegrationTest.cs
@@ -0,0 +1,65 @@
+// 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 Microsoft.AspNetCore.Razor.Language.Components;
+using Microsoft.AspNetCore.Razor.Language.IntegrationTests;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class SuppressPrimaryMethodBodyIntegrationTest : IntegrationTestBase
+    {
+        public SuppressPrimaryMethodBodyIntegrationTest()
+            : base(generateBaselines: null)
+        {
+            Configuration = RazorConfiguration.Default;
+            FileExtension = ".razor";
+        }
+
+        protected override RazorConfiguration Configuration { get; }
+
+        [Fact]
+        public void BasicTest()
+        {
+            var engine = CreateProjectEngine(e =>
+            {
+                e.Features.Add(new SetSuppressPrimaryMethodBodyFeature());
+                e.Features.Add(new InputDocumentKindClassifierPass());
+            });
+
+            var projectItem = CreateProjectItemFromFile();
+
+            // Act
+            var codeDocument = engine.Process(projectItem);
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
+
+            var csharpDocument = codeDocument.GetCSharpDocument();
+            AssertCSharpDocumentMatchesBaseline(csharpDocument);
+            Assert.Empty(csharpDocument.Diagnostics);
+        }
+
+        private class SetSuppressPrimaryMethodBodyFeature : RazorEngineFeatureBase, IConfigureRazorCodeGenerationOptionsFeature
+        {
+            public int Order { get; set; }
+
+            public void Configure(RazorCodeGenerationOptionsBuilder options)
+            {
+                options.SuppressPrimaryMethodBody = true;
+            }
+        }
+
+        private class InputDocumentKindClassifierPass : RazorEngineFeatureBase, IRazorDocumentClassifierPass
+        {
+            // Run before other document classifiers
+            public int Order => -1000;
+
+            public void Execute(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
+            {
+                codeDocument.SetInputDocumentKind(InputDocumentKind.Component);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/TagHelpersIntegrationTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/TagHelpersIntegrationTest.cs
index c8cd0e4146..c5c9810e76 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/TagHelpersIntegrationTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/TagHelpersIntegrationTest.cs
@@ -94,6 +94,8 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             var codeDocument = projectEngine.Process(projectItem);
 
             // Assert
+            var syntaxTree = codeDocument.GetSyntaxTree();
+            var irTree = codeDocument.GetDocumentIntermediateNode();
             AssertDocumentNodeMatchesBaseline(codeDocument.GetDocumentIntermediateNode());
         }
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/BlockTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/BlockTest.cs
deleted file mode 100644
index d54ef401df..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/BlockTest.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-// 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.Linq;
-using Xunit;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    public class BlockTest
-    {
-        [Fact]
-        public void ChildChanged_NotifiesParent()
-        {
-            // Arrange
-            var spanBuilder = new SpanBuilder(SourceLocation.Zero);
-            spanBuilder.Accept(new HtmlToken("hello", HtmlTokenType.Text));
-            var span = spanBuilder.Build();
-            var blockBuilder = new BlockBuilder()
-            {
-                Type = BlockKindInternal.Markup,
-            };
-            blockBuilder.Children.Add(span);
-            var childBlock = blockBuilder.Build();
-            blockBuilder = new BlockBuilder()
-            {
-                Type = BlockKindInternal.Markup,
-            };
-            blockBuilder.Children.Add(childBlock);
-            var parentBlock = blockBuilder.Build();
-            var originalBlockLength = parentBlock.Length;
-            spanBuilder = new SpanBuilder(SourceLocation.Zero);
-            spanBuilder.Accept(new HtmlToken("hi", HtmlTokenType.Text));
-            span.ReplaceWith(spanBuilder);
-            
-            // Wire up parents now so we can re-trigger ChildChanged to cause cache refresh.
-            span.Parent = childBlock;
-            childBlock.Parent = parentBlock;
-
-            // Act
-            childBlock.ChildChanged();
-
-            // Assert
-            Assert.Equal(5, originalBlockLength);
-            Assert.Equal(2, parentBlock.Length);
-        }
-
-        [Fact]
-        public void Clone_ClonesBlock()
-        {
-            // Arrange
-            var blockBuilder = new BlockBuilder()
-            {
-                ChunkGenerator = new DynamicAttributeBlockChunkGenerator(new LocationTagged<string>("class=\"", SourceLocation.Zero), 0, 0, 0),
-                Type = BlockKindInternal.Expression,
-            };
-            blockBuilder.Children.Add(new SpanBuilder(new SourceLocation(1, 2, 3)).Build());
-            var block = blockBuilder.Build();
-
-            // Act
-            var copy = (Block)block.Clone();
-
-            // Assert
-            ParserTestBase.EvaluateParseTree(copy, block);
-            Assert.NotSame(block, copy);
-        }
-
-        [Fact]
-        public void ConstructorWithBlockBuilderSetsParent()
-        {
-            // Arrange
-            var builder = new BlockBuilder() { Type = BlockKindInternal.Comment };
-            var span = new SpanBuilder(SourceLocation.Undefined) { Kind = SpanKindInternal.Code }.Build();
-            builder.Children.Add(span);
-
-            // Act
-            var block = builder.Build();
-
-            // Assert
-            Assert.Same(block, span.Parent);
-        }
-
-        [Fact]
-        public void ConstructorTransfersInstanceOfChunkGeneratorFromBlockBuilder()
-        {
-            // Arrange
-            var expected = new ExpressionChunkGenerator();
-            var builder = new BlockBuilder()
-            {
-                Type = BlockKindInternal.Statement,
-                ChunkGenerator = expected
-            };
-
-            // Act
-            var actual = builder.Build();
-
-            // Assert
-            Assert.Same(expected, actual.ChunkGenerator);
-        }
-
-        [Fact]
-        public void ConstructorTransfersChildrenFromBlockBuilder()
-        {
-            // Arrange
-            var expected = new SpanBuilder(SourceLocation.Undefined) { Kind = SpanKindInternal.Code }.Build();
-            var builder = new BlockBuilder()
-            {
-                Type = BlockKindInternal.Statement
-            };
-            builder.Children.Add(expected);
-
-            // Act
-            var block = builder.Build();
-
-            // Assert
-            Assert.Same(expected, block.Children.Single());
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpCodeParserTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpCodeParserTest.cs
index ea86c72226..250eff4f40 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpCodeParserTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpCodeParserTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
@@ -205,9 +206,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
             var document = RazorSyntaxTree.Parse(source);
 
             // Assert
-            var directive = document.Root.Children.OfType<Block>().Last();
-            var erroredSpan = (Span)directive.Children.Last();
-            var chunkGenerator = Assert.IsType<TagHelperPrefixDirectiveChunkGenerator>(erroredSpan.ChunkGenerator);
+            var erroredNode = document.Root.DescendantNodes().Last(n => n.GetSpanContext()?.ChunkGenerator is TagHelperPrefixDirectiveChunkGenerator);
+            var chunkGenerator = Assert.IsType<TagHelperPrefixDirectiveChunkGenerator>(erroredNode.GetSpanContext().ChunkGenerator);
             var diagnostic = Assert.Single(chunkGenerator.Diagnostics);
             Assert.Equal(expectedDiagnostic, diagnostic);
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpLanguageCharacteristicsTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpLanguageCharacteristicsTest.cs
index e8eeb8c586..84802523b2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpLanguageCharacteristicsTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpLanguageCharacteristicsTest.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void GetSample_RightShiftAssign_ReturnsCorrectToken()
         {
             // Arrange & Act
-            var token = CSharpLanguageCharacteristics.Instance.GetSample(CSharpTokenType.RightShiftAssign);
+            var token = CSharpLanguageCharacteristics.Instance.GetSample(SyntaxKind.RightShiftAssign);
 
             // Assert
             Assert.Equal(">>=", token);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpRazorCommentsTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpRazorCommentsTest.cs
index bcc8974b86..1417356875 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpRazorCommentsTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpRazorCommentsTest.cs
@@ -33,6 +33,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             ParseDocumentTest("@foo(@*");
         }
 
+        [Fact]
+        public void RazorMultilineCommentInBlock()
+        {
+            ParseDocumentTest(@"
+@{
+    @*
+This is a comment
+    *@
+}
+");
+        }
+
         [Fact]
         public void RazorCommentInVerbatimBlock()
         {
@@ -42,6 +54,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                             + "}");
         }
 
+        [Fact]
+        public void RazorCommentInOpeningTagBlock()
+        {
+            ParseDocumentTest("<text @* razor comment *@></text>");
+        }
+
+        [Fact]
+        public void RazorCommentInClosingTagBlock()
+        {
+            ParseDocumentTest("<text></text @* razor comment *@>");
+        }
+
         [Fact]
         public void UnterminatedRazorCommentInVerbatimBlock()
         {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpSectionTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpSectionTest.cs
index 52bca860e1..c4221e5015 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpSectionTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpSectionTest.cs
@@ -139,15 +139,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace()
         {
             // ParseSectionBlockReportsErrorAndAcceptsWhitespaceToEndOfLineIfSectionNotFollowedByOpenBrace
-            // Arrange
-            var chunkGenerator = new DirectiveChunkGenerator(SectionDirective.Directive);
-            chunkGenerator.Diagnostics.Add(
-                RazorDiagnosticFactory.CreateParsing_UnexpectedEOFAfterDirective(
-                    new SourceSpan(new SourceLocation(18 + Environment.NewLine.Length, 1, 0), contentLength: 1),
-                    SectionDirective.Directive.Directive,
-                    "{"));
-
-            // Act & Assert
             ParseDocumentTest(
                 "@section foo      " + Environment.NewLine,
                 new[] { SectionDirective.Directive });
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerCommentTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerCommentTest.cs
index 64dafafa16..0a7c55cc34 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerCommentTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerCommentTest.cs
@@ -1,22 +1,23 @@
 // 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     public class CSharpTokenizerCommentTest : CSharpTokenizerTestBase
     {
-        private new CSharpToken IgnoreRemaining => (CSharpToken)base.IgnoreRemaining;
+        private new SyntaxToken IgnoreRemaining => (SyntaxToken)base.IgnoreRemaining;
 
         [Fact]
         public void Next_Ignores_Star_At_EOF_In_RazorComment()
         {
             TestTokenizer(
                 "@* Foo * Bar * Baz *",
-                new CSharpToken("@", CSharpTokenType.RazorCommentTransition),
-                new CSharpToken("*", CSharpTokenType.RazorCommentStar),
-                new CSharpToken(" Foo * Bar * Baz *", CSharpTokenType.RazorComment));
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, " Foo * Bar * Baz *"));
         }
 
         [Fact]
@@ -24,11 +25,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             TestTokenizer(
                 "@* Foo * Bar * Baz *@",
-                new CSharpToken("@", CSharpTokenType.RazorCommentTransition),
-                new CSharpToken("*", CSharpTokenType.RazorCommentStar),
-                new CSharpToken(" Foo * Bar * Baz ", CSharpTokenType.RazorComment),
-                new CSharpToken("*", CSharpTokenType.RazorCommentStar),
-                new CSharpToken("@", CSharpTokenType.RazorCommentTransition));
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, " Foo * Bar * Baz "),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"));
         }
 
         [Fact]
@@ -36,59 +37,59 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             TestTokenizer(
                 "@* Foo Bar Baz *@",
-                new CSharpToken("@", CSharpTokenType.RazorCommentTransition),
-                new CSharpToken("*", CSharpTokenType.RazorCommentStar),
-                new CSharpToken(" Foo Bar Baz ", CSharpTokenType.RazorComment),
-                new CSharpToken("*", CSharpTokenType.RazorCommentStar),
-                new CSharpToken("@", CSharpTokenType.RazorCommentTransition));
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, " Foo Bar Baz "),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"));
         }
 
         [Fact]
         public void Next_Returns_Comment_Token_For_Entire_Single_Line_Comment()
         {
-            TestTokenizer("// Foo Bar Baz", new CSharpToken("// Foo Bar Baz", CSharpTokenType.Comment));
+            TestTokenizer("// Foo Bar Baz", SyntaxFactory.Token(SyntaxKind.CSharpComment, "// Foo Bar Baz"));
         }
 
         [Fact]
         public void Single_Line_Comment_Is_Terminated_By_Newline()
         {
-            TestTokenizer("// Foo Bar Baz\na", new CSharpToken("// Foo Bar Baz", CSharpTokenType.Comment), IgnoreRemaining);
+            TestTokenizer("// Foo Bar Baz\na", SyntaxFactory.Token(SyntaxKind.CSharpComment, "// Foo Bar Baz"), IgnoreRemaining);
         }
 
         [Fact]
         public void Multi_Line_Comment_In_Single_Line_Comment_Has_No_Effect()
         {
-            TestTokenizer("// Foo/*Bar*/ Baz\na", new CSharpToken("// Foo/*Bar*/ Baz", CSharpTokenType.Comment), IgnoreRemaining);
+            TestTokenizer("// Foo/*Bar*/ Baz\na", SyntaxFactory.Token(SyntaxKind.CSharpComment, "// Foo/*Bar*/ Baz"), IgnoreRemaining);
         }
 
         [Fact]
         public void Next_Returns_Comment_Token_For_Entire_Multi_Line_Comment()
         {
-            TestTokenizer("/* Foo\nBar\nBaz */", new CSharpToken("/* Foo\nBar\nBaz */", CSharpTokenType.Comment));
+            TestTokenizer("/* Foo\nBar\nBaz */", SyntaxFactory.Token(SyntaxKind.CSharpComment, "/* Foo\nBar\nBaz */"));
         }
 
         [Fact]
         public void Multi_Line_Comment_Is_Terminated_By_End_Sequence()
         {
-            TestTokenizer("/* Foo\nBar\nBaz */a", new CSharpToken("/* Foo\nBar\nBaz */", CSharpTokenType.Comment), IgnoreRemaining);
+            TestTokenizer("/* Foo\nBar\nBaz */a", SyntaxFactory.Token(SyntaxKind.CSharpComment, "/* Foo\nBar\nBaz */"), IgnoreRemaining);
         }
 
         [Fact]
         public void Unterminated_Multi_Line_Comment_Captures_To_EOF()
         {
-            TestTokenizer("/* Foo\nBar\nBaz", new CSharpToken("/* Foo\nBar\nBaz", CSharpTokenType.Comment), IgnoreRemaining);
+            TestTokenizer("/* Foo\nBar\nBaz", SyntaxFactory.Token(SyntaxKind.CSharpComment, "/* Foo\nBar\nBaz"), IgnoreRemaining);
         }
 
         [Fact]
         public void Nested_Multi_Line_Comments_Terminated_At_First_End_Sequence()
         {
-            TestTokenizer("/* Foo/*\nBar\nBaz*/ */", new CSharpToken("/* Foo/*\nBar\nBaz*/", CSharpTokenType.Comment), IgnoreRemaining);
+            TestTokenizer("/* Foo/*\nBar\nBaz*/ */", SyntaxFactory.Token(SyntaxKind.CSharpComment, "/* Foo/*\nBar\nBaz*/"), IgnoreRemaining);
         }
 
         [Fact]
         public void Nested_Multi_Line_Comments_Terminated_At_Full_End_Sequence()
         {
-            TestTokenizer("/* Foo\nBar\nBaz* */", new CSharpToken("/* Foo\nBar\nBaz* */", CSharpTokenType.Comment), IgnoreRemaining);
+            TestTokenizer("/* Foo\nBar\nBaz* */", SyntaxFactory.Token(SyntaxKind.CSharpComment, "/* Foo\nBar\nBaz* */"), IgnoreRemaining);
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerIdentifierTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerIdentifierTest.cs
index b24c976dc9..e5a3a466ac 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerIdentifierTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerIdentifierTest.cs
@@ -1,6 +1,7 @@
 // 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
@@ -10,73 +11,73 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         [Fact]
         public void Simple_Identifier_Is_Recognized()
         {
-            TestTokenizer("foo", new CSharpToken("foo", CSharpTokenType.Identifier));
+            TestTokenizer("foo", SyntaxFactory.Token(SyntaxKind.Identifier, "foo"));
         }
 
         [Fact]
         public void Identifier_Starting_With_Underscore_Is_Recognized()
         {
-            TestTokenizer("_foo", new CSharpToken("_foo", CSharpTokenType.Identifier));
+            TestTokenizer("_foo", SyntaxFactory.Token(SyntaxKind.Identifier, "_foo"));
         }
 
         [Fact]
         public void Identifier_Can_Contain_Digits()
         {
-            TestTokenizer("foo4", new CSharpToken("foo4", CSharpTokenType.Identifier));
+            TestTokenizer("foo4", SyntaxFactory.Token(SyntaxKind.Identifier, "foo4"));
         }
 
         [Fact]
         public void Identifier_Can_Start_With_Titlecase_Letter()
         {
-            TestTokenizer("ῼfoo", new CSharpToken("ῼfoo", CSharpTokenType.Identifier));
+            TestTokenizer("ῼfoo", SyntaxFactory.Token(SyntaxKind.Identifier, "ῼfoo"));
         }
 
         [Fact]
         public void Identifier_Can_Start_With_Letter_Modifier()
         {
-            TestTokenizer("ᵊfoo", new CSharpToken("ᵊfoo", CSharpTokenType.Identifier));
+            TestTokenizer("ᵊfoo", SyntaxFactory.Token(SyntaxKind.Identifier, "ᵊfoo"));
         }
 
         [Fact]
         public void Identifier_Can_Start_With_Other_Letter()
         {
-            TestTokenizer("ƻfoo", new CSharpToken("ƻfoo", CSharpTokenType.Identifier));
+            TestTokenizer("ƻfoo", SyntaxFactory.Token(SyntaxKind.Identifier, "ƻfoo"));
         }
 
         [Fact]
         public void Identifier_Can_Start_With_Number_Letter()
         {
-            TestTokenizer("Ⅽool", new CSharpToken("Ⅽool", CSharpTokenType.Identifier));
+            TestTokenizer("Ⅽool", SyntaxFactory.Token(SyntaxKind.Identifier, "Ⅽool"));
         }
 
         [Fact]
         public void Identifier_Can_Contain_Non_Spacing_Mark()
         {
-            TestTokenizer("foo\u0300", new CSharpToken("foo\u0300", CSharpTokenType.Identifier));
+            TestTokenizer("foo\u0300", SyntaxFactory.Token(SyntaxKind.Identifier, "foo\u0300"));
         }
 
         [Fact]
         public void Identifier_Can_Contain_Spacing_Combining_Mark()
         {
-            TestTokenizer("fooः", new CSharpToken("fooः", CSharpTokenType.Identifier));
+            TestTokenizer("fooः", SyntaxFactory.Token(SyntaxKind.Identifier, "fooः"));
         }
 
         [Fact]
         public void Identifier_Can_Contain_Non_English_Digit()
         {
-            TestTokenizer("foo١", new CSharpToken("foo١", CSharpTokenType.Identifier));
+            TestTokenizer("foo١", SyntaxFactory.Token(SyntaxKind.Identifier, "foo١"));
         }
 
         [Fact]
         public void Identifier_Can_Contain_Connector_Punctuation()
         {
-            TestTokenizer("foo‿bar", new CSharpToken("foo‿bar", CSharpTokenType.Identifier));
+            TestTokenizer("foo‿bar", SyntaxFactory.Token(SyntaxKind.Identifier, "foo‿bar"));
         }
 
         [Fact]
         public void Identifier_Can_Contain_Format_Character()
         {
-            TestTokenizer("foo؃bar", new CSharpToken("foo؃bar", CSharpTokenType.Identifier));
+            TestTokenizer("foo؃bar", SyntaxFactory.Token(SyntaxKind.Identifier, "foo؃bar"));
         }
 
         [Fact]
@@ -164,7 +165,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         private void TestKeyword(string keyword, CSharpKeyword keywordType)
         {
-            TestTokenizer(keyword, new CSharpToken(keyword, CSharpTokenType.Keyword) { Keyword = keywordType });
+            TestTokenizer(keyword, SyntaxFactory.Token(SyntaxKind.Keyword, keyword));
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerLiteralTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerLiteralTest.cs
index a10aea8ba9..c7c250cce3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerLiteralTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerLiteralTest.cs
@@ -2,286 +2,287 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     public class CSharpTokenizerLiteralTest : CSharpTokenizerTestBase
     {
-        private new CSharpToken IgnoreRemaining => (CSharpToken)base.IgnoreRemaining;
+        private new SyntaxToken IgnoreRemaining => (SyntaxToken)base.IgnoreRemaining;
 
         [Fact]
         public void Simple_Integer_Literal_Is_Recognized()
         {
-            TestSingleToken("01189998819991197253", CSharpTokenType.IntegerLiteral);
+            TestSingleToken("01189998819991197253", SyntaxKind.IntegerLiteral);
         }
 
         [Fact]
         public void Integer_Type_Suffix_Is_Recognized()
         {
-            TestSingleToken("42U", CSharpTokenType.IntegerLiteral);
-            TestSingleToken("42u", CSharpTokenType.IntegerLiteral);
+            TestSingleToken("42U", SyntaxKind.IntegerLiteral);
+            TestSingleToken("42u", SyntaxKind.IntegerLiteral);
 
-            TestSingleToken("42L", CSharpTokenType.IntegerLiteral);
-            TestSingleToken("42l", CSharpTokenType.IntegerLiteral);
+            TestSingleToken("42L", SyntaxKind.IntegerLiteral);
+            TestSingleToken("42l", SyntaxKind.IntegerLiteral);
 
-            TestSingleToken("42UL", CSharpTokenType.IntegerLiteral);
-            TestSingleToken("42Ul", CSharpTokenType.IntegerLiteral);
+            TestSingleToken("42UL", SyntaxKind.IntegerLiteral);
+            TestSingleToken("42Ul", SyntaxKind.IntegerLiteral);
 
-            TestSingleToken("42uL", CSharpTokenType.IntegerLiteral);
-            TestSingleToken("42ul", CSharpTokenType.IntegerLiteral);
+            TestSingleToken("42uL", SyntaxKind.IntegerLiteral);
+            TestSingleToken("42ul", SyntaxKind.IntegerLiteral);
 
-            TestSingleToken("42LU", CSharpTokenType.IntegerLiteral);
-            TestSingleToken("42Lu", CSharpTokenType.IntegerLiteral);
+            TestSingleToken("42LU", SyntaxKind.IntegerLiteral);
+            TestSingleToken("42Lu", SyntaxKind.IntegerLiteral);
 
-            TestSingleToken("42lU", CSharpTokenType.IntegerLiteral);
-            TestSingleToken("42lu", CSharpTokenType.IntegerLiteral);
+            TestSingleToken("42lU", SyntaxKind.IntegerLiteral);
+            TestSingleToken("42lu", SyntaxKind.IntegerLiteral);
         }
 
         [Fact]
         public void Trailing_Letter_Is_Not_Part_Of_Integer_Literal_If_Not_Type_Sufix()
         {
-            TestTokenizer("42a", new CSharpToken("42", CSharpTokenType.IntegerLiteral), IgnoreRemaining);
+            TestTokenizer("42a", SyntaxFactory.Token(SyntaxKind.IntegerLiteral, "42"), IgnoreRemaining);
         }
 
         [Fact]
         public void Simple_Hex_Literal_Is_Recognized()
         {
-            TestSingleToken("0x0123456789ABCDEF", CSharpTokenType.IntegerLiteral);
+            TestSingleToken("0x0123456789ABCDEF", SyntaxKind.IntegerLiteral);
         }
 
         [Fact]
         public void Integer_Type_Suffix_Is_Recognized_In_Hex_Literal()
         {
-            TestSingleToken("0xDEADBEEFU", CSharpTokenType.IntegerLiteral);
-            TestSingleToken("0xDEADBEEFu", CSharpTokenType.IntegerLiteral);
+            TestSingleToken("0xDEADBEEFU", SyntaxKind.IntegerLiteral);
+            TestSingleToken("0xDEADBEEFu", SyntaxKind.IntegerLiteral);
 
-            TestSingleToken("0xDEADBEEFL", CSharpTokenType.IntegerLiteral);
-            TestSingleToken("0xDEADBEEFl", CSharpTokenType.IntegerLiteral);
+            TestSingleToken("0xDEADBEEFL", SyntaxKind.IntegerLiteral);
+            TestSingleToken("0xDEADBEEFl", SyntaxKind.IntegerLiteral);
 
-            TestSingleToken("0xDEADBEEFUL", CSharpTokenType.IntegerLiteral);
-            TestSingleToken("0xDEADBEEFUl", CSharpTokenType.IntegerLiteral);
+            TestSingleToken("0xDEADBEEFUL", SyntaxKind.IntegerLiteral);
+            TestSingleToken("0xDEADBEEFUl", SyntaxKind.IntegerLiteral);
 
-            TestSingleToken("0xDEADBEEFuL", CSharpTokenType.IntegerLiteral);
-            TestSingleToken("0xDEADBEEFul", CSharpTokenType.IntegerLiteral);
+            TestSingleToken("0xDEADBEEFuL", SyntaxKind.IntegerLiteral);
+            TestSingleToken("0xDEADBEEFul", SyntaxKind.IntegerLiteral);
 
-            TestSingleToken("0xDEADBEEFLU", CSharpTokenType.IntegerLiteral);
-            TestSingleToken("0xDEADBEEFLu", CSharpTokenType.IntegerLiteral);
+            TestSingleToken("0xDEADBEEFLU", SyntaxKind.IntegerLiteral);
+            TestSingleToken("0xDEADBEEFLu", SyntaxKind.IntegerLiteral);
 
-            TestSingleToken("0xDEADBEEFlU", CSharpTokenType.IntegerLiteral);
-            TestSingleToken("0xDEADBEEFlu", CSharpTokenType.IntegerLiteral);
+            TestSingleToken("0xDEADBEEFlU", SyntaxKind.IntegerLiteral);
+            TestSingleToken("0xDEADBEEFlu", SyntaxKind.IntegerLiteral);
         }
 
         [Fact]
         public void Trailing_Letter_Is_Not_Part_Of_Hex_Literal_If_Not_Type_Sufix()
         {
-            TestTokenizer("0xDEADBEEFz", new CSharpToken("0xDEADBEEF", CSharpTokenType.IntegerLiteral), IgnoreRemaining);
+            TestTokenizer("0xDEADBEEFz", SyntaxFactory.Token(SyntaxKind.IntegerLiteral, "0xDEADBEEF"), IgnoreRemaining);
         }
 
         [Fact]
         public void Dot_Followed_By_Non_Digit_Is_Not_Part_Of_Real_Literal()
         {
-            TestTokenizer("3.a", new CSharpToken("3", CSharpTokenType.IntegerLiteral), IgnoreRemaining);
+            TestTokenizer("3.a", SyntaxFactory.Token(SyntaxKind.IntegerLiteral, "3"), IgnoreRemaining);
         }
 
         [Fact]
         public void Simple_Real_Literal_Is_Recognized()
         {
-            TestTokenizer("3.14159", new CSharpToken("3.14159", CSharpTokenType.RealLiteral));
+            TestTokenizer("3.14159", SyntaxFactory.Token(SyntaxKind.RealLiteral, "3.14159"));
         }
 
         [Fact]
         public void Real_Literal_Between_Zero_And_One_Is_Recognized()
         {
-            TestTokenizer(".14159", new CSharpToken(".14159", CSharpTokenType.RealLiteral));
+            TestTokenizer(".14159", SyntaxFactory.Token(SyntaxKind.RealLiteral, ".14159"));
         }
 
         [Fact]
         public void Integer_With_Real_Type_Suffix_Is_Recognized()
         {
-            TestSingleToken("42F", CSharpTokenType.RealLiteral);
-            TestSingleToken("42f", CSharpTokenType.RealLiteral);
-            TestSingleToken("42D", CSharpTokenType.RealLiteral);
-            TestSingleToken("42d", CSharpTokenType.RealLiteral);
-            TestSingleToken("42M", CSharpTokenType.RealLiteral);
-            TestSingleToken("42m", CSharpTokenType.RealLiteral);
+            TestSingleToken("42F", SyntaxKind.RealLiteral);
+            TestSingleToken("42f", SyntaxKind.RealLiteral);
+            TestSingleToken("42D", SyntaxKind.RealLiteral);
+            TestSingleToken("42d", SyntaxKind.RealLiteral);
+            TestSingleToken("42M", SyntaxKind.RealLiteral);
+            TestSingleToken("42m", SyntaxKind.RealLiteral);
         }
 
         [Fact]
         public void Integer_With_Exponent_Is_Recognized()
         {
-            TestSingleToken("1e10", CSharpTokenType.RealLiteral);
-            TestSingleToken("1E10", CSharpTokenType.RealLiteral);
-            TestSingleToken("1e+10", CSharpTokenType.RealLiteral);
-            TestSingleToken("1E+10", CSharpTokenType.RealLiteral);
-            TestSingleToken("1e-10", CSharpTokenType.RealLiteral);
-            TestSingleToken("1E-10", CSharpTokenType.RealLiteral);
+            TestSingleToken("1e10", SyntaxKind.RealLiteral);
+            TestSingleToken("1E10", SyntaxKind.RealLiteral);
+            TestSingleToken("1e+10", SyntaxKind.RealLiteral);
+            TestSingleToken("1E+10", SyntaxKind.RealLiteral);
+            TestSingleToken("1e-10", SyntaxKind.RealLiteral);
+            TestSingleToken("1E-10", SyntaxKind.RealLiteral);
         }
 
         [Fact]
         public void Real_Number_With_Type_Suffix_Is_Recognized()
         {
-            TestSingleToken("3.14F", CSharpTokenType.RealLiteral);
-            TestSingleToken("3.14f", CSharpTokenType.RealLiteral);
-            TestSingleToken("3.14D", CSharpTokenType.RealLiteral);
-            TestSingleToken("3.14d", CSharpTokenType.RealLiteral);
-            TestSingleToken("3.14M", CSharpTokenType.RealLiteral);
-            TestSingleToken("3.14m", CSharpTokenType.RealLiteral);
+            TestSingleToken("3.14F", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14f", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14D", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14d", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14M", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14m", SyntaxKind.RealLiteral);
         }
 
         [Fact]
         public void Real_Number_With_Exponent_Is_Recognized()
         {
-            TestSingleToken("3.14E10", CSharpTokenType.RealLiteral);
-            TestSingleToken("3.14e10", CSharpTokenType.RealLiteral);
-            TestSingleToken("3.14E+10", CSharpTokenType.RealLiteral);
-            TestSingleToken("3.14e+10", CSharpTokenType.RealLiteral);
-            TestSingleToken("3.14E-10", CSharpTokenType.RealLiteral);
-            TestSingleToken("3.14e-10", CSharpTokenType.RealLiteral);
+            TestSingleToken("3.14E10", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14e10", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14E+10", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14e+10", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14E-10", SyntaxKind.RealLiteral);
+            TestSingleToken("3.14e-10", SyntaxKind.RealLiteral);
         }
 
         [Fact]
         public void Real_Number_With_Exponent_And_Type_Suffix_Is_Recognized()
         {
-            TestSingleToken("3.14E+10F", CSharpTokenType.RealLiteral);
+            TestSingleToken("3.14E+10F", SyntaxKind.RealLiteral);
         }
 
         [Fact]
         public void Single_Character_Literal_Is_Recognized()
         {
-            TestSingleToken("'f'", CSharpTokenType.CharacterLiteral);
+            TestSingleToken("'f'", SyntaxKind.CharacterLiteral);
         }
 
         [Fact]
         public void Multi_Character_Literal_Is_Recognized()
         {
-            TestSingleToken("'foo'", CSharpTokenType.CharacterLiteral);
+            TestSingleToken("'foo'", SyntaxKind.CharacterLiteral);
         }
 
         [Fact]
         public void Character_Literal_Is_Terminated_By_EOF_If_Unterminated()
         {
-            TestSingleToken("'foo bar", CSharpTokenType.CharacterLiteral);
+            TestSingleToken("'foo bar", SyntaxKind.CharacterLiteral);
         }
 
         [Fact]
         public void Character_Literal_Not_Terminated_By_Escaped_Quote()
         {
-            TestSingleToken("'foo\\'bar'", CSharpTokenType.CharacterLiteral);
+            TestSingleToken("'foo\\'bar'", SyntaxKind.CharacterLiteral);
         }
 
         [Fact]
         public void Character_Literal_Is_Terminated_By_EOL_If_Unterminated()
         {
-            TestTokenizer("'foo\n", new CSharpToken("'foo", CSharpTokenType.CharacterLiteral), IgnoreRemaining);
+            TestTokenizer("'foo\n", SyntaxFactory.Token(SyntaxKind.CharacterLiteral, "'foo"), IgnoreRemaining);
         }
 
         [Fact]
         public void Character_Literal_Terminated_By_EOL_Even_When_Last_Char_Is_Slash()
         {
-            TestTokenizer("'foo\\\n", new CSharpToken("'foo\\", CSharpTokenType.CharacterLiteral), IgnoreRemaining);
+            TestTokenizer("'foo\\\n", SyntaxFactory.Token(SyntaxKind.CharacterLiteral, "'foo\\"), IgnoreRemaining);
         }
 
         [Fact]
         public void Character_Literal_Terminated_By_EOL_Even_When_Last_Char_Is_Slash_And_Followed_By_Stuff()
         {
-            TestTokenizer("'foo\\\nflarg", new CSharpToken("'foo\\", CSharpTokenType.CharacterLiteral), IgnoreRemaining);
+            TestTokenizer("'foo\\\nflarg", SyntaxFactory.Token(SyntaxKind.CharacterLiteral, "'foo\\"), IgnoreRemaining);
         }
 
         [Fact]
         public void Character_Literal_Terminated_By_CRLF_Even_When_Last_Char_Is_Slash()
         {
-            TestTokenizer("'foo\\" + Environment.NewLine, new CSharpToken("'foo\\", CSharpTokenType.CharacterLiteral), IgnoreRemaining);
+            TestTokenizer("'foo\\" + Environment.NewLine, SyntaxFactory.Token(SyntaxKind.CharacterLiteral, "'foo\\"), IgnoreRemaining);
         }
 
         [Fact]
         public void Character_Literal_Terminated_By_CRLF_Even_When_Last_Char_Is_Slash_And_Followed_By_Stuff()
         {
-            TestTokenizer($"'foo\\{Environment.NewLine}flarg", new CSharpToken("'foo\\", CSharpTokenType.CharacterLiteral), IgnoreRemaining);
+            TestTokenizer($"'foo\\{Environment.NewLine}flarg", SyntaxFactory.Token(SyntaxKind.CharacterLiteral, "'foo\\"), IgnoreRemaining);
         }
 
         [Fact]
         public void Character_Literal_Allows_Escaped_Escape()
         {
-            TestTokenizer("'foo\\\\'blah", new CSharpToken("'foo\\\\'", CSharpTokenType.CharacterLiteral), IgnoreRemaining);
+            TestTokenizer("'foo\\\\'blah", SyntaxFactory.Token(SyntaxKind.CharacterLiteral, "'foo\\\\'"), IgnoreRemaining);
         }
 
         [Fact]
         public void String_Literal_Is_Recognized()
         {
-            TestSingleToken("\"foo\"", CSharpTokenType.StringLiteral);
+            TestSingleToken("\"foo\"", SyntaxKind.StringLiteral);
         }
 
         [Fact]
         public void String_Literal_Is_Terminated_By_EOF_If_Unterminated()
         {
-            TestSingleToken("\"foo bar", CSharpTokenType.StringLiteral);
+            TestSingleToken("\"foo bar", SyntaxKind.StringLiteral);
         }
 
         [Fact]
         public void String_Literal_Not_Terminated_By_Escaped_Quote()
         {
-            TestSingleToken("\"foo\\\"bar\"", CSharpTokenType.StringLiteral);
+            TestSingleToken("\"foo\\\"bar\"", SyntaxKind.StringLiteral);
         }
 
         [Fact]
         public void String_Literal_Is_Terminated_By_EOL_If_Unterminated()
         {
-            TestTokenizer("\"foo\n", new CSharpToken("\"foo", CSharpTokenType.StringLiteral), IgnoreRemaining);
+            TestTokenizer("\"foo\n", SyntaxFactory.Token(SyntaxKind.StringLiteral, "\"foo"), IgnoreRemaining);
         }
 
         [Fact]
         public void String_Literal_Terminated_By_EOL_Even_When_Last_Char_Is_Slash()
         {
-            TestTokenizer("\"foo\\\n", new CSharpToken("\"foo\\", CSharpTokenType.StringLiteral), IgnoreRemaining);
+            TestTokenizer("\"foo\\\n", SyntaxFactory.Token(SyntaxKind.StringLiteral, "\"foo\\"), IgnoreRemaining);
         }
 
         [Fact]
         public void String_Literal_Terminated_By_EOL_Even_When_Last_Char_Is_Slash_And_Followed_By_Stuff()
         {
-            TestTokenizer("\"foo\\\nflarg", new CSharpToken("\"foo\\", CSharpTokenType.StringLiteral), IgnoreRemaining);
+            TestTokenizer("\"foo\\\nflarg", SyntaxFactory.Token(SyntaxKind.StringLiteral, "\"foo\\"), IgnoreRemaining);
         }
 
         [Fact]
         public void String_Literal_Terminated_By_CRLF_Even_When_Last_Char_Is_Slash()
         {
-            TestTokenizer("\"foo\\" + Environment.NewLine, new CSharpToken("\"foo\\", CSharpTokenType.StringLiteral), IgnoreRemaining);
+            TestTokenizer("\"foo\\" + Environment.NewLine, SyntaxFactory.Token(SyntaxKind.StringLiteral, "\"foo\\"), IgnoreRemaining);
         }
 
         [Fact]
         public void String_Literal_Terminated_By_CRLF_Even_When_Last_Char_Is_Slash_And_Followed_By_Stuff()
         {
-            TestTokenizer($"\"foo\\{Environment.NewLine}flarg", new CSharpToken("\"foo\\", CSharpTokenType.StringLiteral), IgnoreRemaining);
+            TestTokenizer($"\"foo\\{Environment.NewLine}flarg", SyntaxFactory.Token(SyntaxKind.StringLiteral, "\"foo\\"), IgnoreRemaining);
         }
 
         [Fact]
         public void String_Literal_Allows_Escaped_Escape()
         {
-            TestTokenizer("\"foo\\\\\"blah", new CSharpToken("\"foo\\\\\"", CSharpTokenType.StringLiteral), IgnoreRemaining);
+            TestTokenizer("\"foo\\\\\"blah", SyntaxFactory.Token(SyntaxKind.StringLiteral, "\"foo\\\\\""), IgnoreRemaining);
         }
 
         [Fact]
         public void Verbatim_String_Literal_Can_Contain_Newlines()
         {
-            TestSingleToken("@\"foo\nbar\nbaz\"", CSharpTokenType.StringLiteral);
+            TestSingleToken("@\"foo\nbar\nbaz\"", SyntaxKind.StringLiteral);
         }
 
         [Fact]
         public void Verbatim_String_Literal_Not_Terminated_By_Escaped_Double_Quote()
         {
-            TestSingleToken("@\"foo\"\"bar\"", CSharpTokenType.StringLiteral);
+            TestSingleToken("@\"foo\"\"bar\"", SyntaxKind.StringLiteral);
         }
 
         [Fact]
         public void Verbatim_String_Literal_Is_Terminated_By_Slash_Double_Quote()
         {
-            TestTokenizer("@\"foo\\\"bar\"", new CSharpToken("@\"foo\\\"", CSharpTokenType.StringLiteral), IgnoreRemaining);
+            TestTokenizer("@\"foo\\\"bar\"", SyntaxFactory.Token(SyntaxKind.StringLiteral, "@\"foo\\\""), IgnoreRemaining);
         }
 
         [Fact]
         public void Verbatim_String_Literal_Is_Terminated_By_EOF()
         {
-            TestSingleToken("@\"foo", CSharpTokenType.StringLiteral);
+            TestSingleToken("@\"foo", SyntaxKind.StringLiteral);
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerOperatorsTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerOperatorsTest.cs
index 0b600ea9bc..fdf2718387 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerOperatorsTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerOperatorsTest.cs
@@ -1,6 +1,7 @@
 // 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
@@ -10,287 +11,287 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         [Fact]
         public void LeftBrace_Is_Recognized()
         {
-            TestSingleToken("{", CSharpTokenType.LeftBrace);
+            TestSingleToken("{", SyntaxKind.LeftBrace);
         }
 
         [Fact]
         public void Plus_Is_Recognized()
         {
-            TestSingleToken("+", CSharpTokenType.Plus);
+            TestSingleToken("+", SyntaxKind.Plus);
         }
 
         [Fact]
         public void Assign_Is_Recognized()
         {
-            TestSingleToken("=", CSharpTokenType.Assign);
+            TestSingleToken("=", SyntaxKind.Assign);
         }
 
         [Fact]
         public void Arrow_Is_Recognized()
         {
-            TestSingleToken("->", CSharpTokenType.Arrow);
+            TestSingleToken("->", SyntaxKind.Arrow);
         }
 
         [Fact]
         public void AndAssign_Is_Recognized()
         {
-            TestSingleToken("&=", CSharpTokenType.AndAssign);
+            TestSingleToken("&=", SyntaxKind.AndAssign);
         }
 
         [Fact]
         public void RightBrace_Is_Recognized()
         {
-            TestSingleToken("}", CSharpTokenType.RightBrace);
+            TestSingleToken("}", SyntaxKind.RightBrace);
         }
 
         [Fact]
         public void Minus_Is_Recognized()
         {
-            TestSingleToken("-", CSharpTokenType.Minus);
+            TestSingleToken("-", SyntaxKind.Minus);
         }
 
         [Fact]
         public void LessThan_Is_Recognized()
         {
-            TestSingleToken("<", CSharpTokenType.LessThan);
+            TestSingleToken("<", SyntaxKind.LessThan);
         }
 
         [Fact]
         public void Equals_Is_Recognized()
         {
-            TestSingleToken("==", CSharpTokenType.Equals);
+            TestSingleToken("==", SyntaxKind.Equals);
         }
 
         [Fact]
         public void OrAssign_Is_Recognized()
         {
-            TestSingleToken("|=", CSharpTokenType.OrAssign);
+            TestSingleToken("|=", SyntaxKind.OrAssign);
         }
 
         [Fact]
         public void LeftBracket_Is_Recognized()
         {
-            TestSingleToken("[", CSharpTokenType.LeftBracket);
+            TestSingleToken("[", SyntaxKind.LeftBracket);
         }
 
         [Fact]
         public void Star_Is_Recognized()
         {
-            TestSingleToken("*", CSharpTokenType.Star);
+            TestSingleToken("*", SyntaxKind.Star);
         }
 
         [Fact]
         public void GreaterThan_Is_Recognized()
         {
-            TestSingleToken(">", CSharpTokenType.GreaterThan);
+            TestSingleToken(">", SyntaxKind.GreaterThan);
         }
 
         [Fact]
         public void NotEqual_Is_Recognized()
         {
-            TestSingleToken("!=", CSharpTokenType.NotEqual);
+            TestSingleToken("!=", SyntaxKind.NotEqual);
         }
 
         [Fact]
         public void XorAssign_Is_Recognized()
         {
-            TestSingleToken("^=", CSharpTokenType.XorAssign);
+            TestSingleToken("^=", SyntaxKind.XorAssign);
         }
 
         [Fact]
         public void RightBracket_Is_Recognized()
         {
-            TestSingleToken("]", CSharpTokenType.RightBracket);
+            TestSingleToken("]", SyntaxKind.RightBracket);
         }
 
         [Fact]
         public void Slash_Is_Recognized()
         {
-            TestSingleToken("/", CSharpTokenType.Slash);
+            TestSingleToken("/", SyntaxKind.Slash);
         }
 
         [Fact]
         public void QuestionMark_Is_Recognized()
         {
-            TestSingleToken("?", CSharpTokenType.QuestionMark);
+            TestSingleToken("?", SyntaxKind.QuestionMark);
         }
 
         [Fact]
         public void LessThanEqual_Is_Recognized()
         {
-            TestSingleToken("<=", CSharpTokenType.LessThanEqual);
+            TestSingleToken("<=", SyntaxKind.LessThanEqual);
         }
 
         [Fact]
         public void LeftShift_Is_Not_Specially_Recognized()
         {
             TestTokenizer("<<",
-                new CSharpToken("<", CSharpTokenType.LessThan),
-                new CSharpToken("<", CSharpTokenType.LessThan));
+                SyntaxFactory.Token(SyntaxKind.LessThan, "<"),
+                SyntaxFactory.Token(SyntaxKind.LessThan, "<"));
         }
 
         [Fact]
         public void LeftParen_Is_Recognized()
         {
-            TestSingleToken("(", CSharpTokenType.LeftParenthesis);
+            TestSingleToken("(", SyntaxKind.LeftParenthesis);
         }
 
         [Fact]
         public void Modulo_Is_Recognized()
         {
-            TestSingleToken("%", CSharpTokenType.Modulo);
+            TestSingleToken("%", SyntaxKind.Modulo);
         }
 
         [Fact]
         public void NullCoalesce_Is_Recognized()
         {
-            TestSingleToken("??", CSharpTokenType.NullCoalesce);
+            TestSingleToken("??", SyntaxKind.NullCoalesce);
         }
 
         [Fact]
         public void GreaterThanEqual_Is_Recognized()
         {
-            TestSingleToken(">=", CSharpTokenType.GreaterThanEqual);
+            TestSingleToken(">=", SyntaxKind.GreaterThanEqual);
         }
 
         [Fact]
         public void EqualGreaterThan_Is_Recognized()
         {
-            TestSingleToken("=>", CSharpTokenType.GreaterThanEqual);
+            TestSingleToken("=>", SyntaxKind.GreaterThanEqual);
         }
 
         [Fact]
         public void RightParen_Is_Recognized()
         {
-            TestSingleToken(")", CSharpTokenType.RightParenthesis);
+            TestSingleToken(")", SyntaxKind.RightParenthesis);
         }
 
         [Fact]
         public void And_Is_Recognized()
         {
-            TestSingleToken("&", CSharpTokenType.And);
+            TestSingleToken("&", SyntaxKind.And);
         }
 
         [Fact]
         public void DoubleColon_Is_Recognized()
         {
-            TestSingleToken("::", CSharpTokenType.DoubleColon);
+            TestSingleToken("::", SyntaxKind.DoubleColon);
         }
 
         [Fact]
         public void PlusAssign_Is_Recognized()
         {
-            TestSingleToken("+=", CSharpTokenType.PlusAssign);
+            TestSingleToken("+=", SyntaxKind.PlusAssign);
         }
 
         [Fact]
         public void Semicolon_Is_Recognized()
         {
-            TestSingleToken(";", CSharpTokenType.Semicolon);
+            TestSingleToken(";", SyntaxKind.Semicolon);
         }
 
         [Fact]
         public void Tilde_Is_Recognized()
         {
-            TestSingleToken("~", CSharpTokenType.Tilde);
+            TestSingleToken("~", SyntaxKind.Tilde);
         }
 
         [Fact]
         public void DoubleOr_Is_Recognized()
         {
-            TestSingleToken("||", CSharpTokenType.DoubleOr);
+            TestSingleToken("||", SyntaxKind.DoubleOr);
         }
 
         [Fact]
         public void ModuloAssign_Is_Recognized()
         {
-            TestSingleToken("%=", CSharpTokenType.ModuloAssign);
+            TestSingleToken("%=", SyntaxKind.ModuloAssign);
         }
 
         [Fact]
         public void Colon_Is_Recognized()
         {
-            TestSingleToken(":", CSharpTokenType.Colon);
+            TestSingleToken(":", SyntaxKind.Colon);
         }
 
         [Fact]
         public void Not_Is_Recognized()
         {
-            TestSingleToken("!", CSharpTokenType.Not);
+            TestSingleToken("!", SyntaxKind.Not);
         }
 
         [Fact]
         public void DoubleAnd_Is_Recognized()
         {
-            TestSingleToken("&&", CSharpTokenType.DoubleAnd);
+            TestSingleToken("&&", SyntaxKind.DoubleAnd);
         }
 
         [Fact]
         public void DivideAssign_Is_Recognized()
         {
-            TestSingleToken("/=", CSharpTokenType.DivideAssign);
+            TestSingleToken("/=", SyntaxKind.DivideAssign);
         }
 
         [Fact]
         public void Comma_Is_Recognized()
         {
-            TestSingleToken(",", CSharpTokenType.Comma);
+            TestSingleToken(",", SyntaxKind.Comma);
         }
 
         [Fact]
         public void Xor_Is_Recognized()
         {
-            TestSingleToken("^", CSharpTokenType.Xor);
+            TestSingleToken("^", SyntaxKind.Xor);
         }
 
         [Fact]
         public void Decrement_Is_Recognized()
         {
-            TestSingleToken("--", CSharpTokenType.Decrement);
+            TestSingleToken("--", SyntaxKind.Decrement);
         }
 
         [Fact]
         public void MultiplyAssign_Is_Recognized()
         {
-            TestSingleToken("*=", CSharpTokenType.MultiplyAssign);
+            TestSingleToken("*=", SyntaxKind.MultiplyAssign);
         }
 
         [Fact]
         public void Dot_Is_Recognized()
         {
-            TestSingleToken(".", CSharpTokenType.Dot);
+            TestSingleToken(".", SyntaxKind.Dot);
         }
 
         [Fact]
         public void Or_Is_Recognized()
         {
-            TestSingleToken("|", CSharpTokenType.Or);
+            TestSingleToken("|", SyntaxKind.Or);
         }
 
         [Fact]
         public void Increment_Is_Recognized()
         {
-            TestSingleToken("++", CSharpTokenType.Increment);
+            TestSingleToken("++", SyntaxKind.Increment);
         }
 
         [Fact]
         public void MinusAssign_Is_Recognized()
         {
-            TestSingleToken("-=", CSharpTokenType.MinusAssign);
+            TestSingleToken("-=", SyntaxKind.MinusAssign);
         }
 
         [Fact]
         public void RightShift_Is_Not_Specially_Recognized()
         {
             TestTokenizer(">>",
-                new CSharpToken(">", CSharpTokenType.GreaterThan),
-                new CSharpToken(">", CSharpTokenType.GreaterThan));
+                SyntaxFactory.Token(SyntaxKind.GreaterThan, ">"),
+                SyntaxFactory.Token(SyntaxKind.GreaterThan, ">"));
         }
 
         [Fact]
         public void Hash_Is_Recognized()
         {
-            TestSingleToken("#", CSharpTokenType.Hash);
+            TestSingleToken("#", SyntaxKind.Hash);
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTest.cs
index cf98382ef4..5ee0715a7e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTest.cs
@@ -1,13 +1,14 @@
 // 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     public class CSharpTokenizerTest : CSharpTokenizerTestBase
     {
-        private new CSharpToken IgnoreRemaining => (CSharpToken)base.IgnoreRemaining;
+        private new SyntaxToken IgnoreRemaining => (SyntaxToken)base.IgnoreRemaining;
 
         [Fact]
         public void Next_Returns_Null_When_EOF_Reached()
@@ -20,8 +21,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             TestTokenizer(
                 "\r\ra",
-                new CSharpToken("\r", CSharpTokenType.NewLine),
-                new CSharpToken("\r", CSharpTokenType.NewLine),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r"),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r"),
                 IgnoreRemaining);
         }
 
@@ -30,8 +31,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             TestTokenizer(
                 "\n\na",
-                new CSharpToken("\n", CSharpTokenType.NewLine),
-                new CSharpToken("\n", CSharpTokenType.NewLine),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\n"),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\n"),
                 IgnoreRemaining);
         }
 
@@ -41,8 +42,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             // NEL: Unicode "Next Line" U+0085
             TestTokenizer(
                 "\u0085\u0085a",
-                new CSharpToken("\u0085", CSharpTokenType.NewLine),
-                new CSharpToken("\u0085", CSharpTokenType.NewLine),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\u0085"),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\u0085"),
                 IgnoreRemaining);
         }
 
@@ -52,8 +53,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             // Unicode "Line Separator" U+2028
             TestTokenizer(
                 "\u2028\u2028a",
-                new CSharpToken("\u2028", CSharpTokenType.NewLine),
-                new CSharpToken("\u2028", CSharpTokenType.NewLine),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\u2028"),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\u2028"),
                 IgnoreRemaining);
         }
 
@@ -63,8 +64,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             // Unicode "Paragraph Separator" U+2029
             TestTokenizer(
                 "\u2029\u2029a",
-                new CSharpToken("\u2029", CSharpTokenType.NewLine),
-                new CSharpToken("\u2029", CSharpTokenType.NewLine),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\u2029"),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\u2029"),
                 IgnoreRemaining);
         }
 
@@ -73,8 +74,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             TestTokenizer(
                 "\r\n\r\na",
-                new CSharpToken("\r\n", CSharpTokenType.NewLine),
-                new CSharpToken("\r\n", CSharpTokenType.NewLine),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r\n"),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r\n"),
                 IgnoreRemaining);
         }
 
@@ -83,15 +84,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             TestTokenizer(
                 " \f\t\u000B \n ",
-                new CSharpToken(" \f\t\u000B ", CSharpTokenType.WhiteSpace),
-                new CSharpToken("\n", CSharpTokenType.NewLine),
-                new CSharpToken(" ", CSharpTokenType.WhiteSpace));
+                SyntaxFactory.Token(SyntaxKind.Whitespace, " \f\t\u000B "),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\n"),
+                SyntaxFactory.Token(SyntaxKind.Whitespace, " "));
         }
 
         [Fact]
         public void Transition_Is_Recognized()
         {
-            TestSingleToken("@", CSharpTokenType.Transition);
+            TestSingleToken("@", SyntaxKind.Transition);
         }
 
         [Fact]
@@ -99,8 +100,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             TestTokenizer(
                 "@(",
-                new CSharpToken("@", CSharpTokenType.Transition),
-                new CSharpToken("(", CSharpTokenType.LeftParenthesis));
+                SyntaxFactory.Token(SyntaxKind.Transition, "@"),
+                SyntaxFactory.Token(SyntaxKind.LeftParenthesis, "("));
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTestBase.cs
index 6869138c1e..83b2adc684 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTestBase.cs
@@ -1,11 +1,13 @@
 // 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     public abstract class CSharpTokenizerTestBase : TokenizerTestBase
     {
-        private static CSharpToken _ignoreRemaining = new CSharpToken(string.Empty, CSharpTokenType.Unknown);
+        private static SyntaxToken _ignoreRemaining = SyntaxFactory.Token(SyntaxKind.Marker, string.Empty);
 
         internal override object IgnoreRemaining
         {
@@ -17,14 +19,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return new CSharpTokenizer(source);
         }
 
-        internal void TestSingleToken(string text, CSharpTokenType expectedTokenType)
+        internal void TestSingleToken(string text, SyntaxKind expectedTokenKind)
         {
-            TestTokenizer(text, new CSharpToken(text, expectedTokenType));
-        }
-
-        internal void TestTokenizer(string input, params CSharpToken[] expectedTokens)
-        {
-            base.TestTokenizer<CSharpToken, CSharpTokenType>(input, expectedTokens);
+            TestTokenizer(text, SyntaxFactory.Token(expectedTokenKind, text));
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CodeBlockEditHandlerTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CodeBlockEditHandlerTest.cs
index df17deb584..a300d388b2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CodeBlockEditHandlerTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CodeBlockEditHandlerTest.cs
@@ -3,6 +3,7 @@
 
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
@@ -205,17 +206,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
             Assert.False(result);
         }
 
-        private static Span GetSpan(SourceLocation start, string content)
+        private static SyntaxNode GetSpan(SourceLocation start, string content)
         {
-            var spanBuilder = new SpanBuilder(start);
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
             var tokens = CSharpLanguageCharacteristics.Instance.TokenizeString(content).ToArray();
             foreach (var token in tokens)
             {
-                spanBuilder.Accept(token);
+                builder.Add((SyntaxToken)token.CreateRed());
             }
-            var span = spanBuilder.Build();
+            var node = SyntaxFactory.CSharpStatementLiteral(builder.ToList());
 
-            return span;
+            return node;
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CodeParserTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CodeParserTestBase.cs
index c3425055b4..f942a3dddf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CodeParserTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CodeParserTestBase.cs
@@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         internal void ImplicitExpressionTest(string input, params RazorDiagnostic[] errors)
         {
-            ImplicitExpressionTest(input, AcceptedCharactersInternal.NonWhiteSpace, errors);
+            ImplicitExpressionTest(input, AcceptedCharactersInternal.NonWhitespace, errors);
         }
 
         internal void ImplicitExpressionTest(string input, AcceptedCharactersInternal acceptedCharacters, params RazorDiagnostic[] errors)
@@ -30,7 +30,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         internal void ImplicitExpressionTest(string input, string expected, params RazorDiagnostic[] errors)
         {
-            ImplicitExpressionTest(input, expected, AcceptedCharactersInternal.NonWhiteSpace, errors);
+            ImplicitExpressionTest(input, expected, AcceptedCharactersInternal.NonWhitespace, errors);
         }
 
         internal override void SingleSpanBlockTest(string document, BlockKindInternal blockKind, SpanKindInternal spanType, AcceptedCharactersInternal acceptedCharacters = AcceptedCharactersInternal.Any)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CsHtmlCodeParserTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CsHtmlCodeParserTestBase.cs
index db0f3d845a..e87bb40d3d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CsHtmlCodeParserTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CsHtmlCodeParserTestBase.cs
@@ -11,10 +11,5 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             get { return CSharpCodeParser.DefaultKeywords; }
         }
-
-        internal override BlockFactory CreateBlockFactory()
-        {
-            return new BlockFactory(Factory ?? CreateSpanFactory());
-        }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CsHtmlMarkupParserTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CsHtmlMarkupParserTestBase.cs
index a643ea73af..072769f1e8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CsHtmlMarkupParserTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CsHtmlMarkupParserTestBase.cs
@@ -11,10 +11,5 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             get { return CSharpCodeParser.DefaultKeywords; }
         }
-
-        internal override BlockFactory CreateBlockFactory()
-        {
-            return new BlockFactory(Factory ?? CreateSpanFactory());
-        }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveCSharpTokenizerTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveCSharpTokenizerTest.cs
index 7a1e0c070a..7f6e8db88a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveCSharpTokenizerTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveCSharpTokenizerTest.cs
@@ -1,6 +1,7 @@
 // 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
@@ -12,12 +13,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             TestTokenizer(
                 "\r\n @something \r\n @this is ignored",
-                new CSharpToken("\r\n", CSharpTokenType.NewLine),
-                new CSharpToken(" ", CSharpTokenType.WhiteSpace),
-                new CSharpToken("@", CSharpTokenType.Transition),
-                new CSharpToken("something", CSharpTokenType.Identifier),
-                new CSharpToken(" ", CSharpTokenType.WhiteSpace),
-                new CSharpToken("\r\n", CSharpTokenType.NewLine));
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r\n"),
+                SyntaxFactory.Token(SyntaxKind.Whitespace, " "),
+                SyntaxFactory.Token(SyntaxKind.Transition, "@"),
+                SyntaxFactory.Token(SyntaxKind.Identifier, "something"),
+                SyntaxFactory.Token(SyntaxKind.Whitespace, " "),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r\n"));
         }
 
         [Fact]
@@ -25,18 +26,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             TestTokenizer(
                 "@*included*@\r\n @something   \"value\"\r\n @this is ignored",
-                new CSharpToken("@", CSharpTokenType.RazorCommentTransition),
-                new CSharpToken("*", CSharpTokenType.RazorCommentStar),
-                new CSharpToken("included", CSharpTokenType.RazorComment),
-                new CSharpToken("*", CSharpTokenType.RazorCommentStar),
-                new CSharpToken("@", CSharpTokenType.RazorCommentTransition),
-                new CSharpToken("\r\n", CSharpTokenType.NewLine),
-                new CSharpToken(" ", CSharpTokenType.WhiteSpace),
-                new CSharpToken("@", CSharpTokenType.Transition),
-                new CSharpToken("something", CSharpTokenType.Identifier),
-                new CSharpToken("   ", CSharpTokenType.WhiteSpace),
-                new CSharpToken("\"value\"", CSharpTokenType.StringLiteral),
-                new CSharpToken("\r\n", CSharpTokenType.NewLine));
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, "included"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r\n"),
+                SyntaxFactory.Token(SyntaxKind.Whitespace, " "),
+                SyntaxFactory.Token(SyntaxKind.Transition, "@"),
+                SyntaxFactory.Token(SyntaxKind.Identifier, "something"),
+                SyntaxFactory.Token(SyntaxKind.Whitespace, "   "),
+                SyntaxFactory.Token(SyntaxKind.StringLiteral, "\"value\""),
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r\n"));
         }
 
         internal override object CreateTokenizer(ITextDocument source)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveHtmlTokenizerTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveHtmlTokenizerTest.cs
index cffd0a0d0d..ffee2ab489 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveHtmlTokenizerTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveHtmlTokenizerTest.cs
@@ -1,6 +1,7 @@
 // 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
@@ -12,9 +13,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             TestTokenizer(
                 "\r\n <div>Ignored</div>",
-                new HtmlToken("\r\n", HtmlTokenType.NewLine),
-                new HtmlToken(" ", HtmlTokenType.WhiteSpace),
-                new HtmlToken("<", HtmlTokenType.OpenAngle));
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r\n"),
+                SyntaxFactory.Token(SyntaxKind.Whitespace, " "),
+                SyntaxFactory.Token(SyntaxKind.OpenAngle, "<"));
         }
 
         [Fact]
@@ -22,15 +23,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             TestTokenizer(
                 "\r\n @*included*@ <div>Ignored</div>",
-                new HtmlToken("\r\n", HtmlTokenType.NewLine),
-                new HtmlToken(" ", HtmlTokenType.WhiteSpace),
-                new HtmlToken("@", HtmlTokenType.RazorCommentTransition),
-                new HtmlToken("*", HtmlTokenType.RazorCommentStar),
-                new HtmlToken("included", HtmlTokenType.RazorComment),
-                new HtmlToken("*", HtmlTokenType.RazorCommentStar),
-                new HtmlToken("@", HtmlTokenType.RazorCommentTransition),
-                new HtmlToken(" ", HtmlTokenType.WhiteSpace),
-                new HtmlToken("<", HtmlTokenType.OpenAngle));
+                SyntaxFactory.Token(SyntaxKind.NewLine, "\r\n"),
+                SyntaxFactory.Token(SyntaxKind.Whitespace, " "),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, "included"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.Whitespace, " "),
+                SyntaxFactory.Token(SyntaxKind.OpenAngle, "<"));
         }
 
         internal override object CreateTokenizer(ITextDocument source)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlAttributeTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlAttributeTest.cs
index 1fae85afba..41ba2004f2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlAttributeTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlAttributeTest.cs
@@ -219,90 +219,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             ParseDocumentTest("<input value=@foo />");
         }
 
-        [Fact]
-        public void ConditionalAttributeCollapserDoesNotRewriteEscapedTransitions()
-        {
-            // Act
-            var results = ParseDocument("<span foo='@@' />");
-            var attributeCollapser = new ConditionalAttributeCollapser();
-            var rewritten = attributeCollapser.Rewrite(results.Root);
-
-            // Assert
-            BaselineTest(rewritten);
-        }
-
-        [Fact]
-        public void ConditionalAttributesDoNotCreateExtraDataForEntirelyLiteralAttribute()
-        {
-            // Arrange
-            const string code =
- @"<div class=""sidebar"">
-    <h1>Title</h1>
-    <p>
-        As the author, you can <a href=""/Photo/Edit/photoId"">edit</a>
-        or <a href=""/Photo/Remove/photoId"">remove</a> this photo.
-    </p>
-    <dl>
-        <dt class=""description"">Description</dt>
-        <dd class=""description"">
-            The uploader did not provide a description for this photo.
-        </dd>
-        <dt class=""uploaded-by"">Uploaded by</dt>
-        <dd class=""uploaded-by""><a href=""/User/View/user.UserId"">user.DisplayName</a></dd>
-        <dt class=""upload-date"">Upload date</dt>
-        <dd class=""upload-date"">photo.UploadDate</dd>
-        <dt class=""part-of-gallery"">Gallery</dt>
-        <dd><a href=""/View/gallery.Id"" title=""View gallery.Name gallery"">gallery.Name</a></dd>
-        <dt class=""tags"">Tags</dt>
-        <dd class=""tags"">
-            <ul class=""tags"">
-                <li>This photo has no tags.</li>
-            </ul>
-            <a href=""/Photo/EditTags/photoId"">edit tags</a>
-        </dd>
-    </dl>
-
-    <p>
-        <a class=""download"" href=""/Photo/Full/photoId"" title=""Download: (photo.FileTitle + photo.FileExtension)"">Download full photo</a> ((photo.FileSize / 1024) KB)
-    </p>
-</div>
-<div class=""main"">
-    <img class=""large-photo"" alt=""photo.FileTitle"" src=""/Photo/Thumbnail"" />
-    <h2>Nobody has commented on this photo</h2>
-    <ol class=""comments"">
-        <li>
-            <h3 class=""comment-header"">
-                <a href=""/User/View/comment.UserId"" title=""View comment.DisplayName's profile"">comment.DisplayName</a> commented at comment.CommentDate:
-            </h3>
-            <p class=""comment-body"">comment.CommentText</p>
-        </li>
-    </ol>
-
-    <form method=""post"" action="""">
-        <fieldset id=""addComment"">
-            <legend>Post new comment</legend>
-            <ol>
-                <li>
-                    <label for=""newComment"">Comment</label>
-                    <textarea id=""newComment"" name=""newComment"" title=""Your comment"" rows=""6"" cols=""70""></textarea>
-                </li>
-            </ol>
-            <p class=""form-actions"">
-                <input type=""submit"" title=""Add comment"" value=""Add comment"" />
-            </p>
-        </fieldset>
-    </form>
-</div>";
-
-            // Act
-            var results = ParseDocument(code);
-            var attributeCollapser = new ConditionalAttributeCollapser();
-            var rewritten = attributeCollapser.Rewrite(results.Root);
-
-            // Assert
-            Assert.Equal(rewritten.Children.Count(), results.Root.Children.Count());
-        }
-
         [Fact]
         public void ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag()
         {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlDocumentTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlDocumentTest.cs
index f77ee48b60..ca41b2d477 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlDocumentTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlDocumentTest.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Xunit;
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlMarkupParserTests.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlMarkupParserTests.cs
index 839eb92353..dafb6b2419 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlMarkupParserTests.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlMarkupParserTests.cs
@@ -1,24 +1,28 @@
-using System;
+// 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;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
 {
     public class HtmlMarkupParserTests
     {
-        private static readonly HtmlToken doubleHyphenToken = new HtmlToken("--", HtmlTokenType.DoubleHyphen);
+        private static readonly SyntaxToken doubleHyphenToken = SyntaxFactory.Token(SyntaxKind.DoubleHyphen, "--");
 
         public static IEnumerable<object[]> NonDashTokens
         {
             get
             {
-                yield return new[] { new HtmlToken("--", HtmlTokenType.DoubleHyphen) };
-                yield return new[] { new HtmlToken("asdf", HtmlTokenType.Text) };
-                yield return new[] { new HtmlToken(">", HtmlTokenType.CloseAngle) };
-                yield return new[] { new HtmlToken("<", HtmlTokenType.OpenAngle) };
-                yield return new[] { new HtmlToken("!", HtmlTokenType.Bang) };
+                yield return new[] { SyntaxFactory.Token(SyntaxKind.DoubleHyphen, "--") };
+                yield return new[] { SyntaxFactory.Token(SyntaxKind.Text, "asdf") };
+                yield return new[] { SyntaxFactory.Token(SyntaxKind.CloseAngle, ">") };
+                yield return new[] { SyntaxFactory.Token(SyntaxKind.OpenAngle, "<") };
+                yield return new[] { SyntaxFactory.Token(SyntaxKind.Bang, "!") };
             }
         }
 
@@ -27,7 +31,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
         public void IsHyphen_ReturnsFalseForNonDashToken(object token)
         {
             // Arrange
-            var convertedToken = (HtmlToken)token;
+            var convertedToken = (SyntaxToken)token;
 
             // Act & Assert
             Assert.False(HtmlMarkupParser.IsHyphen(convertedToken));
@@ -37,7 +41,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
         public void IsHyphen_ReturnsTrueForADashToken()
         {
             // Arrange
-            var dashToken = new HtmlToken("-", HtmlTokenType.Text);
+            var dashToken = SyntaxFactory.Token(SyntaxKind.Text, "-");
 
             // Act & Assert
             Assert.True(HtmlMarkupParser.IsHyphen(dashToken));
@@ -53,9 +57,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
             var token = sut.AcceptAllButLastDoubleHyphens();
 
             // Assert
-            Assert.Equal(doubleHyphenToken, token);
-            Assert.True(sut.At(HtmlTokenType.CloseAngle));
-            Assert.Equal(doubleHyphenToken, sut.PreviousToken);
+            Assert.True(doubleHyphenToken.IsEquivalentTo(token));
+            Assert.True(sut.At(SyntaxKind.CloseAngle));
+            Assert.True(doubleHyphenToken.IsEquivalentTo(sut.PreviousToken));
         }
 
         [Fact]
@@ -68,8 +72,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
             var token = sut.AcceptAllButLastDoubleHyphens();
 
             // Assert
-            Assert.Equal(doubleHyphenToken, token);
-            Assert.True(sut.At(HtmlTokenType.CloseAngle));
+            Assert.True(doubleHyphenToken.IsEquivalentTo(token));
+            Assert.True(sut.At(SyntaxKind.CloseAngle));
             Assert.True(HtmlMarkupParser.IsHyphen(sut.PreviousToken));
         }
 
@@ -157,8 +161,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
         public void IsCommentContentEndingInvalid_ReturnsFalseForAllowedContent()
         {
             // Arrange
-            var expectedToken1 = new HtmlToken("a", HtmlTokenType.Text);
-            var sequence = Enumerable.Range((int)'a', 26).Select(item => new HtmlToken(((char)item).ToString(), HtmlTokenType.Text));
+            var expectedToken1 = SyntaxFactory.Token(SyntaxKind.Text, "a");
+            var sequence = Enumerable.Range((int)'a', 26).Select(item => SyntaxFactory.Token(SyntaxKind.Text, ((char)item).ToString()));
 
             // Act & Assert
             Assert.False(HtmlMarkupParser.IsCommentContentEndingInvalid(sequence));
@@ -168,8 +172,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
         public void IsCommentContentEndingInvalid_ReturnsTrueForDisallowedContent()
         {
             // Arrange
-            var expectedToken1 = new HtmlToken("a", HtmlTokenType.Text);
-            var sequence = new[] { new HtmlToken("<", HtmlTokenType.OpenAngle), new HtmlToken("!", HtmlTokenType.Bang), new HtmlToken("-", HtmlTokenType.Text) };
+            var expectedToken1 = SyntaxFactory.Token(SyntaxKind.Text, "a");
+            var sequence = new[]
+            {
+                SyntaxFactory.Token(SyntaxKind.OpenAngle, "<"),
+                SyntaxFactory.Token(SyntaxKind.Bang, "!"),
+                SyntaxFactory.Token(SyntaxKind.Text, "-")
+            };
 
             // Act & Assert
             Assert.True(HtmlMarkupParser.IsCommentContentEndingInvalid(sequence));
@@ -179,8 +188,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
         public void IsCommentContentEndingInvalid_ReturnsFalseForEmptyContent()
         {
             // Arrange
-            var expectedToken1 = new HtmlToken("a", HtmlTokenType.Text);
-            var sequence = Array.Empty<HtmlToken>();
+            var expectedToken1 = SyntaxFactory.Token(SyntaxKind.Text, "a");
+            var sequence = Array.Empty<SyntaxToken>();
 
             // Act & Assert
             Assert.False(HtmlMarkupParser.IsCommentContentEndingInvalid(sequence));
@@ -188,7 +197,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
 
         private class TestHtmlMarkupParser : HtmlMarkupParser
         {
-            public new HtmlToken PreviousToken
+            public new SyntaxToken PreviousToken
             {
                 get => base.PreviousToken;
             }
@@ -200,18 +209,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
 
             public TestHtmlMarkupParser(ParserContext context) : base(context)
             {
-                this.EnsureCurrent();
+                EnsureCurrent();
             }
 
-            public new HtmlToken AcceptAllButLastDoubleHyphens()
+            public new SyntaxToken AcceptAllButLastDoubleHyphens()
             {
                 return base.AcceptAllButLastDoubleHyphens();
             }
-
-            public override void BuildSpan(SpanBuilder span, SourceLocation start, string content)
-            {
-                base.BuildSpan(span, start, content);
-            }
         }
 
         private static TestHtmlMarkupParser CreateTestParserForContent(string content)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlToCodeSwitchTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlToCodeSwitchTest.cs
index 3676dc27ab..8c32914815 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlToCodeSwitchTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlToCodeSwitchTest.cs
@@ -144,7 +144,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         [Fact]
         public void ParseDocumentTreatsPairsOfAtSignsAsEscapeSequence()
         {
-            var factory = new SpanFactory();
             ParseDocumentTest("<foo>@@@@@bar</foo>");
         }
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTest.cs
index 9b54d75957..92091fa278 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTest.cs
@@ -1,6 +1,7 @@
 // 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
@@ -17,113 +18,113 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void Text_Is_Recognized()
         {
             TestTokenizer("foo-9309&smlkmb;::-3029022,.sdkq92384",
-                          new HtmlToken("foo-9309&smlkmb;::-3029022,.sdkq92384", HtmlTokenType.Text));
+                          SyntaxFactory.Token(SyntaxKind.Text, "foo-9309&smlkmb;::-3029022,.sdkq92384"));
         }
 
         [Fact]
         public void Whitespace_Is_Recognized()
         {
             TestTokenizer(" \t\f ",
-                          new HtmlToken(" \t\f ", HtmlTokenType.WhiteSpace));
+                          SyntaxFactory.Token(SyntaxKind.Whitespace, " \t\f "));
         }
 
         [Fact]
         public void Newline_Is_Recognized()
         {
             TestTokenizer("\n\r\r\n",
-                          new HtmlToken("\n", HtmlTokenType.NewLine),
-                          new HtmlToken("\r", HtmlTokenType.NewLine),
-                          new HtmlToken("\r\n", HtmlTokenType.NewLine));
+                          SyntaxFactory.Token(SyntaxKind.NewLine, "\n"),
+                          SyntaxFactory.Token(SyntaxKind.NewLine, "\r"),
+                          SyntaxFactory.Token(SyntaxKind.NewLine, "\r\n"));
         }
 
         [Fact]
         public void Transition_Is_Not_Recognized_Mid_Text_If_Surrounded_By_Alphanumeric_Characters()
         {
-            TestSingleToken("foo@bar", HtmlTokenType.Text);
+            TestSingleToken("foo@bar", SyntaxKind.Text);
         }
 
         [Fact]
         public void OpenAngle_Is_Recognized()
         {
-            TestSingleToken("<", HtmlTokenType.OpenAngle);
+            TestSingleToken("<", SyntaxKind.OpenAngle);
         }
 
         [Fact]
         public void Bang_Is_Recognized()
         {
-            TestSingleToken("!", HtmlTokenType.Bang);
+            TestSingleToken("!", SyntaxKind.Bang);
         }
 
         [Fact]
         public void Solidus_Is_Recognized()
         {
-            TestSingleToken("/", HtmlTokenType.ForwardSlash);
+            TestSingleToken("/", SyntaxKind.ForwardSlash);
         }
 
         [Fact]
         public void QuestionMark_Is_Recognized()
         {
-            TestSingleToken("?", HtmlTokenType.QuestionMark);
+            TestSingleToken("?", SyntaxKind.QuestionMark);
         }
 
         [Fact]
         public void LeftBracket_Is_Recognized()
         {
-            TestSingleToken("[", HtmlTokenType.LeftBracket);
+            TestSingleToken("[", SyntaxKind.LeftBracket);
         }
 
         [Fact]
         public void CloseAngle_Is_Recognized()
         {
-            TestSingleToken(">", HtmlTokenType.CloseAngle);
+            TestSingleToken(">", SyntaxKind.CloseAngle);
         }
 
         [Fact]
         public void RightBracket_Is_Recognized()
         {
-            TestSingleToken("]", HtmlTokenType.RightBracket);
+            TestSingleToken("]", SyntaxKind.RightBracket);
         }
 
         [Fact]
         public void Equals_Is_Recognized()
         {
-            TestSingleToken("=", HtmlTokenType.Equals);
+            TestSingleToken("=", SyntaxKind.Equals);
         }
 
         [Fact]
         public void DoubleQuote_Is_Recognized()
         {
-            TestSingleToken("\"", HtmlTokenType.DoubleQuote);
+            TestSingleToken("\"", SyntaxKind.DoubleQuote);
         }
 
         [Fact]
         public void SingleQuote_Is_Recognized()
         {
-            TestSingleToken("'", HtmlTokenType.SingleQuote);
+            TestSingleToken("'", SyntaxKind.SingleQuote);
         }
 
         [Fact]
         public void Transition_Is_Recognized()
         {
-            TestSingleToken("@", HtmlTokenType.Transition);
+            TestSingleToken("@", SyntaxKind.Transition);
         }
 
         [Fact]
         public void DoubleHyphen_Is_Recognized()
         {
-            TestSingleToken("--", HtmlTokenType.DoubleHyphen);
+            TestSingleToken("--", SyntaxKind.DoubleHyphen);
         }
 
         [Fact]
         public void SingleHyphen_Is_Not_Recognized()
         {
-            TestSingleToken("-", HtmlTokenType.Text);
+            TestSingleToken("-", SyntaxKind.Text);
         }
 
         [Fact]
         public void SingleHyphen_Mid_Text_Is_Not_Recognized_As_Separate_Token()
         {
-            TestSingleToken("foo-bar", HtmlTokenType.Text);
+            TestSingleToken("foo-bar", SyntaxKind.Text);
         }
 
         [Fact]
@@ -131,9 +132,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             TestTokenizer(
                 "@* Foo * Bar * Baz *",
-                new HtmlToken("@", HtmlTokenType.RazorCommentTransition),
-                new HtmlToken("*", HtmlTokenType.RazorCommentStar),
-                new HtmlToken(" Foo * Bar * Baz *", HtmlTokenType.RazorComment));
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, " Foo * Bar * Baz *"));
         }
 
         [Fact]
@@ -141,11 +142,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             TestTokenizer(
                 "@* Foo * Bar * Baz *@",
-                new HtmlToken("@", HtmlTokenType.RazorCommentTransition),
-                new HtmlToken("*", HtmlTokenType.RazorCommentStar),
-                new HtmlToken(" Foo * Bar * Baz ", HtmlTokenType.RazorComment),
-                new HtmlToken("*", HtmlTokenType.RazorCommentStar),
-                new HtmlToken("@", HtmlTokenType.RazorCommentTransition));
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, " Foo * Bar * Baz "),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"));
         }
 
         [Fact]
@@ -153,11 +154,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             TestTokenizer(
                 "@* Foo Bar Baz *@",
-                new HtmlToken("@", HtmlTokenType.RazorCommentTransition),
-                new HtmlToken("*", HtmlTokenType.RazorCommentStar),
-                new HtmlToken(" Foo Bar Baz ", HtmlTokenType.RazorComment),
-                new HtmlToken("*", HtmlTokenType.RazorCommentStar),
-                new HtmlToken("@", HtmlTokenType.RazorCommentTransition));
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentLiteral, " Foo Bar Baz "),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentStar, "*"),
+                SyntaxFactory.Token(SyntaxKind.RazorCommentTransition, "@"));
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTestBase.cs
index 6416496b32..0b6250d6d8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTestBase.cs
@@ -1,11 +1,13 @@
 // 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 Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
+
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     public abstract class HtmlTokenizerTestBase : TokenizerTestBase
     {
-        private static HtmlToken _ignoreRemaining = new HtmlToken(string.Empty, HtmlTokenType.Unknown);
+        private static SyntaxToken _ignoreRemaining = SyntaxFactory.Token(SyntaxKind.Marker, string.Empty);
 
         internal override object IgnoreRemaining
         {
@@ -17,14 +19,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return new HtmlTokenizer(source);
         }
 
-        internal void TestSingleToken(string text, HtmlTokenType expectedTokenType)
+        internal void TestSingleToken(string text, SyntaxKind expectedTokenKind)
         {
-            TestTokenizer(text, new HtmlToken(text, expectedTokenType));
-        }
-
-        internal void TestTokenizer(string input, params HtmlToken[] expectedTokens)
-        {
-            base.TestTokenizer<HtmlToken, HtmlTokenType>(input, expectedTokens);
+            TestTokenizer(text, SyntaxFactory.Token(expectedTokenKind, text));
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/ImplicitExpressionEditHandlerTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/ImplicitExpressionEditHandlerTest.cs
index f96e7920af..bf71526ede 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/ImplicitExpressionEditHandlerTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/ImplicitExpressionEditHandlerTest.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
@@ -13,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void IsAcceptableDeletionInBalancedParenthesis_DeletionStartNotInBalancedParenthesis_ReturnsFalse()
         {
             // Arrange
-            var span = GetSpan(SourceLocation.Zero, "(Hell)(o)");
+            var span = GetSyntaxNode(SourceLocation.Zero, "(Hell)(o)");
             var change = new SourceChange(new SourceSpan(6, 1), string.Empty);
 
             // Act
@@ -27,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void IsAcceptableDeletionInBalancedParenthesis_DeletionEndNotInBalancedParenthesis_ReturnsFalse()
         {
             // Arrange
-            var span = GetSpan(SourceLocation.Zero, "(Hell)(o)");
+            var span = GetSyntaxNode(SourceLocation.Zero, "(Hell)(o)");
             var change = new SourceChange(new SourceSpan(5, 1), string.Empty);
 
             // Act
@@ -41,7 +42,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void IsAcceptableDeletionInBalancedParenthesis_DeletionOverlapsBalancedParenthesis_ReturnsFalse()
         {
             // Arrange
-            var span = GetSpan(SourceLocation.Zero, "(Hell)(o)");
+            var span = GetSyntaxNode(SourceLocation.Zero, "(Hell)(o)");
             var change = new SourceChange(new SourceSpan(5, 2), string.Empty);
 
             // Act
@@ -55,7 +56,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void IsAcceptableDeletionInBalancedParenthesis_DeletionDoesNotImpactBalancedParenthesis_ReturnsTrue()
         {
             // Arrange
-            var span = GetSpan(SourceLocation.Zero, "(H(ell)o)");
+            var span = GetSyntaxNode(SourceLocation.Zero, "(H(ell)o)");
             var change = new SourceChange(new SourceSpan(3, 3), string.Empty);
 
             // Act
@@ -159,7 +160,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void TryUpdateBalanceCount_SingleLeftParenthesis_CountsCorrectly()
         {
             // Arrange
-            var token = new CSharpToken("(", CSharpTokenType.LeftParenthesis);
+            var token = Syntax.SyntaxFactory.Token(SyntaxKind.LeftParenthesis, "(");
             var count = 0;
 
             // Act
@@ -174,7 +175,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void TryUpdateBalanceCount_SingleRightParenthesis_CountsCorrectly()
         {
             // Arrange
-            var token = new CSharpToken(")", CSharpTokenType.RightParenthesis);
+            var token = Syntax.SyntaxFactory.Token(SyntaxKind.RightParenthesis, ")");
             var count = 2;
 
             // Act
@@ -189,7 +190,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void TryUpdateBalanceCount_IncompleteStringLiteral_CountsCorrectly()
         {
             // Arrange
-            var token = new CSharpToken("\"((", CSharpTokenType.StringLiteral);
+            var token = Syntax.SyntaxFactory.Token(SyntaxKind.StringLiteral, "\"((");
             var count = 2;
 
             // Act
@@ -204,7 +205,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void TryUpdateBalanceCount_IncompleteCharacterLiteral_CountsCorrectly()
         {
             // Arrange
-            var token = new CSharpToken("'((", CSharpTokenType.CharacterLiteral);
+            var token = Syntax.SyntaxFactory.Token(SyntaxKind.CharacterLiteral, "'((");
             var count = 2;
 
             // Act
@@ -219,7 +220,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void TryUpdateBalanceCount_CompleteStringLiteral_CountsCorrectly()
         {
             // Arrange
-            var token = new CSharpToken("\"((\"", CSharpTokenType.StringLiteral);
+            var token = Syntax.SyntaxFactory.Token(SyntaxKind.StringLiteral, "\"((\"");
             var count = 2;
 
             // Act
@@ -234,7 +235,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void TryUpdateBalanceCount_CompleteCharacterLiteral_CountsCorrectly()
         {
             // Arrange
-            var token = new CSharpToken("'('", CSharpTokenType.CharacterLiteral);
+            var token = Syntax.SyntaxFactory.Token(SyntaxKind.CharacterLiteral, "'('");
             var count = 2;
 
             // Act
@@ -249,7 +250,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void TryUpdateBalanceCount_InvalidParenthesis_ReturnsFalse()
         {
             // Arrange
-            var token = new CSharpToken(")", CSharpTokenType.RightParenthesis);
+            var token = Syntax.SyntaxFactory.Token(SyntaxKind.RightParenthesis, ")");
             var count = 0;
 
             // Act
@@ -264,7 +265,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void TryUpdateBalanceCount_InvalidParenthesisStringLiteral_ReturnsFalse()
         {
             // Arrange
-            var token = new CSharpToken("\")", CSharpTokenType.StringLiteral);
+            var token = Syntax.SyntaxFactory.Token(SyntaxKind.StringLiteral, "\")");
             var count = 0;
 
             // Act
@@ -279,7 +280,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void TryUpdateBalanceCount_InvalidParenthesisCharacterLiteral_ReturnsFalse()
         {
             // Arrange
-            var token = new CSharpToken("')", CSharpTokenType.CharacterLiteral);
+            var token = Syntax.SyntaxFactory.Token(SyntaxKind.CharacterLiteral, "')");
             var count = 0;
 
             // Act
@@ -402,7 +403,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void IsAcceptableInsertionInBalancedParenthesis_InsertingParenthesis_ReturnsFalse(string text)
         {
             // Arrange
-            var span = GetSpan(SourceLocation.Zero, "(Hello World)");
+            var span = GetSyntaxNode(SourceLocation.Zero, "(Hello World)");
             var change = new SourceChange(new SourceSpan(3, 0), text);
 
             // Act
@@ -416,7 +417,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void IsAcceptableInsertionInBalancedParenthesis_UnbalancedParenthesis_ReturnsFalse()
         {
             // Arrange
-            var span = GetSpan(SourceLocation.Zero, "(Hello");
+            var span = GetSyntaxNode(SourceLocation.Zero, "(Hello");
             var change = new SourceChange(new SourceSpan(6, 0), " World");
 
             // Act
@@ -430,7 +431,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void IsAcceptableInsertionInBalancedParenthesis_BalancedParenthesis_ReturnsTrue()
         {
             // Arrange
-            var span = GetSpan(SourceLocation.Zero, "(Hello)");
+            var span = GetSyntaxNode(SourceLocation.Zero, "(Hello)");
             var change = new SourceChange(new SourceSpan(6, 0), " World");
 
             // Act
@@ -440,24 +441,23 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             Assert.True(result);
         }
 
-        private static Span GetSpan(SourceLocation start, string content)
+        private static Syntax.MarkupTextLiteralSyntax GetSyntaxNode(SourceLocation start, string content)
         {
-            var spanBuilder = new SpanBuilder(start);
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
             var tokens = CSharpLanguageCharacteristics.Instance.TokenizeString(content).ToArray();
             foreach (var token in tokens)
             {
-                spanBuilder.Accept(token);
+                builder.Add(token);
             }
-            var span = spanBuilder.Build();
+            var node = SyntaxFactory.MarkupTextLiteral(builder.ToList()).CreateRed(parent: null, position: start.AbsoluteIndex);
 
-            return span;
+            return (Syntax.MarkupTextLiteralSyntax)node;
         }
 
-        private static IReadOnlyList<CSharpToken> GetTokens(SourceLocation start, string content)
+        private static IReadOnlyList<Syntax.SyntaxToken> GetTokens(SourceLocation start, string content)
         {
-            var parent = GetSpan(start, content);
-            var tokens = parent.Tokens.Cast<CSharpToken>().ToArray();
-            return tokens;
+            var parent = GetSyntaxNode(start, content);
+            return parent.LiteralTokens;
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/MarkupElementRewriterTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/MarkupElementRewriterTest.cs
new file mode 100644
index 0000000000..4275ec123a
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/MarkupElementRewriterTest.cs
@@ -0,0 +1,154 @@
+// 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.Text;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class MarkupElementRewriterTest : CsHtmlMarkupParserTestBase
+    {
+        [Fact]
+        public void Rewrites_ValidTags()
+        {
+            // Arrange
+            var content = @"
+<div>Foo</div>
+<p>Bar</p>
+";
+
+            // Act & Assert
+            RewriterTest(content);
+        }
+
+        [Fact]
+        public void Rewrites_ValidNestedTags()
+        {
+            // Arrange
+            var content = @"
+<div>
+    Foo
+    <p>Bar</p>
+    Baz
+</div>";
+
+            // Act & Assert
+            RewriterTest(content);
+        }
+
+        [Fact]
+        public void Rewrites_ValidNestedTagsMixedWithCode()
+        {
+            // Arrange
+            var content = @"
+<div>
+    Foo
+    <p>@Bar</p>
+    @{ var x = Bar; }
+</div>
+";
+
+            // Act & Assert
+            RewriterTest(content);
+        }
+
+        [Fact]
+        public void Rewrites_EndTagsWithMissingStartTags()
+        {
+            // Arrange
+            var content = @"
+Foo</div>
+";
+
+            // Act & Assert
+            RewriterTest(content);
+        }
+
+        [Fact]
+        public void Rewrites_StartTagsWithMissingEndTags()
+        {
+            // Arrange
+            var content = @"
+<div>
+    Foo
+    <p>
+        Bar
+        </strong>
+";
+
+            // Act & Assert
+            RewriterTest(content);
+        }
+
+        [Fact]
+        public void Rewrites_SelfClosingTags()
+        {
+            // Arrange
+            var content = @"
+<br/>Foo<custom />
+";
+
+            // Act & Assert
+            RewriterTest(content);
+        }
+
+        [Fact]
+        public void Rewrites_MalformedTags_RecoversSuccessfully()
+        {
+            // Arrange
+            var content = @"
+<div>content</span>footer</div>
+";
+
+            // Act & Assert
+            RewriterTest(content);
+        }
+
+        [Fact]
+        public void Rewrites_MisplacedEndTags_RecoversSuccessfully()
+        {
+            // Arrange
+            var content = @"
+<div>content<span>footer</div></span>
+";
+
+            // Act & Assert
+            RewriterTest(content);
+        }
+
+        [Fact]
+        public void Rewrites_DoesNotSpecialCase_VoidTags()
+        {
+            // Arrange
+            var content = @"
+<input>Foo</input>
+";
+
+            // Act & Assert
+            RewriterTest(content);
+        }
+
+        [Fact]
+        public void Rewrites_IncompleteTags()
+        {
+            // Arrange
+            var content = @"
+<<div>>Foo</</div><   >
+";
+
+            // Act & Assert
+            RewriterTest(content);
+        }
+
+        private void RewriterTest(string input)
+        {
+            var syntaxTree = ParseDocument(input, designTime: false);
+            var rewritten = MarkupElementRewriter.AddMarkupElements(syntaxTree);
+            BaselineTest(rewritten);
+
+            var unrewritten = MarkupElementRewriter.RemoveMarkupElements(rewritten);
+            Assert.Equal(syntaxTree.Root.SerializedValue, unrewritten.Root.SerializedValue);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpDirectivesTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/RazorDirectivesTest.cs
similarity index 88%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpDirectivesTest.cs
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/RazorDirectivesTest.cs
index 2452e64f88..e4b999fd19 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpDirectivesTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/RazorDirectivesTest.cs
@@ -9,7 +9,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
-    public class CSharpDirectivesTest : CsHtmlCodeParserTestBase
+    public class RazorDirectivesTest : CsHtmlCodeParserTestBase
     {
         [Fact]
         public void DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates()
@@ -121,7 +121,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddStringToken().AddStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom \"string1\"\"string2\"",
                 new[] { descriptor });
         }
@@ -136,7 +136,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddNamespaceToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom System.",
                 new[] { descriptor });
         }
@@ -151,7 +151,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddNamespaceToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom System<",
                 new[] { descriptor });
         }
@@ -165,7 +165,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddNamespaceToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom System." + Environment.NewLine,
                 new[] { descriptor });
         }
@@ -180,7 +180,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddNamespaceToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom System<" + Environment.NewLine,
                 new[] { descriptor });
         }
@@ -195,7 +195,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddTypeToken());
 
             // Act & Assert
-            ParseCodeBlockTest(Environment.NewLine + "  @custom System.Text.Encoding.ASCIIEncoding",
+            ParseDocumentTest(Environment.NewLine + "  @custom System.Text.Encoding.ASCIIEncoding",
                 new[] { descriptor });
         }
 
@@ -203,14 +203,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace()
         {
             // Act & Assert
-            ParseCodeBlockTest(Environment.NewLine + "  @addTagHelper \"*, Foo\"");
+            ParseDocumentTest(Environment.NewLine + "  @addTagHelper \"*, Foo\"");
         }
 
         [Fact]
         public void BuiltInDirectiveErrorsIfNotAtStartOfLine()
         {
             // Act & Assert
-            ParseCodeBlockTest("{  @addTagHelper \"*, Foo\"" + Environment.NewLine + "}");
+            ParseDocumentTest("{  @addTagHelper \"*, Foo\"" + Environment.NewLine + "}");
         }
 
         [Fact]
@@ -223,7 +223,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddTypeToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "{  @custom System.Text.Encoding.ASCIIEncoding" + Environment.NewLine + "}",
                 new[] { descriptor });
         }
@@ -238,7 +238,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddTypeToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom System.Text.Encoding.ASCIIEncoding",
                 new[] { descriptor });
         }
@@ -253,7 +253,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddMemberToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom Some_Member",
                 new[] { descriptor });
         }
@@ -268,7 +268,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddNamespaceToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom BaseNamespace",
                 new[] { descriptor });
         }
@@ -283,7 +283,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddNamespaceToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom BaseNamespace.Foo.Bar",
                 new[] { descriptor });
         }
@@ -298,7 +298,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom \"AString\"",
                 new[] { descriptor });
         }
@@ -313,7 +313,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom AString",
                 new[] { descriptor });
         }
@@ -328,7 +328,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom {foo?}",
                 new[] { descriptor });
         }
@@ -343,7 +343,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom 'AString'",
                 new[] { descriptor });
         }
@@ -358,7 +358,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom AString\"",
                 new[] { descriptor });
         }
@@ -373,7 +373,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddTypeToken().AddMemberToken().AddStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom System.Text.Encoding.ASCIIEncoding Some_Member \"AString\"",
                 new[] { descriptor });
         }
@@ -388,7 +388,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom \"Header\" { <p>F{o}o</p> }",
                 new[] { descriptor });
         }
@@ -403,7 +403,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom \"Name\" { foo(); bar(); }",
                 new[] { descriptor });
         }
@@ -418,7 +418,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddTypeToken().AddMemberToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom    System.Text.Encoding.ASCIIEncoding       Some_Member    ",
                 new[] { descriptor });
         }
@@ -433,7 +433,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddMemberToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom -Some_Member",
                 new[] { descriptor });
         }
@@ -448,7 +448,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom \"hello\" ;  ",
                 new[] { descriptor });
         }
@@ -488,7 +488,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
 
             // Act & Assert
-            ParseCodeBlockTest(source, new[] { descriptor });
+            ParseDocumentTest(source, new[] { descriptor });
         }
 
         [Fact]
@@ -526,7 +526,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
 
             // Act & Assert
-            ParseCodeBlockTest(source, new[] { descriptor });
+            ParseDocumentTest(source, new[] { descriptor });
         }
 
         [Fact]
@@ -539,7 +539,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddTypeToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 $"@custom (bool, int?)   ",
                 new[] { descriptor });
         }
@@ -554,7 +554,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom \"hello\" \"world\"",
                 new[] { descriptor });
         }
@@ -569,7 +569,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom \"Hello\" World { foo(); bar(); }",
                 new[] { descriptor });
         }
@@ -584,7 +584,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom \"Hello\"",
                 new[] { descriptor });
         }
@@ -599,7 +599,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom \"Hello\" {",
                 new[] { descriptor });
         }
@@ -607,134 +607,134 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         [Fact]
         public void TagHelperPrefixDirective_NoValueSucceeds()
         {
-            ParseBlockTest("@tagHelperPrefix \"\"");
+            ParseDocumentTest("@tagHelperPrefix \"\"");
         }
 
         [Fact]
         public void TagHelperPrefixDirective_Succeeds()
         {
-            ParseBlockTest("@tagHelperPrefix Foo");
+            ParseDocumentTest("@tagHelperPrefix Foo");
         }
 
         [Fact]
         public void TagHelperPrefixDirective_WithQuotes_Succeeds()
         {
-            ParseBlockTest("@tagHelperPrefix \"Foo\"");
+            ParseDocumentTest("@tagHelperPrefix \"Foo\"");
         }
 
         [Fact]
         public void TagHelperPrefixDirective_RequiresValue()
         {
-            ParseBlockTest("@tagHelperPrefix ");
+            ParseDocumentTest("@tagHelperPrefix ");
         }
 
         [Fact]
         public void TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue()
         {
-            ParseBlockTest("@tagHelperPrefix \"Foo");
+            ParseDocumentTest("@tagHelperPrefix \"Foo");
         }
 
         [Fact]
         public void TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue()
         {
-            ParseBlockTest("@tagHelperPrefix Foo   \"");
+            ParseDocumentTest("@tagHelperPrefix Foo   \"");
         }
 
         [Fact]
         public void RemoveTagHelperDirective_NoValue_Invalid()
         {
-            ParseBlockTest("@removeTagHelper \"\"");
+            ParseDocumentTest("@removeTagHelper \"\"");
         }
 
         [Fact]
         public void RemoveTagHelperDirective_InvalidLookupText_AddsError()
         {
-            ParseBlockTest("@removeTagHelper Foo");
+            ParseDocumentTest("@removeTagHelper Foo");
         }
 
         [Fact]
         public void RemoveTagHelperDirective_SingleQuotes_AddsError()
         {
-            ParseBlockTest("@removeTagHelper '*, Foo'");
+            ParseDocumentTest("@removeTagHelper '*, Foo'");
         }
 
         [Fact]
         public void RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError()
         {
-            ParseBlockTest("@removeTagHelper \"Foo\"");
+            ParseDocumentTest("@removeTagHelper \"Foo\"");
         }
 
         [Fact]
         public void RemoveTagHelperDirective_SupportsSpaces()
         {
-            ParseBlockTest("@removeTagHelper     Foo,   Bar    ");
+            ParseDocumentTest("@removeTagHelper     Foo,   Bar    ");
         }
 
         [Fact]
         public void RemoveTagHelperDirective_RequiresValue()
         {
-            ParseBlockTest("@removeTagHelper ");
+            ParseDocumentTest("@removeTagHelper ");
         }
 
         [Fact]
         public void RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue()
         {
             // Arrange
-            ParseBlockTest("@removeTagHelper \"Foo");
+            ParseDocumentTest("@removeTagHelper \"Foo");
         }
 
         [Fact]
         public void RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue()
         {
-            ParseBlockTest("@removeTagHelper Foo\"");
+            ParseDocumentTest("@removeTagHelper Foo\"");
         }
 
         [Fact]
         public void AddTagHelperDirective_NoValue_Invalid()
         {
-            ParseBlockTest("@addTagHelper \"\"");
+            ParseDocumentTest("@addTagHelper \"\"");
         }
 
         [Fact]
         public void AddTagHelperDirective_InvalidLookupText_AddsError()
         {
-            ParseBlockTest("@addTagHelper Foo");
+            ParseDocumentTest("@addTagHelper Foo");
         }
 
         [Fact]
         public void AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError()
         {
-            ParseBlockTest("@addTagHelper \"Foo\"");
+            ParseDocumentTest("@addTagHelper \"Foo\"");
         }
 
         [Fact]
         public void AddTagHelperDirective_SingleQuotes_AddsError()
         {
-            ParseBlockTest("@addTagHelper '*, Foo'");
+            ParseDocumentTest("@addTagHelper '*, Foo'");
         }
 
         [Fact]
         public void AddTagHelperDirective_SupportsSpaces()
         {
-            ParseBlockTest("@addTagHelper     Foo,   Bar    ");
+            ParseDocumentTest("@addTagHelper     Foo,   Bar    ");
         }
 
         [Fact]
         public void AddTagHelperDirective_RequiresValue()
         {
-            ParseBlockTest("@addTagHelper ");
+            ParseDocumentTest("@addTagHelper ");
         }
 
         [Fact]
         public void AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue()
         {
-            ParseBlockTest("@addTagHelper \"Foo");
+            ParseDocumentTest("@addTagHelper \"Foo");
         }
 
         [Fact]
         public void AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue()
         {
-            ParseBlockTest("@addTagHelper Foo\"");
+            ParseDocumentTest("@addTagHelper Foo\"");
         }
 
         [Fact]
@@ -764,7 +764,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         [Fact]
         public void Parse_FunctionsDirective()
         {
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@functions { foo(); bar(); }",
                 new[] { FunctionsDirective.Directive, });
         }
@@ -772,7 +772,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         [Fact]
         public void EmptyFunctionsDirective()
         {
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@functions { }",
                 new[] { FunctionsDirective.Directive, });
         }
@@ -780,7 +780,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         [Fact]
         public void Parse_SectionDirective()
         {
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@section Header { <p>F{o}o</p> }",
                 new[] { SectionDirective.Directive, });
         }
@@ -795,7 +795,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddOptionalStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom ",
                 new[] { descriptor });
         }
@@ -810,7 +810,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddOptionalStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom \"simple-value\"",
                 new[] { descriptor });
         }
@@ -825,7 +825,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddOptionalStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom \"{formaction}?/{id}?\"",
                 new[] { descriptor });
         }
@@ -840,7 +840,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddOptionalStringToken().AddOptionalTypeToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@custom \"{formaction}?/{id}?\" System.String",
                 new[] { descriptor });
         }
@@ -855,7 +855,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddOptionalMemberToken().AddOptionalStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@TestDirective ",
                 new[] { descriptor });
         }
@@ -870,7 +870,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 b => b.AddOptionalMemberToken().AddOptionalStringToken());
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@TestDirective PropertyName",
                 new[] { descriptor });
         }
@@ -884,7 +884,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 DirectiveKind.SingleLine);
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@class",
                 new[] { descriptor });
         }
@@ -898,25 +898,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 DirectiveKind.SingleLine);
 
             // Act & Assert
-            ParseCodeBlockTest(
+            ParseDocumentTest(
                 "@namespace",
                 new[] { descriptor });
         }
-
-        internal virtual void ParseCodeBlockTest(string document)
-        {
-            ParseCodeBlockTest(document, Array.Empty<DirectiveDescriptor>());
-        }
-
-        internal virtual void ParseCodeBlockTest(
-            string document,
-            IEnumerable<DirectiveDescriptor> descriptors,
-            Block expected = null,
-            params RazorDiagnostic[] expectedErrors)
-        {
-            var result = ParseCodeBlock(RazorLanguageVersion.Latest, document, descriptors, designTime: false);
-
-            BaselineTest(result);
-        }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/RazorParserTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/RazorParserTest.cs
index 15dacfdaf8..7d848c2975 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/RazorParserTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/RazorParserTest.cs
@@ -1,7 +1,6 @@
 // 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.Linq;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
@@ -22,67 +21,32 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void ParseMethodCallsParseDocumentOnMarkupParserAndReturnsResults()
         {
             // Arrange
-            var factory = new SpanFactory();
             var parser = new RazorParser();
+            var expected =
+@"RazorDocument - [0..12)::12 - [foo @bar baz]
+    MarkupBlock - [0..12)::12
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..8)::4
+            CSharpImplicitExpression - [4..8)::4
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..8)::3
+                    CSharpCodeBlock - [5..8)::3
+                        CSharpExpressionLiteral - [5..8)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[bar];
+        MarkupTextLiteral - [8..12)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
+";
 
             // Act
             var syntaxTree = parser.Parse(TestRazorSourceDocument.Create("foo @bar baz"));
 
             // Assert
-            ParserTestBase.EvaluateResults(parser.Parse(TestRazorSourceDocument.Create("foo @bar baz")),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("bar")
-                               .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                               .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")));
-        }
-
-        [Fact]
-        public void ParseMethodUsesProvidedParserListenerIfSpecified()
-        {
-            // Arrange
-            var factory = new SpanFactory();
-            var parser = new RazorParser();
-
-            // Act
-            var results = parser.Parse(TestRazorSourceDocument.Create("foo @bar baz"));
-
-            // Assert
-            ParserTestBase.EvaluateResults(results,
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("bar")
-                               .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                               .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")));
-        }
-
-        [Fact]
-        public void Parse_SyntaxTreeSpansAreLinked()
-        {
-            // Arrange
-            var factory = new SpanFactory();
-            var parser = new RazorParser();
-
-            // Act
-            var results = parser.Parse(TestRazorSourceDocument.Create("foo @bar baz"));
-
-            // Assert
-            var spans = results.Root.Flatten().ToArray();
-            for (var i = 0; i < spans.Length - 1; i++)
-            {
-                Assert.Same(spans[i + 1], spans[i].Next);
-            }
-
-            for (var i = spans.Length - 1; i > 0; i--)
-            {
-                Assert.Same(spans[i - 1], spans[i].Previous);
-            }
+            var actual = SyntaxNodeSerializer.Serialize(syntaxTree.Root);
+            Assert.Equal(expected, actual);
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/SpanTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/SpanTest.cs
deleted file mode 100644
index 96c856848c..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/SpanTest.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// 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 Xunit;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    public class SpanTest
-    {
-        [Fact]
-        public void ReplaceWith_ResetsLength()
-        {
-            // Arrange
-            var builder = new SpanBuilder(SourceLocation.Zero);
-            builder.Accept(new HtmlToken("hello", HtmlTokenType.Text));
-            var span = builder.Build();
-            var newBuilder = new SpanBuilder(SourceLocation.Zero);
-            newBuilder.Accept(new HtmlToken("hi", HtmlTokenType.Text));
-            var originalLength = span.Length;
-
-            // Act
-            span.ReplaceWith(newBuilder);
-
-            // Assert
-            Assert.Equal(5, originalLength);
-            Assert.Equal(2, span.Length);
-        }
-
-        // Note: This is more of an integration-like test. However, it's valuable to determine
-        // that the Span's ReplaceWith code is properly propogating change notifications to parents.
-        [Fact]
-        public void ReplaceWith_NotifiesParentChildHasChanged()
-        {
-            // Arrange
-            var spanBuilder = new SpanBuilder(SourceLocation.Zero);
-            spanBuilder.Accept(new HtmlToken("hello", HtmlTokenType.Text));
-            var span = spanBuilder.Build();
-            var blockBuilder = new BlockBuilder()
-            {
-                Type = BlockKindInternal.Markup,
-            };
-            blockBuilder.Children.Add(span);
-            var block = blockBuilder.Build();
-            span.Parent = block;
-            var originalBlockLength = block.Length;
-            var newSpanBuilder = new SpanBuilder(SourceLocation.Zero);
-            newSpanBuilder.Accept(new HtmlToken("hi", HtmlTokenType.Text));
-
-            // Act
-            span.ReplaceWith(newSpanBuilder);
-
-            // Assert
-            Assert.Equal(5, originalBlockLength);
-            Assert.Equal(2, block.Length);
-        }
-
-        [Fact]
-        public void Clone_ClonesSpan()
-        {
-            // Arrange
-            var spanBuilder = new SpanBuilder(new SourceLocation(1, 2, 3))
-            {
-                EditHandler = new SpanEditHandler(CSharpLanguageCharacteristics.Instance.TokenizeString),
-                Kind = SpanKindInternal.Transition,
-                ChunkGenerator = new ExpressionChunkGenerator(),
-            };
-            spanBuilder.Accept(new CSharpToken("@", CSharpTokenType.Transition));
-            var span = spanBuilder.Build();
-
-            // Act
-            var copy = (Span)span.Clone();
-
-            // Assert
-            Assert.Equal(span, copy);
-            Assert.NotSame(span, copy);
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockTest.cs
deleted file mode 100644
index 971e97f361..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockTest.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-// 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.Collections.Generic;
-using System.Linq;
-using Xunit;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    public class TagHelperBlockTest
-    {
-        [Fact]
-        public void Clone_ClonesTagHelperChildren()
-        {
-            // Arrange
-            var tagHelper = new TagHelperBlockBuilder(
-                "p",
-                TagMode.StartTagAndEndTag,
-                attributes: new List<TagHelperAttributeNode>(),
-                children: new[]
-            {
-                new SpanBuilder(SourceLocation.Zero).Build(),
-                new SpanBuilder(new SourceLocation(0, 1, 2)).Build(),
-            }).Build();
-
-            // Act
-            var copy = (TagHelperBlock)tagHelper.Clone();
-
-            // Assert
-            ParserTestBase.EvaluateParseTree(copy, tagHelper);
-            Assert.Collection(
-                copy.Children,
-                child => Assert.NotSame(tagHelper.Children[0], child),
-                child => Assert.NotSame(tagHelper.Children[1], child));
-        }
-
-        [Fact]
-        public void Clone_ClonesTagHelperAttributes()
-        {
-            // Arrange
-            var tagHelper = (TagHelperBlock)new TagHelperBlockBuilder(
-                "p",
-                TagMode.StartTagAndEndTag,
-                attributes: new List<TagHelperAttributeNode>()
-                {
-                    new TagHelperAttributeNode("class", new SpanBuilder(SourceLocation.Zero).Build(), AttributeStructure.NoQuotes),
-                    new TagHelperAttributeNode("checked", new SpanBuilder(SourceLocation.Undefined).Build(), AttributeStructure.NoQuotes)
-                },
-                children: Enumerable.Empty<SyntaxTreeNode>()).Build();
-
-            // Act
-            var copy = (TagHelperBlock)tagHelper.Clone();
-
-            // Assert
-            ParserTestBase.EvaluateParseTree(copy, tagHelper);
-            Assert.Collection(
-                copy.Attributes,
-                attribute => Assert.NotSame(tagHelper.Attributes[0], attribute),
-                attribute => Assert.NotSame(tagHelper.Attributes[1], attribute));
-        }
-
-        [Fact]
-        public void Clone_ClonesTagHelperSourceStartTag()
-        {
-            // Arrange
-            var tagHelper = (TagHelperBlock)new TagHelperBlockBuilder(
-                "p",
-                TagMode.StartTagAndEndTag,
-                attributes: new List<TagHelperAttributeNode>(),
-                children: Enumerable.Empty<SyntaxTreeNode>())
-            {
-                SourceStartTag = new BlockBuilder()
-                {
-                    Type = BlockKindInternal.Comment,
-                    ChunkGenerator = new RazorCommentChunkGenerator()
-                }.Build()
-            }.Build();
-
-            // Act
-            var copy = (TagHelperBlock)tagHelper.Clone();
-
-            // Assert
-            ParserTestBase.EvaluateParseTree(copy, tagHelper);
-            Assert.NotSame(tagHelper.SourceStartTag, copy.SourceStartTag);
-        }
-
-        [Fact]
-        public void Clone_ClonesTagHelperSourceEndTag()
-        {
-            // Arrange
-            var tagHelper = (TagHelperBlock)new TagHelperBlockBuilder(
-                "p",
-                TagMode.StartTagAndEndTag,
-                attributes: new List<TagHelperAttributeNode>(),
-                children: Enumerable.Empty<SyntaxTreeNode>())
-            {
-                SourceEndTag = new BlockBuilder()
-                {
-                    Type = BlockKindInternal.Comment,
-                    ChunkGenerator = new RazorCommentChunkGenerator()
-                }.Build()
-            }.Build();
-
-            // Act
-            var copy = (TagHelperBlock)tagHelper.Clone();
-
-            // Assert
-            ParserTestBase.EvaluateParseTree(copy, tagHelper);
-            Assert.NotSame(tagHelper.SourceEndTag, copy.SourceEndTag);
-        }
-
-        [Fact]
-        public void FlattenFlattensSelfClosingTagHelpers()
-        {
-            // Arrange
-            var spanFactory = new SpanFactory();
-            var blockFactory = new BlockFactory(spanFactory);
-            var tagHelper = (TagHelperBlock)blockFactory.TagHelperBlock(
-                tagName: "input",
-                tagMode: TagMode.SelfClosing,
-                start: SourceLocation.Zero,
-                startTag: blockFactory.MarkupTagBlock("<input />"),
-                children: new SyntaxTreeNode[0],
-                endTag: null);
-            spanFactory.Reset();
-            var expectedNode = spanFactory.Markup("<input />");
-
-            // Act
-            var flattenedNodes = tagHelper.Flatten();
-
-            // Assert
-            var node = Assert.Single(flattenedNodes);
-            Assert.True(node.EquivalentTo(expectedNode));
-        }
-
-        [Fact]
-        public void FlattenFlattensStartAndEndTagTagHelpers()
-        {
-            // Arrange
-            var spanFactory = new SpanFactory();
-            var blockFactory = new BlockFactory(spanFactory);
-            var tagHelper = (TagHelperBlock)blockFactory.TagHelperBlock(
-                tagName: "div",
-                tagMode: TagMode.StartTagAndEndTag,
-                start: SourceLocation.Zero,
-                startTag: blockFactory.MarkupTagBlock("<div>"),
-                children: new SyntaxTreeNode[0],
-                endTag: blockFactory.MarkupTagBlock("</div>"));
-            spanFactory.Reset();
-            var expectedStartTag = spanFactory.Markup("<div>");
-            var expectedEndTag = spanFactory.Markup("</div>");
-
-            // Act
-            var flattenedNodes = tagHelper.Flatten();
-
-            // Assert
-            Assert.Collection(
-                flattenedNodes,
-                first =>
-                {
-                    Assert.True(first.EquivalentTo(expectedStartTag));
-                },
-                second =>
-                {
-                    Assert.True(second.EquivalentTo(expectedEndTag));
-                });
-        }
-
-        [Fact]
-        public void FlattenFlattensStartAndEndTagWithChildrenTagHelpers()
-        {
-            // Arrange
-            var spanFactory = new SpanFactory();
-            var blockFactory = new BlockFactory(spanFactory);
-            var tagHelper = (TagHelperBlock)blockFactory.TagHelperBlock(
-                tagName: "div",
-                tagMode: TagMode.StartTagAndEndTag,
-                start: SourceLocation.Zero,
-                startTag: blockFactory.MarkupTagBlock("<div>"),
-                children: new SyntaxTreeNode[] { spanFactory.Markup("Hello World") },
-                endTag: blockFactory.MarkupTagBlock("</div>"));
-            spanFactory.Reset();
-            var expectedStartTag = spanFactory.Markup("<div>");
-            var expectedChildren = spanFactory.Markup("Hello World");
-            var expectedEndTag = spanFactory.Markup("</div>");
-
-            // Act
-            var flattenedNodes = tagHelper.Flatten();
-
-            // Assert
-            Assert.Collection(
-                flattenedNodes,
-                first =>
-                {
-                    Assert.True(first.EquivalentTo(expectedStartTag));
-                },
-                second =>
-                {
-                    Assert.True(second.EquivalentTo(expectedChildren));
-                },
-                third =>
-                {
-                    Assert.True(third.EquivalentTo(expectedEndTag));
-                });
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs
index 76ef95f37a..6fd3c4281e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
@@ -14,12 +15,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             get
             {
-                var factory = new SpanFactory();
-                var blockFactory = new BlockFactory(factory);
                 Func<string, string, KeyValuePair<string, string>> kvp =
                     (key, value) => new KeyValuePair<string, string>(key, value);
                 var empty = Enumerable.Empty<KeyValuePair<string, string>>();
-                var csharp = TagHelperParseTreeRewriter.InvalidAttributeValueMarker;
+                var csharp = TagHelperParseTreeRewriter.Rewriter.InvalidAttributeValueMarker;
 
                 // documentContent, expectedPairs
                 return new TheoryData<string, IEnumerable<KeyValuePair<string, string>>>
@@ -29,13 +28,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     { "<a href=\"@true\">", new[] { kvp("href", csharp) } },
                     { "<a href=\"prefix @true suffix\">", new[] { kvp("href", $"prefix{csharp} suffix") } },
                     { "<a href=~/home>", new[] { kvp("href", "~/home") } },
-                    { "<a href=~/home @{ } nothing='something'>", new[] { kvp("href", "~/home"), kvp("", "") } },
+                    { "<a href=~/home @{ } nothing='something'>", new[] { kvp("href", "~/home") } },
                     {
                         "<a href=\"@DateTime.Now::0\" class='btn btn-success' random>",
                         new[] { kvp("href", $"{csharp}::0"), kvp("class", "btn btn-success"), kvp("random", "") }
                     },
                     { "<a href=>", new[] { kvp("href", "") } },
-                    { "<a href='\">  ", new[] { kvp("href", "\">") } },
+                    { "<a href='\">  ", new[] { kvp("href", "\">  ") } },
                     { "<a href'", new[] { kvp("href'", "") } },
                 };
             }
@@ -51,13 +50,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             var errorSink = new ErrorSink();
             var parseResult = ParseDocument(documentContent);
             var document = parseResult.Root;
-            var parseTreeRewriter = new TagHelperParseTreeRewriter(null, Enumerable.Empty<TagHelperDescriptor>(), parseResult.Options.FeatureFlags);
+            var parseTreeRewriter = new TagHelperParseTreeRewriter.Rewriter(
+                parseResult.Source,
+                null,
+                Enumerable.Empty<TagHelperDescriptor>(),
+                parseResult.Options.FeatureFlags,
+                errorSink);
 
             // Assert - Guard
-            var rootBlock = Assert.IsType<Block>(document);
-            var child = Assert.Single(rootBlock.Children);
-            var tagBlock = Assert.IsType<Block>(child);
-            Assert.Equal(BlockKindInternal.Tag, tagBlock.Type);
+            var rootBlock = Assert.IsType<RazorDocumentSyntax>(document);
+            var rootMarkup = Assert.IsType<MarkupBlockSyntax>(rootBlock.Document);
+            var childBlock = Assert.Single(rootMarkup.Children);
+            var tagBlock = Assert.IsType<MarkupTagBlockSyntax>(childBlock);
             Assert.Empty(errorSink.Errors);
 
             // Act
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperRewritingTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperRewritingTestBase.cs
index a6db68b3c7..98d19a307e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperRewritingTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperRewritingTestBase.cs
@@ -10,31 +10,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     public class TagHelperRewritingTestBase : CsHtmlMarkupParserTestBase
     {
         internal void RunParseTreeRewriterTest(string documentContent, params string[] tagNames)
-        {
-            RunParseTreeRewriterTest(documentContent, expectedOutput: null, tagNames: tagNames);
-        }
-
-        internal void RunParseTreeRewriterTest(
-            string documentContent,
-            MarkupBlock expectedOutput,
-            params string[] tagNames)
-        {
-            RunParseTreeRewriterTest(
-                documentContent,
-                expectedOutput,
-                errors: Enumerable.Empty<RazorDiagnostic>(),
-                tagNames: tagNames);
-        }
-
-        internal void RunParseTreeRewriterTest(
-            string documentContent,
-            MarkupBlock expectedOutput,
-            IEnumerable<RazorDiagnostic> errors,
-            params string[] tagNames)
         {
             var descriptors = BuildDescriptors(tagNames);
 
-            EvaluateData(descriptors, documentContent, expectedOutput, errors);
+            EvaluateData(descriptors, documentContent);
         }
 
         internal IEnumerable<TagHelperDescriptor> BuildDescriptors(params string[] tagNames)
@@ -58,32 +37,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             string tagHelperPrefix = null,
             RazorParserFeatureFlags featureFlags = null)
         {
-            EvaluateData(descriptors, documentContent, null, Array.Empty<RazorDiagnostic>(), tagHelperPrefix, featureFlags);
-        }
-
-        internal void EvaluateData(
-            IEnumerable<TagHelperDescriptor> descriptors,
-            string documentContent,
-            MarkupBlock expectedOutput,
-            IEnumerable<RazorDiagnostic> expectedErrors,
-            string tagHelperPrefix = null,
-            RazorParserFeatureFlags featureFlags = null)
-        {
-            var syntaxTree = ParseDocument(documentContent);
+            var syntaxTree = ParseDocument(documentContent, featureFlags: featureFlags);
             var errorSink = new ErrorSink();
-            var parseTreeRewriter = new TagHelperParseTreeRewriter(
-                tagHelperPrefix,
-                descriptors,
-                featureFlags ?? syntaxTree.Options.FeatureFlags);
 
-            var actualTree = parseTreeRewriter.Rewrite(syntaxTree.Root, errorSink);
+            var rewrittenTree = TagHelperParseTreeRewriter.Rewrite(syntaxTree, tagHelperPrefix, descriptors);
 
-            var allErrors = syntaxTree.Diagnostics.Concat(errorSink.Errors);
-            var actualErrors = allErrors
-                .OrderBy(error => error.Span.AbsoluteIndex)
-                .ToList();
-
-            BaselineTest(actualTree, filePath: null, verifySyntaxTree: false, actualErrors.ToArray());
+            BaselineTest(rewrittenTree, verifySyntaxTree: false);
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerLookaheadTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerLookaheadTest.cs
index 23a1df23dc..655a88d14a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerLookaheadTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerLookaheadTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
@@ -64,7 +65,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             // Act
             var i = 3;
-            IEnumerable<HtmlToken> previousTokens = null;
+            IEnumerable<SyntaxToken> previousTokens = null;
             var tokenFound = tokenizer.LookaheadUntil((s, p) =>
             {
                 previousTokens = p;
@@ -77,9 +78,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             // For the very first element, there will be no previous items, so null is expected
             var orderIndex = 0;
             Assert.Null(previousTokens.ElementAt(orderIndex++));
-            Assert.Equal(new HtmlToken("asdf", HtmlTokenType.Text), previousTokens.ElementAt(orderIndex++));
-            Assert.Equal(new HtmlToken("--", HtmlTokenType.DoubleHyphen), previousTokens.ElementAt(orderIndex++));
-            Assert.Equal(new HtmlToken("fvd", HtmlTokenType.Text), previousTokens.ElementAt(orderIndex++));
+            AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.Text, "asdf"), previousTokens.ElementAt(orderIndex++));
+            AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.DoubleHyphen, "--"), previousTokens.ElementAt(orderIndex++));
+            AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.Text, "fvd"), previousTokens.ElementAt(orderIndex++));
         }
 
         [Fact]
@@ -89,7 +90,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             var tokenizer = CreateContentTokenizer("asdf--fvd");
 
             // Act
-            var tokens = new Stack<HtmlToken>();
+            var tokens = new Stack<SyntaxToken>();
             var tokenFound = tokenizer.LookaheadUntil((s, p) =>
             {
                 tokens.Push(s);
@@ -99,9 +100,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             // Assert
             Assert.False(tokenFound);
             Assert.Equal(3, tokens.Count);
-            Assert.Equal(new HtmlToken("fvd", HtmlTokenType.Text), tokens.Pop());
-            Assert.Equal(new HtmlToken("--", HtmlTokenType.DoubleHyphen), tokens.Pop());
-            Assert.Equal(new HtmlToken("asdf", HtmlTokenType.Text), tokens.Pop());
+            AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.Text, "fvd"), tokens.Pop());
+            AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.DoubleHyphen, "--"), tokens.Pop());
+            AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.Text, "asdf"), tokens.Pop());
         }
 
         [Fact]
@@ -111,18 +112,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             var tokenizer = CreateContentTokenizer("asdf--fvd");
 
             // Act
-            var tokens = new Stack<HtmlToken>();
+            var tokens = new Stack<SyntaxToken>();
             var tokenFound = tokenizer.LookaheadUntil((s, p) =>
             {
                 tokens.Push(s);
-                return s.Type == HtmlTokenType.DoubleHyphen;
+                return s.Kind == SyntaxKind.DoubleHyphen;
             });
 
             // Assert
             Assert.True(tokenFound);
             Assert.Equal(2, tokens.Count);
-            Assert.Equal(new HtmlToken("--", HtmlTokenType.DoubleHyphen), tokens.Pop());
-            Assert.Equal(new HtmlToken("asdf", HtmlTokenType.Text), tokens.Pop());
+            AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.DoubleHyphen, "--"), tokens.Pop());
+            AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.Text, "asdf"), tokens.Pop());
         }
 
         private static TestTokenizerBackedParser CreateContentTokenizer(string content)
@@ -135,7 +136,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return tokenizer;
         }
 
-        private class ExposedTokenizer : Tokenizer<CSharpToken, CSharpTokenType>
+        private static void AssertTokenEqual(SyntaxToken expected, SyntaxToken actual)
+        {
+            Assert.True(expected.IsEquivalentTo(actual), "Tokens not equal.");
+        }
+
+        private class ExposedTokenizer : Tokenizer
         {
             public ExposedTokenizer(string input)
                 : base(new SeekableTextReader(input, filePath: null))
@@ -150,7 +156,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 }
             }
 
-            public override CSharpTokenType RazorCommentStarType
+            public override SyntaxKind RazorCommentStarKind
             {
                 get
                 {
@@ -158,7 +164,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 }
             }
 
-            public override CSharpTokenType RazorCommentTransitionType
+            public override SyntaxKind RazorCommentTransitionKind
             {
                 get
                 {
@@ -166,7 +172,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 }
             }
 
-            public override CSharpTokenType RazorCommentType
+            public override SyntaxKind RazorCommentKind
             {
                 get
                 {
@@ -182,9 +188,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 }
             }
 
-            protected override CSharpToken CreateToken(
+            protected override SyntaxToken CreateToken(
                 string content,
-                CSharpTokenType type,
+                SyntaxKind type,
                 IReadOnlyList<RazorDiagnostic> errors)
             {
                 throw new NotImplementedException();
@@ -196,23 +202,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        private class TestTokenizerBackedParser : TokenizerBackedParser<HtmlTokenizer, HtmlToken, HtmlTokenType>
+        private class TestTokenizerBackedParser : TokenizerBackedParser<HtmlTokenizer>
         {
-            internal TestTokenizerBackedParser(LanguageCharacteristics<HtmlTokenizer, HtmlToken, HtmlTokenType> language, ParserContext context) : base(language, context)
+            internal TestTokenizerBackedParser(LanguageCharacteristics<HtmlTokenizer> language, ParserContext context) : base(language, context)
             {
             }
 
-            public override void ParseBlock()
-            {
-                throw new NotImplementedException();
-            }
-
-            protected override bool TokenTypeEquals(HtmlTokenType x, HtmlTokenType y)
-            {
-                throw new NotImplementedException();
-            }
-
-            internal new bool LookaheadUntil(Func<HtmlToken, IEnumerable<HtmlToken>, bool> condition)
+            internal new bool LookaheadUntil(Func<SyntaxToken, IEnumerable<SyntaxToken>, bool> condition)
             {
                 return base.LookaheadUntil(condition);
             }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerTestBase.cs
index 307ccad3a7..21ccddba3b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerTestBase.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics;
 using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
@@ -13,18 +14,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         internal abstract object IgnoreRemaining { get; }
         internal abstract object CreateTokenizer(ITextDocument source);
 
-        internal void TestTokenizer<TSymbol, TSymbolType>(string input, params TSymbol[] expectedSymbols)
-            where TSymbolType : struct
-            where TSymbol : TokenBase<TSymbolType>
+        internal void TestTokenizer(string input, params SyntaxToken[] expectedSymbols)
         {
             // Arrange
             var success = true;
             var output = new StringBuilder();
             using (var source = new SeekableTextReader(input, filePath: null))
             {
-                var tokenizer = (Tokenizer<TSymbol, TSymbolType>)CreateTokenizer(source);
+                var tokenizer = (Tokenizer)CreateTokenizer(source);
                 var counter = 0;
-                TSymbol current = null;
+                SyntaxToken current = null;
                 while ((current = tokenizer.NextToken()) != null)
                 {
                     if (counter >= expectedSymbols.Length)
@@ -34,11 +33,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     }
                     else if (ReferenceEquals(expectedSymbols[counter], IgnoreRemaining))
                     {
-                        output.AppendLine(string.Format("P: Ignored {0}", current));
+                        output.AppendLine(string.Format("P: Ignored |{0}|", current));
                     }
                     else
                     {
-                        if (!Equals(expectedSymbols[counter], current))
+                        if (!expectedSymbols[counter].IsEquivalentTo(current))
                         {
                             output.AppendLine(string.Format("F: Expected: {0}; Actual: {1}", expectedSymbols[counter], current));
                             success = false;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/WhiteSpaceRewriterTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/WhiteSpaceRewriterTest.cs
index 856172a104..f8c2c34b4e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/WhiteSpaceRewriterTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/WhiteSpaceRewriterTest.cs
@@ -12,18 +12,26 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         public void Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block()
         {
             // Arrange
+            var content = @"
+<div>
+    @result
+</div>
+<div>
+    @(result)
+</div>";
             var parsed = ParseDocument(
                 RazorLanguageVersion.Latest,
-                "test    @foo test",
+                content,
                 Array.Empty<DirectiveDescriptor>());
 
-            var rewriter = new WhiteSpaceRewriter();
+            var rewriter = new WhitespaceRewriter();
 
             // Act
-            var rewritten = rewriter.Rewrite(parsed.Root);
+            var rewritten = rewriter.Visit(parsed.Root);
 
             // Assert
-            BaselineTest(parsed);
+            var rewrittenTree = RazorSyntaxTree.Create(rewritten, parsed.Source, parsed.Diagnostics, parsed.Options);
+            BaselineTest(rewrittenTree);
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj
index 57a0000191..feec431180 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DeveloperBuildTestTfms)</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net46</TargetFrameworks>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
     <DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
   </PropertyGroup>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorLanguageVersionTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorLanguageVersionTest.cs
new file mode 100644
index 0000000000..5b09826ebf
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorLanguageVersionTest.cs
@@ -0,0 +1,141 @@
+// 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.Linq;
+using System.Reflection;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class RazorLanguageVersionTest
+    {
+        [Fact]
+        public void TryParseInvalid()
+        {
+            // Arrange
+            var value = "not-version";
+
+            // Act
+            var result = RazorLanguageVersion.TryParse(value, out var _);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void TryParse10()
+        {
+            // Arrange
+            var value = "1.0";
+
+            // Act
+            var result = RazorLanguageVersion.TryParse(value, out var version);
+
+            // Assert
+            Assert.True(result);
+            Assert.Same(RazorLanguageVersion.Version_1_0, version);
+        }
+
+        [Fact]
+        public void TryParse11()
+        {
+            // Arrange
+            var value = "1.1";
+
+            // Act
+            var result = RazorLanguageVersion.TryParse(value, out var version);
+
+            // Assert
+            Assert.True(result);
+            Assert.Same(RazorLanguageVersion.Version_1_1, version);
+        }
+
+        [Fact]
+        public void TryParse20()
+        {
+            // Arrange
+            var value = "2.0";
+
+            // Act
+            var result = RazorLanguageVersion.TryParse(value, out var version);
+
+            // Assert
+            Assert.True(result);
+            Assert.Same(RazorLanguageVersion.Version_2_0, version);
+        }
+
+        [Fact]
+        public void TryParse21()
+        {
+            // Arrange
+            var value = "2.1";
+
+            // Act
+            var result = RazorLanguageVersion.TryParse(value, out var version);
+
+            // Assert
+            Assert.True(result);
+            Assert.Same(RazorLanguageVersion.Version_2_1, version);
+        }
+
+        [Fact]
+        public void TryParse30()
+        {
+            // Arrange
+            var value = "3.0";
+
+            // Act
+            var result = RazorLanguageVersion.TryParse(value, out var version);
+
+            // Assert
+            Assert.True(result);
+            Assert.Same(RazorLanguageVersion.Version_3_0, version);
+        }
+
+        [Fact]
+        public void TryParseLatest()
+        {
+            // Arrange
+            var value = "Latest";
+
+            // Act
+            var result = RazorLanguageVersion.TryParse(value, out var version);
+
+            // Assert
+            Assert.True(result);
+            Assert.Same(RazorLanguageVersion.Version_3_0, version);
+        }
+
+        [Fact]
+        public void TryParseExperimental()
+        {
+            // Arrange
+            var value = "experimental";
+
+            // Act
+            var result = RazorLanguageVersion.TryParse(value, out var version);
+
+            // Assert
+            Assert.True(result);
+            Assert.Same(RazorLanguageVersion.Experimental, version);
+        }
+
+        [Fact]
+        public void LatestPointsToNewestVersion()
+        {
+            // Arrange
+            var v = RazorLanguageVersion.Parse("latest");
+            var versions = typeof(RazorLanguageVersion).GetFields(BindingFlags.Public | BindingFlags.Static)
+                .Where(f => f.Name.StartsWith("Version_"))
+                .Select(f => f.GetValue(obj: null))
+                .Cast<RazorLanguageVersion>();
+
+            // Act & Assert
+            Assert.NotEmpty(versions);
+            foreach (var version in versions)
+            {
+                Assert.True(version.CompareTo(v) <= 0, $"RazorLanguageVersion {version} has a higher version than RazorLanguageVersion.Latest");
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorProjectEngineTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorProjectEngineTest.cs
index d901c16199..7f2b6c0b35 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorProjectEngineTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorProjectEngineTest.cs
@@ -1,8 +1,8 @@
 // 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.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Moq;
 using Xunit;
@@ -45,6 +45,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Test
             var features = engine.EngineFeatures.OrderBy(f => f.GetType().Name).ToArray();
             Assert.Collection(
                 features,
+                feature => Assert.IsType<ComponentDocumentClassifierPass>(feature),
                 feature => Assert.IsType<DefaultDirectiveSyntaxTreePass>(feature),
                 feature => Assert.IsType<DefaultDocumentClassifierPass>(feature),
                 feature => Assert.IsType<DefaultDocumentClassifierPassFeature>(feature),
@@ -56,6 +57,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Test
                 feature => Assert.IsType<DefaultTagHelperOptimizationPass>(feature),
                 feature => Assert.IsType<DesignTimeDirectivePass>(feature),
                 feature => Assert.IsType<DirectiveRemovalOptimizationPass>(feature),
+                feature => Assert.IsType<EliminateMethodBodyPass>(feature),
+                feature => Assert.IsType<FunctionsDirectivePass>(feature),
                 feature => Assert.IsType<HtmlNodeOptimizationPass>(feature),
                 feature => Assert.IsType<MetadataAttributePass>(feature),
                 feature => Assert.IsType<PreallocatedTagHelperAttributeOptimizationPass>(feature));
@@ -65,7 +68,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Test
         {
             var feature = engine.EngineFeatures.OfType<IRazorDirectiveFeature>().FirstOrDefault();
             Assert.NotNull(feature);
-            Assert.Empty(feature.Directives);
+            Assert.Collection(
+                feature.Directives,
+                directive => Assert.Same(FunctionsDirective.Directive, directive));
         }
 
         private static void AssertDefaultTargetExtensions(RazorProjectEngine engine)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorSyntaxTreeTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorSyntaxTreeTest.cs
index 09b36651ce..dde505ab02 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorSyntaxTreeTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/RazorSyntaxTreeTest.cs
@@ -1,9 +1,8 @@
 // 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;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Test
@@ -25,7 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Test
         }
 
         [Fact]
-        public void Parse_Persists_FilePath()
+        public void Parse_NodesReturnCorrectFilePath()
         {
             // Arrange
             var filePath = "test.cshtml";
@@ -38,24 +37,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Test
             Assert.Empty(syntaxTree.Diagnostics);
             Assert.NotNull(syntaxTree);
 
-            var spans = new List<SyntaxTreeNode>();
-            GetChildren(syntaxTree.Root);
-            Assert.All(spans, node => Assert.Equal(filePath, node.Start.FilePath));
-
-            void GetChildren(SyntaxTreeNode node)
-            {
-                if (node is Block block)
-                {
-                    foreach (var child in block.Children)
-                    {
-                        GetChildren(child);
-                    }
-                }
-                else
-                {
-                    spans.Add(node);
-                }
-            }
+            var children = syntaxTree.Root.DescendantNodes();
+            Assert.All(children, node => Assert.Equal(filePath, node.GetSourceLocation(source).FilePath));
         }
 
         [Fact]
@@ -69,10 +52,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Test
             var syntaxTree = RazorSyntaxTree.Parse(source, options);
 
             // Assert
+            var root = syntaxTree.Root;
             Assert.NotNull(syntaxTree);
-            Assert.Equal(6, syntaxTree.Root.Children.Count);
-            var block = Assert.IsType<Block>(syntaxTree.Root.Children[4]);
-            Assert.Equal(BlockKindInternal.Directive, block.Type);
+            Assert.Equal(61, root.EndPosition);
+            Assert.Single(root.DescendantNodes().Where(n => n is RazorDirectiveBodySyntax body && body.Keyword.GetContent() == "tagHelperPrefix"));
+            Assert.Empty(root.DescendantNodes().Where(n => n is MarkupTagBlockSyntax));
             Assert.Empty(syntaxTree.Diagnostics);
         }
     }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs
index 470b69720a..2d829be381 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language
@@ -100,19 +101,19 @@ namespace Microsoft.AspNetCore.Razor.Language
         }
 
         [Fact]
-        public void GetEditedContent_Span_ReturnsNewContent()
+        public void GetEditedContent_SyntaxNode_ReturnsNewContent()
         {
             // Arrange
-            var builder = new SpanBuilder(new SourceLocation(0, 0, 0));
-            builder.Accept(new RawTextToken(new SourceLocation(0, 0, 0), "Hello, "));
-            builder.Accept(new RawTextToken(new SourceLocation(7, 0, 7), "World"));
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "Hello, "));
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "World"));
 
-            var span = new Span(builder);
+            var node = SyntaxFactory.MarkupTextLiteral(builder.ToList()).CreateRed();
 
             var change = new SourceChange(2, 2, "heyo");
 
             // Act
-            var result = change.GetEditedContent(span);
+            var result = change.GetEditedContent(node);
 
             // Act
             Assert.Equal("Heheyoo, World", result);
@@ -122,16 +123,16 @@ namespace Microsoft.AspNetCore.Razor.Language
         public void GetOffSet_SpanIsOwner_ReturnsOffset()
         {
             // Arrange
-            var builder = new SpanBuilder(new SourceLocation(13, 0, 0));
-            builder.Accept(new RawTextToken(new SourceLocation(13, 0, 13), "Hello, "));
-            builder.Accept(new RawTextToken(new SourceLocation(20, 0, 20), "World"));
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "Hello, "));
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "World"));
 
-            var span = new Span(builder);
+            var node = SyntaxFactory.MarkupTextLiteral(builder.ToList()).CreateRed(null, 13);
 
             var change = new SourceChange(15, 2, "heyo");
 
             // Act
-            var result = change.GetOffset(span);
+            var result = change.GetOffset(node);
 
             // Act
             Assert.Equal(2, result);
@@ -141,18 +142,18 @@ namespace Microsoft.AspNetCore.Razor.Language
         public void GetOffSet_SpanIsNotOwnerOfChange_ThrowsException()
         {
             // Arrange
-            var builder = new SpanBuilder(new SourceLocation(13, 0, 0));
-            builder.Accept(new RawTextToken(new SourceLocation(13, 0, 13), "Hello, "));
-            builder.Accept(new RawTextToken(new SourceLocation(20, 0, 20), "World"));
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "Hello, "));
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "World"));
 
-            var span = new Span(builder);
+            var node = SyntaxFactory.MarkupTextLiteral(builder.ToList()).CreateRed(null, 13);
 
             var change = new SourceChange(12, 2, "heyo");
 
-            var expected = $"The node '{span}' is not the owner of change '{change}'.";
+            var expected = $"The node '{node}' is not the owner of change '{change}'.";
 
             // Act & Assert
-            var exception = Assert.Throws<InvalidOperationException>(() => { change.GetOffset(span); });
+            var exception = Assert.Throws<InvalidOperationException>(() => { change.GetOffset(node); });
             Assert.Equal(expected, exception.Message);
         }
 
@@ -160,16 +161,16 @@ namespace Microsoft.AspNetCore.Razor.Language
         public void GetOrigninalText_SpanIsOwner_ReturnsContent()
         {
             // Arrange
-            var builder = new SpanBuilder(new SourceLocation(13, 0, 0));
-            builder.Accept(new RawTextToken(new SourceLocation(13, 0, 13), "Hello, "));
-            builder.Accept(new RawTextToken(new SourceLocation(20, 0, 20), "World"));
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "Hello, "));
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "World"));
 
-            var span = new Span(builder);
+            var node = SyntaxFactory.MarkupTextLiteral(builder.ToList()).CreateRed(null, 13);
 
             var change = new SourceChange(15, 2, "heyo");
 
             // Act
-            var result = change.GetOriginalText(span);
+            var result = change.GetOriginalText(node);
 
             // Act
             Assert.Equal("ll", result);
@@ -179,16 +180,16 @@ namespace Microsoft.AspNetCore.Razor.Language
         public void GetOrigninalText_SpanIsOwner_ReturnsContent_ZeroLengthSpan()
         {
             // Arrange
-            var builder = new SpanBuilder(new SourceLocation(13, 0, 0));
-            builder.Accept(new RawTextToken(new SourceLocation(13, 0, 13), "Hello, "));
-            builder.Accept(new RawTextToken(new SourceLocation(20, 0, 20), "World"));
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "Hello, "));
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Marker, "World"));
 
-            var span = new Span(builder);
+            var node = SyntaxFactory.MarkupTextLiteral(builder.ToList()).CreateRed(null, 13);
 
             var change = new SourceChange(15, 0, "heyo");
 
             // Act
-            var result = change.GetOriginalText(span);
+            var result = change.GetOriginalText(node);
 
             // Act
             Assert.Equal(string.Empty, result);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TagHelperParseTreeRewriterTests.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TagHelperParseTreeRewriterTests.cs
deleted file mode 100644
index a24a9c8d4f..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TagHelperParseTreeRewriterTests.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
-using Xunit;
-
-namespace Microsoft.AspNetCore.Razor.Language.Test
-{
-    public class TagHelperParseTreeRewriterTests
-    {
-        public void IsComment_ReturnsTrueForSpanInHtmlCommentBlock()
-        {
-            // Arrange
-            SpanFactory spanFactory = new SpanFactory();
-            
-            Span content = spanFactory.Markup("<!-- comment -->");
-            Block commentBlock = new HtmlCommentBlock(content);
-
-            // Act
-            bool actualResult = TagHelperParseTreeRewriter.IsComment(content);
-
-            // Assert
-            Assert.True(actualResult);
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.cs
index 9d90489dea..eb46570f7b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.cs
@@ -8,7 +8,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.mappings.txt
index bff77ec3f5..9b2515042f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective.cshtml)
 |"*, TestAssembly"|
-Generated Location: (427:10,37 [17] )
+Generated Location: (524:11,37 [17] )
 |"*, TestAssembly"|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.codegen.cs
index ae87635f43..dd6d3c27d0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.codegen.cs
@@ -12,7 +12,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.mappings.txt
index 46733338f6..3ddf69115e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml)
 |*, TestAssembly|
-Generated Location: (779:14,38 [15] )
+Generated Location: (883:15,38 [15] )
 |*, TestAssembly|
 
 Source Location: (187:5,36 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml)
 |true|
-Generated Location: (1727:31,42 [4] )
+Generated Location: (1862:35,42 [4] )
 |true|
 
 Source Location: (233:6,36 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers.cshtml)
 |true|
-Generated Location: (2380:41,42 [4] )
+Generated Location: (2515:45,42 [4] )
 |true|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.codegen.cs
index ee78430716..a53cee2052 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.codegen.cs
@@ -11,7 +11,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.mappings.txt
index 6eb05c5160..3af7b84cfc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml)
 |"*, TestAssembly"|
-Generated Location: (673:13,37 [17] )
+Generated Location: (764:14,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (220:5,38 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml)
 |ViewBag.DefaultInterval|
-Generated Location: (1439:28,38 [23] )
+Generated Location: (1561:32,38 [23] )
 |ViewBag.DefaultInterval|
 
 Source Location: (303:6,40 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers.cshtml)
 |true|
-Generated Location: (2137:39,42 [4] )
+Generated Location: (2259:43,42 [4] )
 |true|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.codegen.cs
index 6322f77a95..632c5c6da9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.codegen.cs
@@ -11,11 +11,19 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml"
 global::System.Object __typeHelper = "THS";
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.mappings.txt
index 7c5ad4ca43..e8294fb2f1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (17:0,17 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml)
 |"THS"|
-Generated Location: (682:13,37 [5] )
+Generated Location: (782:14,37 [5] )
 |"THS"|
 
 Source Location: (38:1,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml)
 |"*, TestAssembly"|
-Generated Location: (787:17,37 [17] )
+Generated Location: (1018:22,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (226:7,43 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed.cshtml)
 |true|
-Generated Location: (1624:33,43 [4] )
+Generated Location: (1886:41,43 [4] )
 |true|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.codegen.cs
index e2ff79fdb5..f462ec5fb6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.codegen.cs
@@ -11,7 +11,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.mappings.txt
index 5a3c14354f..3aadb7916f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |"*, TestAssembly"|
-Generated Location: (675:13,37 [17] )
+Generated Location: (768:14,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (36:2,1 [52] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
@@ -9,7 +9,7 @@ Source Location: (36:2,1 [52] TestFiles/IntegrationTests/CodeGenerationIntegrati
     var checkbox = "checkbox";
 
     |
-Generated Location: (1103:25,1 [52] )
+Generated Location: (1227:29,1 [52] )
 |if (true)
 {
     var checkbox = "checkbox";
@@ -18,39 +18,39 @@ Generated Location: (1103:25,1 [52] )
 
 Source Location: (147:7,16 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |@|
-Generated Location: (1409:35,33 [1] )
+Generated Location: (1533:39,33 [1] )
 |@|
 
 Source Location: (149:7,18 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 ||
-Generated Location: (1410:35,34 [0] )
+Generated Location: (1534:39,34 [0] )
 ||
 
 Source Location: (149:7,18 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |@|
-Generated Location: (1410:35,34 [1] )
+Generated Location: (1534:39,34 [1] )
 |@|
 
 Source Location: (150:7,19 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |(|
-Generated Location: (1411:35,35 [1] )
+Generated Location: (1535:39,35 [1] )
 |(|
 
 Source Location: (151:7,20 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |1+2|
-Generated Location: (1412:35,36 [3] )
+Generated Location: (1536:39,36 [3] )
 |1+2|
 
 Source Location: (154:7,23 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |)|
-Generated Location: (1415:35,39 [1] )
+Generated Location: (1539:39,39 [1] )
 |)|
 
 Source Location: (273:10,13 [43] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |if (false)
             {
                 |
-Generated Location: (1557:40,13 [43] )
+Generated Location: (1681:44,13 [43] )
 |if (false)
             {
                 |
@@ -61,7 +61,7 @@ Source Location: (399:12,99 [66] TestFiles/IntegrationTests/CodeGenerationIntegr
             else
             {
                 |
-Generated Location: (2277:52,99 [66] )
+Generated Location: (2401:56,99 [66] )
 |
             }
             else
@@ -70,224 +70,224 @@ Generated Location: (2277:52,99 [66] )
 
 Source Location: (495:16,46 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |checkbox|
-Generated Location: (2724:63,46 [8] )
+Generated Location: (2848:67,46 [8] )
 |checkbox|
 
 Source Location: (512:16,63 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |true|
-Generated Location: (3077:70,63 [4] )
+Generated Location: (3201:74,63 [4] )
 |true|
 
 Source Location: (523:16,74 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |
                 |
-Generated Location: (3378:76,74 [18] )
+Generated Location: (3502:80,74 [18] )
 |
                 |
 
 Source Location: (556:17,31 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |true ? "checkbox" : "anything"|
-Generated Location: (3762:84,31 [30] )
+Generated Location: (3886:88,31 [30] )
 |true ? "checkbox" : "anything"|
 
 Source Location: (591:17,66 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |
                 |
-Generated Location: (4140:91,66 [18] )
+Generated Location: (4264:95,66 [18] )
 |
                 |
 
 Source Location: (623:18,30 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |if(true) { |
-Generated Location: (4523:99,30 [11] )
+Generated Location: (4647:103,30 [11] )
 |if(true) { |
 
 Source Location: (655:18,62 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 | } else { |
-Generated Location: (4723:104,62 [10] )
+Generated Location: (4847:108,62 [10] )
 | } else { |
 
 Source Location: (686:18,93 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 | }|
-Generated Location: (4953:109,93 [2] )
+Generated Location: (5077:113,93 [2] )
 | }|
 
 Source Location: (690:18,97 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |
             }|
-Generated Location: (5333:116,97 [15] )
+Generated Location: (5457:120,97 [15] )
 |
             }|
 
 Source Location: (212:8,32 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |DateTime.Now|
-Generated Location: (5601:123,32 [12] )
+Generated Location: (5725:127,32 [12] )
 |DateTime.Now|
 
 Source Location: (832:22,14 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 | var @object = false;|
-Generated Location: (5755:128,14 [21] )
+Generated Location: (5879:132,14 [21] )
 | var @object = false;|
 
 Source Location: (885:23,29 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |(|
-Generated Location: (6153:135,42 [1] )
+Generated Location: (6277:139,42 [1] )
 |(|
 
 Source Location: (886:23,30 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |@object|
-Generated Location: (6154:135,43 [7] )
+Generated Location: (6278:139,43 [7] )
 |@object|
 
 Source Location: (893:23,37 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |)|
-Generated Location: (6161:135,50 [1] )
+Generated Location: (6285:139,50 [1] )
 |)|
 
 Source Location: (760:21,39 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |DateTimeOffset.Now.Year|
-Generated Location: (6423:141,38 [23] )
+Generated Location: (6547:145,38 [23] )
 |DateTimeOffset.Now.Year|
 
 Source Location: (783:21,62 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 | -|
-Generated Location: (6446:141,61 [2] )
+Generated Location: (6570:145,61 [2] )
 | -|
 
 Source Location: (785:21,64 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 | 1970|
-Generated Location: (6448:141,63 [5] )
+Generated Location: (6572:145,63 [5] )
 | 1970|
 
 Source Location: (1025:26,61 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |(|
-Generated Location: (6849:148,60 [1] )
+Generated Location: (6973:152,60 [1] )
 |(|
 
 Source Location: (1026:26,62 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |DateTimeOffset.Now.Year > 2014|
-Generated Location: (6850:148,61 [30] )
+Generated Location: (6974:152,61 [30] )
 |DateTimeOffset.Now.Year > 2014|
 
 Source Location: (1056:26,92 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |)|
-Generated Location: (6880:148,91 [1] )
+Generated Location: (7004:152,91 [1] )
 |)|
 
 Source Location: (928:25,16 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |-1970|
-Generated Location: (7137:154,33 [5] )
+Generated Location: (7261:158,33 [5] )
 |-1970|
 
 Source Location: (933:25,21 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 | +|
-Generated Location: (7142:154,38 [2] )
+Generated Location: (7266:158,38 [2] )
 | +|
 
 Source Location: (935:25,23 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 | |
-Generated Location: (7144:154,40 [1] )
+Generated Location: (7268:158,40 [1] )
 | |
 
 Source Location: (936:25,24 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |@|
-Generated Location: (7145:154,41 [1] )
+Generated Location: (7269:158,41 [1] )
 |@|
 
 Source Location: (937:25,25 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |DateTimeOffset.Now.Year|
-Generated Location: (7146:154,42 [23] )
+Generated Location: (7270:158,42 [23] )
 |DateTimeOffset.Now.Year|
 
 Source Location: (1155:29,28 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |DateTimeOffset.Now.Year > 2014|
-Generated Location: (7547:161,42 [30] )
+Generated Location: (7671:165,42 [30] )
 |DateTimeOffset.Now.Year > 2014|
 
 Source Location: (1093:28,16 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |DateTimeOffset.Now.Year - 1970|
-Generated Location: (7833:167,33 [30] )
+Generated Location: (7957:171,33 [30] )
 |DateTimeOffset.Now.Year - 1970|
 
 Source Location: (1283:32,28 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |   |
-Generated Location: (8241:174,42 [3] )
+Generated Location: (8365:178,42 [3] )
 |   |
 
 Source Location: (1286:32,31 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |@|
-Generated Location: (8244:174,45 [1] )
+Generated Location: (8368:178,45 [1] )
 |@|
 
 Source Location: (1287:32,32 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |(|
-Generated Location: (8245:174,46 [1] )
+Generated Location: (8369:178,46 [1] )
 |(|
 
 Source Location: (1288:32,33 [27] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |  DateTimeOffset.Now.Year  |
-Generated Location: (8246:174,47 [27] )
+Generated Location: (8370:178,47 [27] )
 |  DateTimeOffset.Now.Year  |
 
 Source Location: (1315:32,60 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |)|
-Generated Location: (8273:174,74 [1] )
+Generated Location: (8397:178,74 [1] )
 |)|
 
 Source Location: (1316:32,61 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 | >|
-Generated Location: (8274:174,75 [2] )
+Generated Location: (8398:178,75 [2] )
 | >|
 
 Source Location: (1318:32,63 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 | 2014|
-Generated Location: (8276:174,77 [5] )
+Generated Location: (8400:178,77 [5] )
 | 2014|
 
 Source Location: (1323:32,68 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |   |
-Generated Location: (8281:174,82 [3] )
+Generated Location: (8405:178,82 [3] )
 |   |
 
 Source Location: (1220:31,17 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |(|
-Generated Location: (8540:180,33 [1] )
+Generated Location: (8664:184,33 [1] )
 |(|
 
 Source Location: (1221:31,18 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |"My age is this long.".Length|
-Generated Location: (8541:180,34 [29] )
+Generated Location: (8665:184,34 [29] )
 |"My age is this long.".Length|
 
 Source Location: (1250:31,47 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |)|
-Generated Location: (8570:180,63 [1] )
+Generated Location: (8694:184,63 [1] )
 |)|
 
 Source Location: (1355:34,9 [11] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |someMethod(|
-Generated Location: (8708:185,9 [11] )
+Generated Location: (8832:189,9 [11] )
 |someMethod(|
 
 Source Location: (1410:34,64 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |checked|
-Generated Location: (9126:189,63 [7] )
+Generated Location: (9250:193,63 [7] )
 |checked|
 
 Source Location: (1375:34,29 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |123|
-Generated Location: (9381:195,33 [3] )
+Generated Location: (9505:199,33 [3] )
 |123|
 
 Source Location: (1424:34,78 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |)|
-Generated Location: (9422:200,1 [1] )
+Generated Location: (9546:204,1 [1] )
 |)|
 
 Source Location: (1437:35,10 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml)
 |
 }|
-Generated Location: (9561:205,10 [3] )
+Generated Location: (9685:209,10 [3] )
 |
 }|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.cs
index d30aea4b02..3efdad255d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.cs
@@ -8,7 +8,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml"
 global::System.Object Footer = null;
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.mappings.txt
index 87ab943dfc..f35877bdb3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.mappings.txt
@@ -1,49 +1,49 @@
 Source Location: (173:11,9 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
 |Footer|
-Generated Location: (401:10,22 [6] )
+Generated Location: (488:11,22 [6] )
 |Footer|
 
 Source Location: (20:1,13 [36] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
 |for(int i = 1; i <= 10; i++) {
     |
-Generated Location: (830:22,13 [36] )
+Generated Location: (948:26,13 [36] )
 |for(int i = 1; i <= 10; i++) {
     |
 
 Source Location: (74:2,22 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
 |i|
-Generated Location: (1007:28,22 [1] )
+Generated Location: (1125:32,22 [1] )
 |i|
 
 Source Location: (79:2,27 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
 |
             }|
-Generated Location: (1155:33,27 [15] )
+Generated Location: (1273:37,27 [15] )
 |
             }|
 
 Source Location: (113:7,2 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
 |Foo(Bar.Baz)|
-Generated Location: (1295:39,6 [12] )
+Generated Location: (1413:43,6 [12] )
 |Foo(Bar.Baz)|
 
 Source Location: (129:8,1 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
 |Foo(|
-Generated Location: (1433:44,6 [4] )
+Generated Location: (1551:48,6 [4] )
 |Foo(|
 
 Source Location: (142:8,14 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
 |baz|
-Generated Location: (1595:46,14 [3] )
+Generated Location: (1713:50,14 [3] )
 |baz|
 
 Source Location: (153:8,25 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
 |)|
-Generated Location: (1636:51,1 [1] )
+Generated Location: (1754:55,1 [1] )
 |)|
 
 Source Location: (204:13,5 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime.cshtml)
 |bar|
-Generated Location: (1836:57,6 [3] )
+Generated Location: (1954:61,6 [3] )
 |bar|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.codegen.cs
index bb9a7ef103..c0ce37ece6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.codegen.cs
@@ -11,7 +11,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.mappings.txt
index 550a6a62a4..4e2ad9730b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml)
 |"*, TestAssembly"|
-Generated Location: (686:13,37 [17] )
+Generated Location: (790:14,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (146:4,34 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml)
 |true|
-Generated Location: (1882:33,42 [4] )
+Generated Location: (2017:37,42 [4] )
 |true|
 
 Source Location: (222:5,34 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml)
 |true|
-Generated Location: (2424:42,42 [4] )
+Generated Location: (2559:46,42 [4] )
 |true|
 
 Source Location: (43:2,8 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers.cshtml)
 |3|
-Generated Location: (2694:48,33 [1] )
+Generated Location: (2829:52,33 [1] )
 |3|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs
index 98078501de..f9352a839f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.codegen.cs
@@ -10,7 +10,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt
index 800ab195ba..67262f09de 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml)
 |"*, TestAssembly"|
-Generated Location: (608:12,37 [17] )
+Generated Location: (708:13,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (67:2,32 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateTargetTagHelper.cshtml)
 |true|
-Generated Location: (1449:28,41 [4] )
+Generated Location: (1580:32,41 [4] )
 |true|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.codegen.cs
index dd5214d829..2758e4bca9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.codegen.cs
@@ -9,7 +9,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.mappings.txt
index f2b45b216e..f3d53b0651 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.mappings.txt
@@ -1,155 +1,155 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |"*, TestAssembly"|
-Generated Location: (518:11,37 [17] )
+Generated Location: (620:12,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (59:2,24 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |DateTime.Now|
-Generated Location: (1081:24,24 [12] )
+Generated Location: (1214:28,24 [12] )
 |DateTime.Now|
 
 Source Location: (96:4,17 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |if (true) { |
-Generated Location: (1349:30,17 [12] )
+Generated Location: (1482:34,17 [12] )
 |if (true) { |
 
 Source Location: (109:4,30 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |string.Empty|
-Generated Location: (1526:35,30 [12] )
+Generated Location: (1659:39,30 [12] )
 |string.Empty|
 
 Source Location: (121:4,42 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 | } else { |
-Generated Location: (1716:40,42 [10] )
+Generated Location: (1849:44,42 [10] )
 | } else { |
 
 Source Location: (132:4,53 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |false|
-Generated Location: (1914:45,53 [5] )
+Generated Location: (2047:49,53 [5] )
 |false|
 
 Source Location: (137:4,58 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 | }|
-Generated Location: (2113:50,58 [2] )
+Generated Location: (2246:54,58 [2] )
 | }|
 
 Source Location: (176:6,22 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |DateTime.Now|
-Generated Location: (2375:56,22 [12] )
+Generated Location: (2508:60,22 [12] )
 |DateTime.Now|
 
 Source Location: (214:6,60 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |DateTime.Now|
-Generated Location: (2649:62,60 [12] )
+Generated Location: (2782:66,60 [12] )
 |DateTime.Now|
 
 Source Location: (256:8,15 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |long.MinValue|
-Generated Location: (2915:68,15 [13] )
+Generated Location: (3048:72,15 [13] )
 |long.MinValue|
 
 Source Location: (271:8,30 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |if (true) { |
-Generated Location: (3094:73,30 [12] )
+Generated Location: (3227:77,30 [12] )
 |if (true) { |
 
 Source Location: (284:8,43 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |string.Empty|
-Generated Location: (3284:78,43 [12] )
+Generated Location: (3417:82,43 [12] )
 |string.Empty|
 
 Source Location: (296:8,55 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 | } else { |
-Generated Location: (3487:83,55 [10] )
+Generated Location: (3620:87,55 [10] )
 | } else { |
 
 Source Location: (307:8,66 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |false|
-Generated Location: (3698:88,66 [5] )
+Generated Location: (3831:92,66 [5] )
 |false|
 
 Source Location: (312:8,71 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 | }|
-Generated Location: (3910:93,71 [2] )
+Generated Location: (4043:97,71 [2] )
 | }|
 
 Source Location: (316:8,75 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |int.MaxValue|
-Generated Location: (4122:98,75 [12] )
+Generated Location: (4255:102,75 [12] )
 |int.MaxValue|
 
 Source Location: (348:9,17 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |long.MinValue|
-Generated Location: (4354:104,17 [13] )
+Generated Location: (4487:108,17 [13] )
 |long.MinValue|
 
 Source Location: (363:9,32 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |if (true) { |
-Generated Location: (4536:109,32 [12] )
+Generated Location: (4669:113,32 [12] )
 |if (true) { |
 
 Source Location: (376:9,45 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |string.Empty|
-Generated Location: (4729:114,45 [12] )
+Generated Location: (4862:118,45 [12] )
 |string.Empty|
 
 Source Location: (388:9,57 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 | } else { |
-Generated Location: (4935:119,57 [10] )
+Generated Location: (5068:123,57 [10] )
 | } else { |
 
 Source Location: (399:9,68 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |false|
-Generated Location: (5149:124,68 [5] )
+Generated Location: (5282:128,68 [5] )
 |false|
 
 Source Location: (404:9,73 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 | }|
-Generated Location: (5364:129,73 [2] )
+Generated Location: (5497:133,73 [2] )
 | }|
 
 Source Location: (408:9,77 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |int.MaxValue|
-Generated Location: (5579:134,77 [12] )
+Generated Location: (5712:138,77 [12] )
 |int.MaxValue|
 
 Source Location: (445:11,17 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |long.MinValue|
-Generated Location: (5848:140,17 [13] )
+Generated Location: (5981:144,17 [13] )
 |long.MinValue|
 
 Source Location: (460:11,32 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |DateTime.Now|
-Generated Location: (6030:145,32 [12] )
+Generated Location: (6163:149,32 [12] )
 |DateTime.Now|
 
 Source Location: (492:11,64 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |int.MaxValue|
-Generated Location: (6243:150,64 [12] )
+Generated Location: (6376:154,64 [12] )
 |int.MaxValue|
 
 Source Location: (529:13,17 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |if (true) { |
-Generated Location: (6512:156,17 [12] )
+Generated Location: (6645:160,17 [12] )
 |if (true) { |
 
 Source Location: (542:13,30 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |string.Empty|
-Generated Location: (6690:161,30 [12] )
+Generated Location: (6823:165,30 [12] )
 |string.Empty|
 
 Source Location: (554:13,42 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 | } else { |
-Generated Location: (6881:166,42 [10] )
+Generated Location: (7014:170,42 [10] )
 | } else { |
 
 Source Location: (565:13,53 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 |false|
-Generated Location: (7080:171,53 [5] )
+Generated Location: (7213:175,53 [5] )
 |false|
 
 Source Location: (570:13,58 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers.cshtml)
 | }|
-Generated Location: (7280:176,58 [2] )
+Generated Location: (7413:180,58 [2] )
 | }|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.codegen.cs
index 669d7a19c6..9e39a276ab 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.codegen.cs
@@ -11,7 +11,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.mappings.txt
index 1f98a4c03f..08d465380f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml)
 |*, TestAssembly|
-Generated Location: (683:13,38 [15] )
+Generated Location: (783:14,38 [15] )
 |*, TestAssembly|
 
 Source Location: (66:3,26 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml)
 ||
-Generated Location: (1510:29,42 [0] )
+Generated Location: (1641:33,42 [0] )
 ||
 
 Source Location: (126:5,30 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml)
 ||
-Generated Location: (2038:38,42 [0] )
+Generated Location: (2169:42,42 [0] )
 ||
 
 Source Location: (92:4,12 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers.cshtml)
 ||
-Generated Location: (2300:44,33 [0] )
+Generated Location: (2431:48,33 [0] )
 ||
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.codegen.cs
index db0d5933b9..1e3baec784 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.codegen.cs
@@ -10,7 +10,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.mappings.txt
index 948af33b62..f2c51bc5a4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.mappings.txt
@@ -1,49 +1,49 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
 |"*, TestAssembly"|
-Generated Location: (598:12,37 [17] )
+Generated Location: (688:13,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (37:2,2 [39] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
 |
     var enumValue = MyEnum.MyValue;
 |
-Generated Location: (1024:24,2 [39] )
+Generated Location: (1145:28,2 [39] )
 |
     var enumValue = MyEnum.MyValue;
 |
 
 Source Location: (96:6,15 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
 |MyEnum.MyValue|
-Generated Location: (1435:32,39 [14] )
+Generated Location: (1556:36,39 [14] )
 |MyEnum.MyValue|
 
 Source Location: (131:7,15 [20] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
 |MyEnum.MySecondValue|
-Generated Location: (1800:39,15 [20] )
+Generated Location: (1921:43,15 [20] )
 |MyEnum.MySecondValue|
 
 Source Location: (171:8,14 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
 |MyValue|
-Generated Location: (2288:46,132 [7] )
+Generated Location: (2409:50,132 [7] )
 |MyValue|
 
 Source Location: (198:9,14 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
 |MySecondValue|
-Generated Location: (2764:53,132 [13] )
+Generated Location: (2885:57,132 [13] )
 |MySecondValue|
 
 Source Location: (224:9,40 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
 |MyValue|
-Generated Location: (3040:58,138 [7] )
+Generated Location: (3161:62,138 [7] )
 |MyValue|
 
 Source Location: (251:10,15 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
 |enumValue|
-Generated Location: (3423:65,39 [9] )
+Generated Location: (3544:69,39 [9] )
 |enumValue|
 
 Source Location: (274:10,38 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers.cshtml)
 |enumValue|
-Generated Location: (3602:70,45 [9] )
+Generated Location: (3723:74,45 [9] )
 |enumValue|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.codegen.cs
index 81fc96ba88..c07ab803f0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.codegen.cs
@@ -10,7 +10,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.mappings.txt
index 32e64b25e5..3ab1bf8760 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml)
 |*, TestAssembly|
-Generated Location: (598:12,38 [15] )
+Generated Location: (691:13,38 [15] )
 |*, TestAssembly|
 
 Source Location: (106:3,29 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml)
 |DateTime.Now|
-Generated Location: (1053:24,29 [12] )
+Generated Location: (1177:28,29 [12] )
 |DateTime.Now|
 
 Source Location: (204:5,51 [12] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml)
 |DateTime.Now|
-Generated Location: (1451:31,51 [12] )
+Generated Location: (1575:35,51 [12] )
 |DateTime.Now|
 
 Source Location: (227:5,74 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers.cshtml)
 |true|
-Generated Location: (1818:38,74 [4] )
+Generated Location: (1942:42,74 [4] )
 |true|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt
index 2d4242e8c4..2d86df3579 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt
@@ -6,7 +6,7 @@ Document -
             MethodDeclaration -  - public async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [4] FunctionsBlockMinimal.cshtml)
                     IntermediateToken - (0:0,0 [4] FunctionsBlockMinimal.cshtml) - Html - \n\n
-            CSharpCode - (4:2,0 [1] FunctionsBlockMinimal.cshtml)
-                IntermediateToken - (4:2,0 [1] FunctionsBlockMinimal.cshtml) - CSharp - 	
+                CSharpCode - (4:2,0 [1] FunctionsBlockMinimal.cshtml)
+                    IntermediateToken - (4:2,0 [1] FunctionsBlockMinimal.cshtml) - CSharp - 	
             CSharpCode - (16:2,12 [55] FunctionsBlockMinimal.cshtml)
                 IntermediateToken - (16:2,12 [55] FunctionsBlockMinimal.cshtml) - CSharp - \nstring foo(string input) {\n	return input + "!";\n}\n
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
index 9e76084ccd..aded1d15f9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
@@ -8,39 +8,75 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
 global::System.Object __typeHelper = "";
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
 global::System.Object __typeHelper = "";
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
 global::System.Object __typeHelper = ";
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
 global::System.Object __typeHelper = "";
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
 global::System.Object __typeHelper = "";
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
 global::System.Object __typeHelper = ";
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
 global::System.Object __typeHelper = "";
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
 global::System.Object __typeHelper = "";
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
 global::System.Object __typeHelper = ";
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
index 41510ddf4d..274e1271a8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
@@ -1,70 +1,70 @@
 Source Location: (100:2,13 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (427:10,38 [0] )
+Generated Location: (523:11,38 [0] )
 ||
 
 Source Location: (116:3,14 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (529:14,38 [0] )
+Generated Location: (752:19,38 [0] )
 ||
 
 Source Location: (132:4,14 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 |"|
-Generated Location: (630:18,37 [1] )
+Generated Location: (980:27,37 [1] )
 |"|
 
 Source Location: (153:6,16 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (732:22,38 [0] )
+Generated Location: (1209:35,38 [0] )
 ||
 
 Source Location: (172:7,17 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (834:26,38 [0] )
+Generated Location: (1438:43,38 [0] )
 ||
 
 Source Location: (191:8,17 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 |"|
-Generated Location: (935:30,37 [1] )
+Generated Location: (1666:51,37 [1] )
 |"|
 
 Source Location: (212:10,16 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1037:34,38 [0] )
+Generated Location: (1896:59,38 [0] )
 ||
 
 Source Location: (231:11,17 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1139:38,38 [0] )
+Generated Location: (2126:67,38 [0] )
 ||
 
 Source Location: (250:12,17 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 |"|
-Generated Location: (1240:42,37 [1] )
+Generated Location: (2355:75,37 [1] )
 |"|
 
 Source Location: (264:14,9 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1304:46,0 [0] )
+Generated Location: (2450:82,0 [0] )
 ||
 
 Source Location: (276:15,10 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1357:49,0 [0] )
+Generated Location: (2503:85,0 [0] )
 ||
 
 Source Location: (315:20,8 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1410:52,0 [0] )
+Generated Location: (2556:88,0 [0] )
 ||
 
 Source Location: (326:21,9 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1463:55,0 [0] )
+Generated Location: (2609:91,0 [0] )
 ||
 
 Source Location: (354:24,12 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
 ||
-Generated Location: (1879:66,12 [0] )
+Generated Location: (3025:102,12 [0] )
 ||
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.codegen.cs
index 3a01486099..c41bad1d6d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.codegen.cs
@@ -9,7 +9,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.mappings.txt
index cad8cf7ea6..712b3e20a2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper.cshtml)
 |"*, TestAssembly"|
-Generated Location: (503:11,37 [17] )
+Generated Location: (598:12,37 [17] )
 |"*, TestAssembly"|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs
index bb73db8e52..6601497a12 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.cs
@@ -8,7 +8,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml"
 foo.bar<baz<biz>>.boz __typeHelper = default(foo.bar<baz<biz>>.boz);
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt
index bbde1e3ca1..01b6682fe7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (10:0,10 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml)
 |foo.bar<baz<biz>>.boz|
-Generated Location: (401:10,0 [21] )
+Generated Location: (485:11,0 [21] )
 |foo.bar<baz<biz>>.boz|
 
 Source Location: (36:2,1 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits.cshtml)
 |foo()|
-Generated Location: (875:22,6 [5] )
+Generated Location: (990:26,6 [5] )
 |foo()|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.cs
index 0dac7a2c04..2f0457a578 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.cs
@@ -8,7 +8,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml"
 global::System.Object Link = null;
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.mappings.txt
index defa39bbc4..0a768ff099 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (9:0,9 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml)
 |Link|
-Generated Location: (403:10,22 [4] )
+Generated Location: (491:11,22 [4] )
 |Link|
 
 Source Location: (44:1,14 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml)
 |if(link != null) { |
-Generated Location: (833:22,14 [19] )
+Generated Location: (952:26,14 [19] )
 |if(link != null) { |
 
 Source Location: (64:1,34 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml)
 |link|
-Generated Location: (1007:27,34 [4] )
+Generated Location: (1126:31,34 [4] )
 |link|
 
 Source Location: (68:1,38 [10] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml)
 | } else { |
-Generated Location: (1171:32,38 [10] )
+Generated Location: (1290:36,38 [10] )
 | } else { |
 
 Source Location: (92:1,62 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks.cshtml)
 | }|
-Generated Location: (1364:37,62 [2] )
+Generated Location: (1483:41,62 [2] )
 | }|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.codegen.cs
index 5f2fdedba9..fa57dea3a8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.codegen.cs
@@ -11,7 +11,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.mappings.txt
index cb760ffd40..0de418c09e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers.cshtml)
 |"*, TestAssembly"|
-Generated Location: (657:13,37 [17] )
+Generated Location: (752:14,37 [17] )
 |"*, TestAssembly"|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.codegen.cs
index 0da5daae01..7062693c30 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.codegen.cs
@@ -11,7 +11,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.mappings.txt
index 59224681d1..4237e35905 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.mappings.txt
@@ -1,29 +1,29 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml)
 |"*, TestAssembly"|
-Generated Location: (683:13,37 [17] )
+Generated Location: (784:14,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (195:5,13 [46] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml)
 |for(var i = 0; i < 5; i++) {
                 |
-Generated Location: (1131:25,13 [46] )
+Generated Location: (1263:29,13 [46] )
 |for(var i = 0; i < 5; i++) {
                 |
 
 Source Location: (339:7,50 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml)
 |ViewBag.DefaultInterval|
-Generated Location: (1569:33,50 [23] )
+Generated Location: (1701:37,50 [23] )
 |ViewBag.DefaultInterval|
 
 Source Location: (389:7,100 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml)
 |true|
-Generated Location: (1975:40,100 [4] )
+Generated Location: (2107:44,100 [4] )
 |true|
 
 Source Location: (422:8,25 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml)
 |
             }|
-Generated Location: (2139:45,25 [15] )
+Generated Location: (2271:49,25 [15] )
 |
             }|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.codegen.cs
index ea880b7745..dc07e6a077 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.codegen.cs
@@ -11,7 +11,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.mappings.txt
index 0cc715d741..f4933d814c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers.cshtml)
 |*, TestAssembly|
-Generated Location: (591:13,38 [15] )
+Generated Location: (683:14,38 [15] )
 |*, TestAssembly|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.codegen.cs
index 438c533987..7b5af6a7b8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.codegen.cs
@@ -10,7 +10,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.mappings.txt
index 2f22a4d206..ea1b6c005f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |"*, TestAssembly"|
-Generated Location: (609:12,37 [17] )
+Generated Location: (712:13,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (37:2,2 [242] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
@@ -15,7 +15,7 @@ Source Location: (37:2,2 [242] TestFiles/IntegrationTests/CodeGenerationIntegrat
         { "name", "value" },
     };
 |
-Generated Location: (1048:24,2 [242] )
+Generated Location: (1182:28,2 [242] )
 |
     var literate = "or illiterate";
     var intDictionary = new Dictionary<string, int>
@@ -30,51 +30,51 @@ Generated Location: (1048:24,2 [242] )
 
 Source Location: (370:15,43 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |intDictionary|
-Generated Location: (1691:40,56 [13] )
+Generated Location: (1825:44,56 [13] )
 |intDictionary|
 
 Source Location: (404:15,77 [16] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |stringDictionary|
-Generated Location: (2043:46,77 [16] )
+Generated Location: (2177:50,77 [16] )
 |stringDictionary|
 
 Source Location: (468:16,43 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |intDictionary|
-Generated Location: (2593:54,56 [13] )
+Generated Location: (2727:58,56 [13] )
 |intDictionary|
 
 Source Location: (502:16,77 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |37|
-Generated Location: (2945:60,77 [2] )
+Generated Location: (3079:64,77 [2] )
 |37|
 
 Source Location: (526:16,101 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |42|
-Generated Location: (3330:66,101 [2] )
+Generated Location: (3464:70,101 [2] )
 |42|
 
 Source Location: (590:18,31 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |42|
-Generated Location: (3851:74,46 [2] )
+Generated Location: (3985:78,46 [2] )
 |42|
 
 Source Location: (611:18,52 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |37|
-Generated Location: (4180:80,64 [2] )
+Generated Location: (4314:84,64 [2] )
 |37|
 
 Source Location: (634:18,75 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |98|
-Generated Location: (4535:86,75 [2] )
+Generated Location: (4669:90,75 [2] )
 |98|
 
 Source Location: (783:20,42 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |literate|
-Generated Location: (5317:96,42 [8] )
+Generated Location: (5451:100,42 [8] )
 |literate|
 
 Source Location: (826:21,29 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers.cshtml)
 |37|
-Generated Location: (5981:105,65 [2] )
+Generated Location: (6115:109,65 [2] )
 |37|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml
index bd4820f914..1edd2fcc49 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml
@@ -13,3 +13,6 @@
 <p>But this should show the comment syntax: @bar</p>
 
 @(a@**@b)
+
+<input value="@*this razor comment is the actual value*@" type="text" />
+<input @*this razor comment will not be rendered*@ type="text" />
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt
index e75591ec2d..5853591fb0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt
@@ -38,5 +38,14 @@ Document -
                 CSharpExpression - (323:14,2 [2] RazorComments.cshtml)
                     IntermediateToken - (323:14,2 [1] RazorComments.cshtml) - CSharp - a
                     IntermediateToken - (328:14,7 [1] RazorComments.cshtml) - CSharp - b
-                HtmlContent - (330:14,9 [2] RazorComments.cshtml)
-                    IntermediateToken - (330:14,9 [2] RazorComments.cshtml) - Html - \n
+                HtmlContent - (330:14,9 [85] RazorComments.cshtml)
+                    IntermediateToken - (330:14,9 [4] RazorComments.cshtml) - Html - \n\n
+                    IntermediateToken - (334:16,0 [6] RazorComments.cshtml) - Html - <input
+                    IntermediateToken - (340:16,6 [51] RazorComments.cshtml) - Html -  value="@*this razor comment is the actual value*@"
+                    IntermediateToken - (391:16,57 [12] RazorComments.cshtml) - Html -  type="text"
+                    IntermediateToken - (403:16,69 [3] RazorComments.cshtml) - Html -  />
+                    IntermediateToken - (406:16,72 [2] RazorComments.cshtml) - Html - \n
+                    IntermediateToken - (408:17,0 [7] RazorComments.cshtml) - Html - <input 
+                HtmlContent - (458:17,50 [17] RazorComments.cshtml)
+                    IntermediateToken - (458:17,50 [15] RazorComments.cshtml) - Html -  type="text" />
+                    IntermediateToken - (473:17,65 [2] RazorComments.cshtml) - Html - \n
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.codegen.cs
index d9b27a45c7..7579c50719 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.codegen.cs
@@ -1,11 +1,11 @@
-#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "051345e2cc0313fea445db2f6cf48fe28b0b4edf"
+#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4d553281e07fafc67ca0139b27ee95724a37f162"
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorComments_Runtime), @"default", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml")]
 namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
 {
     #line hidden
-    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"051345e2cc0313fea445db2f6cf48fe28b0b4edf", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"4d553281e07fafc67ca0139b27ee95724a37f162", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments.cshtml")]
     public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorComments_Runtime
     {
         #pragma warning disable 1998
@@ -45,7 +45,8 @@ Write(ab);
 
 #line default
 #line hidden
-            WriteLiteral("\r\n");
+            WriteLiteral("\r\n\r\n<input value=\"@*this razor comment is the actual value*@\" type=\"text\" />\r\n<input ");
+            WriteLiteral(" type=\"text\" />\r\n");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt
index e05218677f..47c3a144f1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt
@@ -33,5 +33,14 @@ Document -
                 CSharpExpression - (323:14,2 [2] RazorComments.cshtml)
                     IntermediateToken - (323:14,2 [1] RazorComments.cshtml) - CSharp - a
                     IntermediateToken - (328:14,7 [1] RazorComments.cshtml) - CSharp - b
-                HtmlContent - (330:14,9 [2] RazorComments.cshtml)
-                    IntermediateToken - (330:14,9 [2] RazorComments.cshtml) - Html - \n
+                HtmlContent - (330:14,9 [85] RazorComments.cshtml)
+                    IntermediateToken - (330:14,9 [4] RazorComments.cshtml) - Html - \n\n
+                    IntermediateToken - (334:16,0 [6] RazorComments.cshtml) - Html - <input
+                    IntermediateToken - (340:16,6 [51] RazorComments.cshtml) - Html -  value="@*this razor comment is the actual value*@"
+                    IntermediateToken - (391:16,57 [12] RazorComments.cshtml) - Html -  type="text"
+                    IntermediateToken - (403:16,69 [3] RazorComments.cshtml) - Html -  />
+                    IntermediateToken - (406:16,72 [2] RazorComments.cshtml) - Html - \n
+                    IntermediateToken - (408:17,0 [7] RazorComments.cshtml) - Html - <input 
+                HtmlContent - (458:17,50 [17] RazorComments.cshtml)
+                    IntermediateToken - (458:17,50 [15] RazorComments.cshtml) - Html -  type="text" />
+                    IntermediateToken - (473:17,65 [2] RazorComments.cshtml) - Html - \n
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.cs
index 860fed746d..997aecf717 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.cs
@@ -8,7 +8,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.mappings.txt
index 709b86af82..eb3dd0052c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (17:0,17 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective.cshtml)
 |*, TestAssembly|
-Generated Location: (431:10,38 [15] )
+Generated Location: (531:11,38 [15] )
 |*, TestAssembly|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
index 556cf5e489..fa69badba2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs
@@ -8,15 +8,27 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
 global::System.Object Section2 = null;
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
 global::System.Object Section1 = null;
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
 global::System.Object NestedDelegates = null;
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
index f6aedef836..f1bbd3c6c6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.mappings.txt
@@ -1,44 +1,44 @@
 Source Location: (89:6,9 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Section2|
-Generated Location: (399:10,22 [8] )
+Generated Location: (483:11,22 [8] )
 |Section2|
 
 Source Location: (172:10,9 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |Section1|
-Generated Location: (499:14,22 [8] )
+Generated Location: (699:19,22 [8] )
 |Section1|
 
 Source Location: (235:14,9 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |NestedDelegates|
-Generated Location: (599:18,22 [15] )
+Generated Location: (915:27,22 [15] )
 |NestedDelegates|
 
 Source Location: (2:0,2 [44] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |
     Layout = "_SectionTestLayout.cshtml"
 |
-Generated Location: (1024:30,2 [44] )
+Generated Location: (1371:42,2 [44] )
 |
     Layout = "_SectionTestLayout.cshtml"
 |
 
 Source Location: (123:7,22 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |thing|
-Generated Location: (1279:37,22 [5] )
+Generated Location: (1626:49,22 [5] )
 |thing|
 
 Source Location: (260:15,6 [27] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 | Func<dynamic, object> f = |
-Generated Location: (1626:48,6 [27] )
+Generated Location: (1973:60,6 [27] )
 | Func<dynamic, object> f = |
 
 Source Location: (295:15,41 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |item|
-Generated Location: (1886:54,41 [4] )
+Generated Location: (2233:66,41 [4] )
 |item|
 
 Source Location: (306:15,52 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml)
 |; |
-Generated Location: (2099:61,52 [2] )
+Generated Location: (2446:73,52 [2] )
 |; |
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.codegen.cs
index 3cbb810d65..74ba99e03f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.codegen.cs
@@ -9,7 +9,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.mappings.txt
index 79472b01be..b2c300d627 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers.cshtml)
 |*, TestAssembly|
-Generated Location: (481:11,38 [15] )
+Generated Location: (573:12,38 [15] )
 |*, TestAssembly|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.codegen.cs
index fb63b233ff..eff8546b1d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.codegen.cs
@@ -9,7 +9,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.mappings.txt
index 47bfc7994d..038c4de2c6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml)
 |"*, TestAssembly"|
-Generated Location: (526:11,37 [17] )
+Generated Location: (644:12,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (67:3,28 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes.cshtml)
 |1337|
-Generated Location: (1106:24,33 [4] )
+Generated Location: (1255:28,33 [4] )
 |1337|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.codegen.cs
index bba1ae1d82..8cb3c83fd5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.codegen.cs
@@ -9,7 +9,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.mappings.txt
index 68565eaf3e..7504fcd0f3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml)
 |"*, TestAssembly"|
-Generated Location: (499:11,37 [17] )
+Generated Location: (590:12,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (63:2,28 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper.cshtml)
 |1337|
-Generated Location: (1052:24,33 [4] )
+Generated Location: (1174:28,33 [4] )
 |1337|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.cs
index e1a96c0d30..e71879b612 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.cs
@@ -8,11 +8,19 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 86 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml"
 global::System.Object WriteLiteralsToInHere = null;
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 206 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml"
 global::System.Object WriteLiteralsToInHereAlso = null;
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.mappings.txt
index 894e426da0..c8aab8c008 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (2022:85,9 [21] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml)
 |WriteLiteralsToInHere|
-Generated Location: (405:10,22 [21] )
+Generated Location: (496:11,22 [21] )
 |WriteLiteralsToInHere|
 
 Source Location: (5701:205,9 [25] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals.cshtml)
 |WriteLiteralsToInHereAlso|
-Generated Location: (518:14,22 [25] )
+Generated Location: (732:19,22 [25] )
 |WriteLiteralsToInHereAlso|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.codegen.cs
index 2c45a0431f..245dc4718f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.codegen.cs
@@ -9,7 +9,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.mappings.txt
index 6538479806..dca44c7efe 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.mappings.txt
@@ -1,25 +1,25 @@
 Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml)
 |*, TestAssembly|
-Generated Location: (520:11,38 [15] )
+Generated Location: (617:12,38 [15] )
 |*, TestAssembly|
 
 Source Location: (302:11,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml)
 |items|
-Generated Location: (1106:24,46 [5] )
+Generated Location: (1234:28,46 [5] )
 |items|
 
 Source Location: (351:12,20 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml)
 |items|
-Generated Location: (1399:30,47 [5] )
+Generated Location: (1527:34,47 [5] )
 |items|
 
 Source Location: (405:13,23 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml)
 |doSomething()|
-Generated Location: (1688:36,43 [13] )
+Generated Location: (1816:40,43 [13] )
 |doSomething()|
 
 Source Location: (487:14,24 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes.cshtml)
 |doSomething()|
-Generated Location: (1985:42,43 [13] )
+Generated Location: (2113:46,43 [13] )
 |doSomething()|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.codegen.cs
index f875e4d082..316e5938a7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.codegen.cs
@@ -9,7 +9,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.mappings.txt
index 597eef56ac..8996c532bd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.mappings.txt
@@ -1,10 +1,10 @@
 Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml)
 |*, TestAssembly|
-Generated Location: (494:11,38 [15] )
+Generated Location: (599:12,38 [15] )
 |*, TestAssembly|
 
 Source Location: (57:2,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes.cshtml)
 |Hello|
-Generated Location: (1025:24,18 [5] )
+Generated Location: (1161:28,18 [5] )
 |Hello|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.codegen.cs
index 9d9b99ec91..d578f477fc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.codegen.cs
@@ -9,11 +9,19 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         ((System.Action)(() => {
+#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml"
 global::System.Object __typeHelper = "cool:";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.mappings.txt
index f44871f2b6..1635962c6a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.mappings.txt
@@ -1,15 +1,15 @@
 Source Location: (14:0,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml)
 |*, TestAssembly|
-Generated Location: (485:11,38 [15] )
+Generated Location: (581:12,38 [15] )
 |*, TestAssembly|
 
 Source Location: (48:1,17 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml)
 |cool:|
-Generated Location: (602:15,38 [5] )
+Generated Location: (825:20,38 [5] )
 |cool:|
 
 Source Location: (86:3,23 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix.cshtml)
 |Hello|
-Generated Location: (1119:28,23 [5] )
+Generated Location: (1373:36,23 [5] )
 |Hello|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.codegen.cs
index 47937e15b1..431dc241e9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.codegen.cs
@@ -10,7 +10,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.mappings.txt
index 7426e542d0..7c9c00360a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate_DesignTime.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml)
 |"*, TestAssembly"|
-Generated Location: (540:12,37 [17] )
+Generated Location: (638:13,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (333:12,6 [66] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml)
@@ -8,7 +8,7 @@ Source Location: (333:12,6 [66] TestFiles/IntegrationTests/CodeGenerationIntegra
         RenderTemplate(
             "Template: ",
             |
-Generated Location: (979:24,6 [66] )
+Generated Location: (1108:28,6 [66] )
 |
         RenderTemplate(
             "Template: ",
@@ -16,13 +16,13 @@ Generated Location: (979:24,6 [66] )
 
 Source Location: (427:15,40 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml)
 |item|
-Generated Location: (1287:33,40 [4] )
+Generated Location: (1416:37,40 [4] )
 |item|
 
 Source Location: (482:15,95 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithTemplate.cshtml)
 |);
     |
-Generated Location: (1703:42,95 [8] )
+Generated Location: (1832:46,95 [8] )
 |);
     |
 
@@ -35,7 +35,7 @@ Source Location: (47:2,12 [268] TestFiles/IntegrationTests/CodeGenerationIntegra
         helperResult.WriteTo(Output, HtmlEncoder);
     }
 |
-Generated Location: (1974:51,12 [268] )
+Generated Location: (2103:55,12 [268] )
 |
     public void RenderTemplate(string title, Func<string, HelperResult> template)
     {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.codegen.cs
index 42a22375b7..a9bf4e007c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.codegen.cs
@@ -11,7 +11,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt
index 2ada0a9862..8f89ff3a4f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt
@@ -69,7 +69,7 @@ Document -
                     DefaultTagHelperProperty - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml) - type - string TestNamespace.InputTagHelper2.Type - HtmlAttributeValueStyle.DoubleQuotes
                         HtmlContent - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml)
                             IntermediateToken - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - password
-                    DefaultTagHelperHtmlAttribute -  - data-content - HtmlAttributeValueStyle.NoQuotes
+                    DefaultTagHelperHtmlAttribute -  - data-content - HtmlAttributeValueStyle.DoubleQuotes
                         HtmlContent - (270:14,31 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml)
                             IntermediateToken - (270:14,31 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - blah
                     DefaultTagHelperExecute - 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.mappings.txt
index 541fbb7b28..30d7559702 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.mappings.txt
@@ -1,20 +1,20 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml)
 |"*, TestAssembly"|
-Generated Location: (695:13,37 [17] )
+Generated Location: (808:14,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (74:5,21 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml)
 |1337|
-Generated Location: (1270:26,33 [4] )
+Generated Location: (1414:30,33 [4] )
 |1337|
 
 Source Location: (99:6,19 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml)
 |true|
-Generated Location: (1440:31,19 [4] )
+Generated Location: (1584:35,19 [4] )
 |true|
 
 Source Location: (186:10,11 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes.cshtml)
 |1234|
-Generated Location: (2076:41,33 [4] )
+Generated Location: (2220:45,33 [4] )
 |1234|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.codegen.cs
index b975f6f6ee..9a0be1c8e2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.codegen.cs
@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-content", new global::Microsoft.AspNetCore.Html.HtmlString("hello"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-content", new global::Microsoft.AspNetCore.Html.HtmlString("hello2"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
         private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "password", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
-        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_5 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-content", new global::Microsoft.AspNetCore.Html.HtmlString("blah"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.NoQuotes);
+        private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_5 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-content", new global::Microsoft.AspNetCore.Html.HtmlString("blah"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
         #line hidden
         #pragma warning disable 0169
         private string __tagHelperStringValueBuffer;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.ir.txt
index e6920b3067..b89b1ddb27 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.ir.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.ir.txt
@@ -8,7 +8,7 @@ Document -
             PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_2 - data-content - hello - HtmlAttributeValueStyle.DoubleQuotes
             PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_3 - data-content - hello2 - HtmlAttributeValueStyle.SingleQuotes
             PreallocatedTagHelperPropertyValue -  - __tagHelperAttribute_4 - type - password - HtmlAttributeValueStyle.DoubleQuotes
-            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_5 - data-content - blah - HtmlAttributeValueStyle.NoQuotes
+            PreallocatedTagHelperHtmlAttributeValue -  - __tagHelperAttribute_5 - data-content - blah - HtmlAttributeValueStyle.DoubleQuotes
             DefaultTagHelperRuntime - 
             FieldDeclaration -  - private - global::TestNamespace.PTagHelper - __TestNamespace_PTagHelper
             FieldDeclaration -  - private - global::TestNamespace.InputTagHelper - __TestNamespace_InputTagHelper
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.codegen.cs
index f4215d9483..0ad5da86f6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.codegen.cs
@@ -9,7 +9,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml"
 global::System.Object __typeHelper = "*, TestAssembly";
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.mappings.txt
index 8a511b7839..83a0f021c3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.mappings.txt
@@ -1,6 +1,6 @@
 Source Location: (14:0,14 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |"*, TestAssembly"|
-Generated Location: (516:11,37 [17] )
+Generated Location: (624:12,37 [17] )
 |"*, TestAssembly"|
 
 Source Location: (35:1,2 [59] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
@@ -8,7 +8,7 @@ Source Location: (35:1,2 [59] TestFiles/IntegrationTests/CodeGenerationIntegrati
     var @class = "container-fluid";
     var @int = 1;
 |
-Generated Location: (960:23,2 [59] )
+Generated Location: (1099:27,2 [59] )
 | 
     var @class = "container-fluid";
     var @int = 1;
@@ -16,101 +16,101 @@ Generated Location: (960:23,2 [59] )
 
 Source Location: (122:6,23 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |1337|
-Generated Location: (1286:31,33 [4] )
+Generated Location: (1425:35,33 [4] )
 |1337|
 
 Source Location: (157:7,12 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |@class|
-Generated Location: (1539:37,12 [6] )
+Generated Location: (1678:41,12 [6] )
 |@class|
 
 Source Location: (171:7,26 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |42|
-Generated Location: (1720:42,33 [2] )
+Generated Location: (1859:46,33 [2] )
 |42|
 
 Source Location: (202:8,21 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |42|
-Generated Location: (1992:48,33 [2] )
+Generated Location: (2131:52,33 [2] )
 |42|
 
 Source Location: (204:8,23 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 | +|
-Generated Location: (1994:48,35 [2] )
+Generated Location: (2133:52,35 [2] )
 | +|
 
 Source Location: (206:8,25 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 | |
-Generated Location: (1996:48,37 [1] )
+Generated Location: (2135:52,37 [1] )
 | |
 
 Source Location: (207:8,26 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |@|
-Generated Location: (1997:48,38 [1] )
+Generated Location: (2136:52,38 [1] )
 |@|
 
 Source Location: (208:8,27 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |int|
-Generated Location: (1998:48,39 [3] )
+Generated Location: (2137:52,39 [3] )
 |int|
 
 Source Location: (241:9,22 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |int|
-Generated Location: (2272:54,33 [3] )
+Generated Location: (2411:58,33 [3] )
 |int|
 
 Source Location: (274:10,22 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |(|
-Generated Location: (2546:60,33 [1] )
+Generated Location: (2685:64,33 [1] )
 |(|
 
 Source Location: (275:10,23 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |@int|
-Generated Location: (2547:60,34 [4] )
+Generated Location: (2686:64,34 [4] )
 |@int|
 
 Source Location: (279:10,27 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |)|
-Generated Location: (2551:60,38 [1] )
+Generated Location: (2690:64,38 [1] )
 |)|
 
 Source Location: (307:11,19 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |@class|
-Generated Location: (2809:66,19 [6] )
+Generated Location: (2948:70,19 [6] )
 |@class|
 
 Source Location: (321:11,33 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |4|
-Generated Location: (2991:71,33 [1] )
+Generated Location: (3130:75,33 [1] )
 |4|
 
 Source Location: (322:11,34 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 | *|
-Generated Location: (2992:71,34 [2] )
+Generated Location: (3131:75,34 [2] )
 | *|
 
 Source Location: (324:11,36 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 | |
-Generated Location: (2994:71,36 [1] )
+Generated Location: (3133:75,36 [1] )
 | |
 
 Source Location: (325:11,37 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |@|
-Generated Location: (2995:71,37 [1] )
+Generated Location: (3134:75,37 [1] )
 |@|
 
 Source Location: (326:11,38 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |(|
-Generated Location: (2996:71,38 [1] )
+Generated Location: (3135:75,38 [1] )
 |(|
 
 Source Location: (327:11,39 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |@int + 2|
-Generated Location: (2997:71,39 [8] )
+Generated Location: (3136:75,39 [8] )
 |@int + 2|
 
 Source Location: (335:11,47 [1] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes.cshtml)
 |)|
-Generated Location: (3005:71,47 [1] )
+Generated Location: (3144:75,47 [1] )
 |)|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ComponentIntegrationTest/BasicTest.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ComponentIntegrationTest/BasicTest.codegen.cs
new file mode 100644
index 0000000000..5bb5e8d04d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ComponentIntegrationTest/BasicTest.codegen.cs
@@ -0,0 +1,26 @@
+#pragma checksum "TestFiles/IntegrationTests/ComponentIntegrationTest/BasicTest.razor" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "47f616cdc7ec75674c74246619b0e6118ef227e4"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.BasicTest), @"component.1.0", @"/TestFiles/IntegrationTests/ComponentIntegrationTest/BasicTest.razor")]
+namespace AspNetCore
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"47f616cdc7ec75674c74246619b0e6118ef227e4", @"/TestFiles/IntegrationTests/ComponentIntegrationTest/BasicTest.razor")]
+    public sealed class BasicTest : global::Microsoft.AspNetCore.Components.Component
+    {
+        #pragma warning disable 1998
+        public override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+            base.BuildRenderTree(builder);
+            WriteLiteral("Hello world\r\n<span class=\"content\"></span>\r\n\r\n");
+        }
+        #pragma warning restore 1998
+#line 4 "TestFiles/IntegrationTests/ComponentIntegrationTest/BasicTest.razor"
+            
+    string SomeProperty { get; set; }
+
+#line default
+#line hidden
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ComponentIntegrationTest/BasicTest.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ComponentIntegrationTest/BasicTest.ir.txt
new file mode 100644
index 0000000000..772f3c1327
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ComponentIntegrationTest/BasicTest.ir.txt
@@ -0,0 +1,17 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    NamespaceDeclaration -  - AspNetCore
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public sealed - BasicTest - global::Microsoft.AspNetCore.Components.Component - 
+            MethodDeclaration -  - public override - void - BuildRenderTree
+                CSharpCode - 
+                    IntermediateToken -  - CSharp - base.BuildRenderTree(builder);
+                HtmlContent - (0:0,0 [46] BasicTest.razor)
+                    IntermediateToken - (0:0,0 [13] BasicTest.razor) - Html - Hello world\n
+                    IntermediateToken - (13:1,0 [5] BasicTest.razor) - Html - <span
+                    IntermediateToken - (18:1,5 [16] BasicTest.razor) - Html -  class="content"
+                    IntermediateToken - (34:1,21 [1] BasicTest.razor) - Html - >
+                    IntermediateToken - (35:1,22 [7] BasicTest.razor) - Html - </span>
+                    IntermediateToken - (42:1,29 [4] BasicTest.razor) - Html - \n\n
+            CSharpCode - (58:3,12 [41] BasicTest.razor)
+                IntermediateToken - (58:3,12 [41] BasicTest.razor) - CSharp - \n    string SomeProperty { get; set; }\n
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ComponentIntegrationTest/BasicTest.razor b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ComponentIntegrationTest/BasicTest.razor
new file mode 100644
index 0000000000..39e1e7e80a
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ComponentIntegrationTest/BasicTest.razor
@@ -0,0 +1,6 @@
+Hello world
+<span class="content"></span>
+
+@functions {
+    string SomeProperty { get; set; }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.codegen.cs
index c50a6894ab..12dac56726 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.codegen.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.codegen.cs
@@ -8,7 +8,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
         #pragma warning disable 219
         private void __RazorDirectiveTokenHelpers__() {
         ((System.Action)(() => {
+#line 1 "TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.cshtml"
 global::System.Object __typeHelper = nameof(System.Globalization);
+
+#line default
+#line hidden
         }
         ))();
         }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.mappings.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.mappings.txt
index c0b79c2c79..d292ce87db 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.mappings.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.mappings.txt
@@ -1,5 +1,5 @@
 Source Location: (8:0,8 [20] TestFiles/IntegrationTests/ExtensibleDirectiveTest/NamespaceToken.cshtml)
 |System.Globalization|
-Generated Location: (410:10,44 [20] )
+Generated Location: (494:11,44 [20] )
 |System.Globalization|
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/SuppressPrimaryMethodBodyIntegrationTest/BasicTest.codegen.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/SuppressPrimaryMethodBodyIntegrationTest/BasicTest.codegen.cs
new file mode 100644
index 0000000000..5133c6e91c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/SuppressPrimaryMethodBodyIntegrationTest/BasicTest.codegen.cs
@@ -0,0 +1,28 @@
+#pragma checksum "TestFiles/IntegrationTests/SuppressPrimaryMethodBodyIntegrationTest/BasicTest.razor" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "47f616cdc7ec75674c74246619b0e6118ef227e4"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.BasicTest), @"component.1.0", @"/TestFiles/IntegrationTests/SuppressPrimaryMethodBodyIntegrationTest/BasicTest.razor")]
+#pragma warning disable 0414
+#pragma warning disable 0649
+#pragma warning disable 0169
+
+namespace AspNetCore
+{
+    #line hidden
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"47f616cdc7ec75674c74246619b0e6118ef227e4", @"/TestFiles/IntegrationTests/SuppressPrimaryMethodBodyIntegrationTest/BasicTest.razor")]
+    public sealed class BasicTest : global::Microsoft.AspNetCore.Components.Component
+    {
+        #pragma warning disable 1998
+        public override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder)
+        {
+        }
+        #pragma warning restore 1998
+#line 4 "TestFiles/IntegrationTests/SuppressPrimaryMethodBodyIntegrationTest/BasicTest.razor"
+            
+    string SomeProperty { get; set; }
+
+#line default
+#line hidden
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/SuppressPrimaryMethodBodyIntegrationTest/BasicTest.ir.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/SuppressPrimaryMethodBodyIntegrationTest/BasicTest.ir.txt
new file mode 100644
index 0000000000..d1f6199038
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/SuppressPrimaryMethodBodyIntegrationTest/BasicTest.ir.txt
@@ -0,0 +1,12 @@
+Document - 
+    RazorCompiledItemAttribute - 
+    CSharpCode - 
+        IntermediateToken -  - CSharp - #pragma warning disable 0414\n
+        IntermediateToken -  - CSharp - #pragma warning disable 0649\n
+        IntermediateToken -  - CSharp - #pragma warning disable 0169\n
+    NamespaceDeclaration -  - AspNetCore
+        RazorSourceChecksumAttribute - 
+        ClassDeclaration -  - public sealed - BasicTest - global::Microsoft.AspNetCore.Components.Component - 
+            MethodDeclaration -  - public override - void - BuildRenderTree
+            CSharpCode - (58:3,12 [41] BasicTest.razor)
+                IntermediateToken - (58:3,12 [41] BasicTest.razor) - CSharp - \n    string SomeProperty { get; set; }\n
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/SuppressPrimaryMethodBodyIntegrationTest/BasicTest.razor b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/SuppressPrimaryMethodBodyIntegrationTest/BasicTest.razor
new file mode 100644
index 0000000000..39e1e7e80a
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/SuppressPrimaryMethodBodyIntegrationTest/BasicTest.razor
@@ -0,0 +1,6 @@
+Hello world
+<span class="content"></span>
+
+@functions {
+    string SomeProperty { get; set; }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.stree.txt
index 4d7733a74b..b8015bc064 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.stree.txt
@@ -1,9 +1,15 @@
-Directive block - Gen<Directive:{functions;CodeBlock;Unrestricted} [RZ1006(10:0,10 [1] )]> - 11 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [functions] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[functions];
-    MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (10:0,10) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (11:0,11) - Tokens:1
-        CSharpTokenType.Unknown;[];
+CSharpCodeBlock - [0..11)::11 - [@functions{]
+    RazorDirective - [0..11)::11 - Directive:{functions;CodeBlock;Unrestricted} [RZ1006(10:0,10 [1] )]
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        RazorDirectiveBody - [1..11)::10
+            RazorMetaCode - [1..10)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                Identifier;[functions];
+            CSharpCodeBlock - [10..11)::1
+                RazorMetaCode - [10..11)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                    LeftBrace;[{];
+                CSharpCodeBlock - [11..11)::0
+                    CSharpStatementLiteral - [11..11)::0 - [] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                        Marker;[];
+                RazorMetaCode - [11..11)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                    RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.stree.txt
index 18a654401d..e6bcdf142b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.stree.txt
@@ -1,10 +1,16 @@
-Directive block - Gen<Directive:{functions;CodeBlock;Unrestricted} [RZ1006(10:0,10 [1] )]> - 16 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [functions] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[functions];
-    MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (10:0,10) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [LFfoo] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (11:0,11) - Tokens:2
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Identifier;[foo];
+CSharpCodeBlock - [0..16)::16 - [@functions{LFfoo]
+    RazorDirective - [0..16)::16 - Directive:{functions;CodeBlock;Unrestricted} [RZ1006(10:0,10 [1] )]
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        RazorDirectiveBody - [1..16)::15
+            RazorMetaCode - [1..10)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                Identifier;[functions];
+            CSharpCodeBlock - [10..16)::6
+                RazorMetaCode - [10..11)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                    LeftBrace;[{];
+                CSharpCodeBlock - [11..16)::5
+                    CSharpStatementLiteral - [11..16)::5 - [LFfoo] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                        NewLine;[LF];
+                        Identifier;[foo];
+                RazorMetaCode - [16..16)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                    RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.cspans.txt
index a7489e366c..effd398972 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.cspans.txt
@@ -1,7 +1,7 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [17] )
-Code span at (9:0,9 [6] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [17] )
-Markup span at (15:0,15 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [17] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [17] )
+Code span at (9:0,9 [6] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (15:0,15 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [17] )
 MetaCode span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
 Markup span at (17:0,17 [0] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [0] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.stree.txt
index 25e7638666..c3e53c2bf0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.stree.txt
@@ -1,16 +1,21 @@
-Directive block - Gen<Directive:{section;RazorBlock;Unrestricted} [RZ1006(16:0,16 [1] )]> - 17 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[section];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [Header] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-        CSharpTokenType.Identifier;[Header];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (15:0,15) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (16:0,16) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 0 - (17:0,17)
-        Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-            HtmlTokenType.Unknown;[];
+CSharpCodeBlock - [0..17)::17 - [@section Header {]
+    RazorDirective - [0..17)::17 - Directive:{section;RazorBlock;Unrestricted} [RZ1006(16:0,16 [1] )]
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        RazorDirectiveBody - [1..17)::16
+            RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                Identifier;[section];
+            CSharpCodeBlock - [8..17)::9
+                CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                    Whitespace;[ ];
+                CSharpStatementLiteral - [9..15)::6 - [Header] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                    Identifier;[Header];
+                MarkupTextLiteral - [15..16)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                    Whitespace;[ ];
+                RazorMetaCode - [16..17)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                    LeftBrace;[{];
+                MarkupBlock - [17..17)::0
+                    MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Marker;[];
+                RazorMetaCode - [17..17)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                    RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.cspans.txt
index 94d6f8ac64..51148275b8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.cspans.txt
@@ -1,8 +1,8 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [29] )
-Code span at (9:0,9 [6] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [29] )
-Markup span at (15:0,15 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [29] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [29] )
+Code span at (9:0,9 [6] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [29] )
+Markup span at (15:0,15 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [29] )
 MetaCode span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
 Markup span at (17:0,17 [2] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [12] )
 Markup span at (19:1,0 [3] ) (Accepts:Any) - Parent: Tag block at (19:1,0 [3] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.stree.txt
index cab4006af3..ae4c4c3193 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.stree.txt
@@ -1,29 +1,34 @@
-Directive block - Gen<Directive:{section;RazorBlock;Unrestricted} [RZ1006(16:0,16 [1] )]> - 29 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[section];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [Header] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-        CSharpTokenType.Identifier;[Header];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (15:0,15) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (16:0,16) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 12 - (17:0,17)
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-        Tag block - Gen<None> - 3 - (19:1,0)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (19:1,0) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (22:1,3) - Tokens:1
-            HtmlTokenType.Text;[Foo];
-        Tag block - Gen<None> - 4 - (25:1,6)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (25:1,6) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
+CSharpCodeBlock - [0..29)::29 - [@section Header {LF<p>Foo</p>]
+    RazorDirective - [0..29)::29 - Directive:{section;RazorBlock;Unrestricted} [RZ1006(16:0,16 [1] )]
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        RazorDirectiveBody - [1..29)::28
+            RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                Identifier;[section];
+            CSharpCodeBlock - [8..29)::21
+                CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                    Whitespace;[ ];
+                CSharpStatementLiteral - [9..15)::6 - [Header] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                    Identifier;[Header];
+                MarkupTextLiteral - [15..16)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                    Whitespace;[ ];
+                RazorMetaCode - [16..17)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                    LeftBrace;[{];
+                MarkupBlock - [17..29)::12
+                    MarkupTextLiteral - [17..19)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        NewLine;[LF];
+                    MarkupTagBlock - [19..22)::3 - [<p>]
+                        MarkupTextLiteral - [19..22)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [22..25)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+                    MarkupTagBlock - [25..29)::4 - [</p>]
+                        MarkupTextLiteral - [25..29)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                RazorMetaCode - [29..29)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                    RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.stree.txt
index 5c1bcb1c4a..b3c2a27531 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.stree.txt
@@ -1,7 +1,12 @@
-Statement block - Gen<None> - 2 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (2:0,2) - Tokens:1
-        CSharpTokenType.Unknown;[];
+CSharpCodeBlock - [0..2)::2 - [@{]
+    CSharpStatement - [0..2)::2
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpStatementBody - [1..2)::1
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [2..2)::0
+                CSharpStatementLiteral - [2..2)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                    Marker;[];
+            RazorMetaCode - [2..2)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.stree.txt
index 9be89463a8..85fa027b22 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.stree.txt
@@ -1,21 +1,26 @@
-Statement block - Gen<None> - 11 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (2:0,2) - Tokens:1
-        CSharpTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 7 - (4:1,0)
-        Tag block - Gen<None> - 3 - (4:1,0)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 4 - (7:1,3)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (7:1,3) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (11:1,7) - Tokens:1
-        CSharpTokenType.Unknown;[];
+CSharpCodeBlock - [0..11)::11 - [@{LF<p></p>]
+    CSharpStatement - [0..11)::11
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpStatementBody - [1..11)::10
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [2..11)::9
+                CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                    NewLine;[LF];
+                MarkupBlock - [4..11)::7
+                    MarkupTagBlock - [4..7)::3 - [<p>]
+                        MarkupTextLiteral - [4..7)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTagBlock - [7..11)::4 - [</p>]
+                        MarkupTextLiteral - [7..11)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                CSharpStatementLiteral - [11..11)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Marker;[];
+            RazorMetaCode - [11..11)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/AcceptsElseIfWithNoCondition.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/AcceptsElseIfWithNoCondition.stree.txt
index 7b74209f11..4342976bf7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/AcceptsElseIfWithNoCondition.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/AcceptsElseIfWithNoCondition.stree.txt
@@ -1,60 +1,62 @@
-Statement block - Gen<None> - 106 - (0:0,0)
-    Code span - Gen<Stmt> - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if { foo(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:58
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"foo } bar"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..106)::106 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if { foo(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..106)::106 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"foo } bar"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/AcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/AcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.cspans.txt
index f0caa5ab82..0726da8853 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/AcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/AcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.cspans.txt
@@ -1,4 +1,4 @@
 Code span at (0:0,0 [10] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [17] )
 Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [5] )
-Code span at (11:0,11 [4] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (10:0,10 [5] )
+Code span at (11:0,11 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [5] )
 Code span at (15:0,15 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [17] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/AcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/AcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.stree.txt
index a32c45341c..a4c1262527 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/AcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/AcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.stree.txt
@@ -1,18 +1,23 @@
-Statement block - Gen<None> - 17 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:7
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-    Expression block - Gen<Expr> - 5 - (10:0,10)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [foo.] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (11:0,11) - Tokens:2
-            CSharpTokenType.Identifier;[foo];
-            CSharpTokenType.Dot;[.];
-    Code span - Gen<Stmt> - [ }] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:2
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..17)::17 - [if(foo) { @foo. }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..10)::10 - [if(foo) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+    CSharpCodeBlock - [10..15)::5
+        CSharpImplicitExpression - [10..15)::5
+            CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpImplicitExpressionBody - [11..15)::4
+                CSharpCodeBlock - [11..15)::4
+                    CSharpExpressionLiteral - [11..15)::4 - [foo.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                        Identifier;[foo];
+                        Dot;[.];
+    CSharpStatementLiteral - [15..17)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/AllowsEmptyBlockStatement.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/AllowsEmptyBlockStatement.stree.txt
index 78000ba7a0..3d1e8ad34b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/AllowsEmptyBlockStatement.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/AllowsEmptyBlockStatement.stree.txt
@@ -1,10 +1,12 @@
-Statement block - Gen<None> - 13 - (0:0,0)
-    Code span - Gen<Stmt> - [if(false) { }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:8
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[false];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..13)::13 - [if(false) { }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..13)::13 - [if(false) { }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[false];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBrackets.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBrackets.stree.txt
index e2a2903cf4..a7c7c7baf3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBrackets.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBrackets.stree.txt
@@ -1,19 +1,21 @@
-Statement block - Gen<None> - 47 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) {LF    // bar } " baz 'LF    zoop();LF}] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:17
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Comment;[// bar } " baz '];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[zoop];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..47)::47 - [if(foo) {LF    // bar } " baz 'LF    zoop();LF}]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..47)::47 - [if(foo) {LF    // bar } " baz 'LF    zoop();LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        CSharpComment;[// bar } " baz '];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[zoop];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideBlockComments.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideBlockComments.stree.txt
index f9d3e2b176..435942c4e6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideBlockComments.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideBlockComments.stree.txt
@@ -1,21 +1,23 @@
-Statement block - Gen<None> - 54 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) {LF    /* bar } " */ ' baz } 'LF    zoop();LF}] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:19
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Comment;[/* bar } " */];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.CharacterLiteral;[' baz } '];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[zoop];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..54)::54 - [if(foo) {LF    /* bar } " */ ' baz } 'LF    zoop();LF}]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..54)::54 - [if(foo) {LF    /* bar } " */ ' baz } 'LF    zoop();LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        CSharpComment;[/* bar } " */];
+        Whitespace;[ ];
+        CharacterLiteral;[' baz } '];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[zoop];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CapturesNewlineAfterUsing.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CapturesNewlineAfterUsing.stree.txt
index 4f557730af..ce48e1b53b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CapturesNewlineAfterUsing.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CapturesNewlineAfterUsing.stree.txt
@@ -1,6 +1,10 @@
-Directive block - Gen<None> - 11 - (0:0,0)
-    Code span - Gen<Import: Foo;> - [using FooLF] - SpanEditHandler;Accepts:AnyExceptNewline - (0:0,0) - Tokens:4
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.NewLine;[LF];
+CSharpCodeBlock - [0..11)::11 - [using FooLF]
+    RazorDirective - [0..11)::11
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        RazorDirectiveBody - [0..11)::11
+            CSharpStatementLiteral - [0..11)::11 - [using FooLF] - Gen<Import: Foo;> - SpanEditHandler;Accepts:AnyExceptNewline
+                Keyword;[using];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlock.stree.txt
index b30314d849..5b18684838 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlock.stree.txt
@@ -1,26 +1,28 @@
-Statement block - Gen<None> - 40 - (0:0,0)
-    Code span - Gen<Stmt> - [do { var foo = bar; } while(foo != bar);] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:24
-        CSharpTokenType.Keyword;[do];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[while];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NotEqual;[!=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
+CSharpCodeBlock - [0..40)::40 - [do { var foo = bar; } while(foo != bar);]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..40)::40 - [do { var foo = bar; } while(foo != bar);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[do];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[while];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        NotEqual;[!=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        RightParenthesis;[)];
+        Semicolon;[;];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingSemicolon.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingSemicolon.stree.txt
index ca898906ac..454ba645d4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingSemicolon.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingSemicolon.stree.txt
@@ -1,25 +1,27 @@
-Statement block - Gen<None> - 39 - (0:0,0)
-    Code span - Gen<Stmt> - [do { var foo = bar; } while(foo != bar)] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:23
-        CSharpTokenType.Keyword;[do];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[while];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NotEqual;[!=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..39)::39 - [do { var foo = bar; } while(foo != bar)]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..39)::39 - [do { var foo = bar; } while(foo != bar)] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[do];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[while];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        NotEqual;[!=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileClauseEntirely.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileClauseEntirely.stree.txt
index ba8d12a4e0..9c1ddef84f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileClauseEntirely.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileClauseEntirely.stree.txt
@@ -1,16 +1,18 @@
-Statement block - Gen<None> - 21 - (0:0,0)
-    Code span - Gen<Stmt> - [do { var foo = bar; }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:14
-        CSharpTokenType.Keyword;[do];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..21)::21 - [do { var foo = bar; }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..21)::21 - [do { var foo = bar; }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[do];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileCondition.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileCondition.stree.txt
index f5ab356933..3aa59c8da6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileCondition.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileCondition.stree.txt
@@ -1,18 +1,20 @@
-Statement block - Gen<None> - 27 - (0:0,0)
-    Code span - Gen<Stmt> - [do { var foo = bar; } while] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:16
-        CSharpTokenType.Keyword;[do];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[while];
+CSharpCodeBlock - [0..27)::27 - [do { var foo = bar; } while]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..27)::27 - [do { var foo = bar; } while] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[do];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[while];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon.stree.txt
index e93c870c6f..3e8f224bd0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon.stree.txt
@@ -1,19 +1,21 @@
-Statement block - Gen<None> - 28 - (0:0,0)
-    Code span - Gen<Stmt> - [do { var foo = bar; } while;] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:17
-        CSharpTokenType.Keyword;[do];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[while];
-        CSharpTokenType.Semicolon;[;];
+CSharpCodeBlock - [0..28)::28 - [do { var foo = bar; } while;]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..28)::28 - [do { var foo = bar; } while;] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[do];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[while];
+        Semicolon;[;];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesMarkupInDoWhileBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesMarkupInDoWhileBlock.stree.txt
index ea36eb7e97..8cfa9e2ee1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesMarkupInDoWhileBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesMarkupInDoWhileBlock.stree.txt
@@ -1,50 +1,50 @@
-Statement block - Gen<None> - 58 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [do { var foo = bar;] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:12
-        CSharpTokenType.Keyword;[do];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-    Markup block - Gen<None> - 12 - (20:0,20)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 3 - (21:0,21)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
-            HtmlTokenType.Text;[Foo];
-        Tag block - Gen<None> - 4 - (27:0,27)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Code span - Gen<Stmt> - [foo++; } while (foo<bar>);] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:15
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Increment;[++];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[while];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.GreaterThan;[>];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
+CSharpCodeBlock - [0..58)::58 - [@do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>);]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..20)::19 - [do { var foo = bar;] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[do];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+    MarkupBlock - [20..32)::12
+        MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagBlock - [21..24)::3 - [<p>]
+            MarkupTextLiteral - [21..24)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [24..27)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+        MarkupTagBlock - [27..31)::4 - [</p>]
+            MarkupTextLiteral - [27..31)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+    CSharpStatementLiteral - [32..58)::26 - [foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Identifier;[foo];
+        Increment;[++];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[while];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        LessThan;[<];
+        Identifier;[bar];
+        GreaterThan;[>];
+        RightParenthesis;[)];
+        Semicolon;[;];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/DoesNotAllowMultipleFinallyBlocks.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/DoesNotAllowMultipleFinallyBlocks.stree.txt
index c9a0cb5fa2..cb95bfbf57 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/DoesNotAllowMultipleFinallyBlocks.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/DoesNotAllowMultipleFinallyBlocks.stree.txt
@@ -1,37 +1,39 @@
-Statement block - Gen<None> - 55 - (0:0,0)
-    Code span - Gen<Stmt> - [try { var foo = new { } } finally { var foo = new { } }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:35
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[finally];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..55)::55 - [try { var foo = new { } } finally { var foo = new { } }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..55)::55 - [try { var foo = new { } } finally { var foo = new { } }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[finally];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/DoesNotParseOnSwitchCharacterNotFollowedByOpenAngleOrColon.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/DoesNotParseOnSwitchCharacterNotFollowedByOpenAngleOrColon.stree.txt
index 7eb0dd4ec7..511ac5e905 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/DoesNotParseOnSwitchCharacterNotFollowedByOpenAngleOrColon.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/DoesNotParseOnSwitchCharacterNotFollowedByOpenAngleOrColon.stree.txt
@@ -1,17 +1,19 @@
-Statement block - Gen<None> - 30 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { @"Foo".ToString(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:15
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;[@"Foo"];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[ToString];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..30)::30 - [if(foo) { @"Foo".ToString(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..30)::30 - [if(foo) { @"Foo".ToString(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        StringLiteral;[@"Foo"];
+        Dot;[.];
+        Identifier;[ToString];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/DoesntCaptureWhitespaceAfterUsing.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/DoesntCaptureWhitespaceAfterUsing.stree.txt
index 5c5013b233..bcea8cb110 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/DoesntCaptureWhitespaceAfterUsing.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/DoesntCaptureWhitespaceAfterUsing.stree.txt
@@ -1,5 +1,9 @@
-Directive block - Gen<None> - 9 - (0:0,0)
-    Code span - Gen<Import: Foo;> - [using Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (0:0,0) - Tokens:3
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
+CSharpCodeBlock - [0..9)::9 - [using Foo]
+    RazorDirective - [0..9)::9
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        RazorDirectiveBody - [0..9)::9
+            CSharpStatementLiteral - [0..9)::9 - [using Foo] - Gen<Import: Foo;> - SpanEditHandler;Accepts:AnyExceptNewline
+                Keyword;[using];
+                Whitespace;[ ];
+                Identifier;[Foo];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceAliasMissingSemicolon.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceAliasMissingSemicolon.stree.txt
index ceb649cba3..d118c30b28 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceAliasMissingSemicolon.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceAliasMissingSemicolon.stree.txt
@@ -1,13 +1,17 @@
-Directive block - Gen<None> - 29 - (0:0,0)
-    Code span - Gen<Import: Foo.Bar.Baz = FooBarBaz;> - [using Foo.Bar.Baz = FooBarBaz] - SpanEditHandler;Accepts:AnyExceptNewline - (0:0,0) - Tokens:11
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Baz];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[FooBarBaz];
+CSharpCodeBlock - [0..29)::29 - [using Foo.Bar.Baz = FooBarBaz]
+    RazorDirective - [0..29)::29
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        RazorDirectiveBody - [0..29)::29
+            CSharpStatementLiteral - [0..29)::29 - [using Foo.Bar.Baz = FooBarBaz] - Gen<Import: Foo.Bar.Baz = FooBarBaz;> - SpanEditHandler;Accepts:AnyExceptNewline
+                Keyword;[using];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Dot;[.];
+                Identifier;[Bar];
+                Dot;[.];
+                Identifier;[Baz];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[FooBarBaz];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceImportMissingSemicolon.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceImportMissingSemicolon.stree.txt
index 0e214796db..2218ed9ac2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceImportMissingSemicolon.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/HasErrorsIfNamespaceImportMissingSemicolon.stree.txt
@@ -1,9 +1,13 @@
-Directive block - Gen<None> - 17 - (0:0,0)
-    Code span - Gen<Import: Foo.Bar.Baz;> - [using Foo.Bar.Baz] - SpanEditHandler;Accepts:AnyExceptNewline - (0:0,0) - Tokens:7
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Baz];
+CSharpCodeBlock - [0..17)::17 - [using Foo.Bar.Baz]
+    RazorDirective - [0..17)::17
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        RazorDirectiveBody - [0..17)::17
+            CSharpStatementLiteral - [0..17)::17 - [using Foo.Bar.Baz] - Gen<Import: Foo.Bar.Baz;> - SpanEditHandler;Accepts:AnyExceptNewline
+                Keyword;[using];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Dot;[.];
+                Identifier;[Bar];
+                Dot;[.];
+                Identifier;[Baz];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithAtDoesntCauseError.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithAtDoesntCauseError.stree.txt
index f0d580e422..b46729f160 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithAtDoesntCauseError.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithAtDoesntCauseError.stree.txt
@@ -1,25 +1,27 @@
-Statement block - Gen<None> - 28 - (0:0,0)
-    Code span - Gen<Stmt> - [if (true) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:8
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-    Statement block - Gen<None> - 14 - (12:0,12)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Stmt> - [if(false) { }] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:8
-            CSharpTokenType.Keyword;[if];
-            CSharpTokenType.LeftParenthesis;[(];
-            CSharpTokenType.Keyword;[false];
-            CSharpTokenType.RightParenthesis;[)];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.LeftBrace;[{];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.RightBrace;[}];
-    Code span - Gen<Stmt> - [ }] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:2
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..28)::28 - [if (true) { @if(false) { } }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..12)::12 - [if (true) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+    CSharpCodeBlock - [12..26)::14
+        CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpStatementLiteral - [13..26)::13 - [if(false) { }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+            Keyword;[if];
+            LeftParenthesis;[(];
+            Keyword;[false];
+            RightParenthesis;[)];
+            Whitespace;[ ];
+            LeftBrace;[{];
+            Whitespace;[ ];
+            RightBrace;[}];
+    CSharpStatementLiteral - [26..28)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithCSharpAt.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithCSharpAt.stree.txt
index 80065e6122..f4b22b0722 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithCSharpAt.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithCSharpAt.stree.txt
@@ -1,41 +1,46 @@
-Statement block - Gen<None> - 49 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ if (true) { var val = @x; if (val != 3) { } } ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:35
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Transition;[@];
-        CSharpTokenType.Identifier;[x];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NotEqual;[!=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[3];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (48:0,48) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..49)::49 - [{ if (true) { var val = @x; if (val != 3) { } } }]
+    CSharpStatement - [0..49)::49
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..49)::49
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..48)::47
+                CSharpStatementLiteral - [1..48)::47 - [ if (true) { var val = @x; if (val != 3) { } } ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Whitespace;[ ];
+                    Keyword;[if];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    Keyword;[true];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[val];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Transition;[@];
+                    Identifier;[x];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    Keyword;[if];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    Identifier;[val];
+                    Whitespace;[ ];
+                    NotEqual;[!=];
+                    Whitespace;[ ];
+                    IntegerLiteral;[3];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Whitespace;[ ];
+            RazorMetaCode - [48..49)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.cspans.txt
index 1836f2b2e5..6cca837187 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.cspans.txt
@@ -5,7 +5,7 @@ Markup span at (24:0,24 [1] ) (Accepts:Any) - Parent: Markup block at (24:0,24 [
 Markup span at (25:0,25 [5] ) (Accepts:None) - Parent: Tag block at (25:0,25 [5] )
 Markup span at (30:0,30 [0] ) (Accepts:Any) - Parent: Markup block at (24:0,24 [24] )
 Transition span at (30:0,30 [1] ) (Accepts:None) - Parent: Expression block at (30:0,30 [10] )
-Code span at (31:0,31 [9] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (30:0,30 [10] )
+Code span at (31:0,31 [9] ) (Accepts:NonWhitespace) - Parent: Expression block at (30:0,30 [10] )
 Markup span at (40:0,40 [1] ) (Accepts:Any) - Parent: Markup block at (24:0,24 [24] )
 Markup span at (41:0,41 [6] ) (Accepts:None) - Parent: Tag block at (41:0,41 [6] )
 Markup span at (47:0,47 [1] ) (Accepts:None) - Parent: Markup block at (24:0,24 [24] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt
index 28fa9d02af..93ac739d15 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt
@@ -1,50 +1,55 @@
-Statement block - Gen<None> - 51 - (0:0,0)
-    Code span - Gen<Stmt> - [if (true) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:8
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-    Statement block - Gen<None> - 37 - (12:0,12)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Stmt> - [if(false) {] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:6
-            CSharpTokenType.Keyword;[if];
-            CSharpTokenType.LeftParenthesis;[(];
-            CSharpTokenType.Keyword;[false];
-            CSharpTokenType.RightParenthesis;[)];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 24 - (24:0,24)
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 5 - (25:0,25)
-                Markup span - Gen<Markup> - [<div>] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[div];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:1
-                HtmlTokenType.Unknown;[];
-            Expression block - Gen<Expr> - 10 - (30:0,30)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (30:0,30) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [something] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (31:0,31) - Tokens:1
-                    CSharpTokenType.Identifier;[something];
-            Markup span - Gen<Markup> - [.] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:1
-                HtmlTokenType.Text;[.];
-            Tag block - Gen<None> - 6 - (41:0,41)
-                Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:None - (41:0,41) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[div];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (47:0,47) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-        Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:Any - (48:0,48) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Code span - Gen<Stmt> - [ }] - SpanEditHandler;Accepts:Any - (49:0,49) - Tokens:2
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..51)::51 - [if (true) { @if(false) { <div>@something.</div> } }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..12)::12 - [if (true) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+    CSharpCodeBlock - [12..49)::37
+        CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpStatementLiteral - [13..24)::11 - [if(false) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+            Keyword;[if];
+            LeftParenthesis;[(];
+            Keyword;[false];
+            RightParenthesis;[)];
+            Whitespace;[ ];
+            LeftBrace;[{];
+        MarkupBlock - [24..48)::24
+            MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTagBlock - [25..30)::5 - [<div>]
+                MarkupTextLiteral - [25..30)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Text;[div];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [30..30)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Marker;[];
+            CSharpCodeBlock - [30..40)::10
+                CSharpImplicitExpression - [30..40)::10
+                    CSharpTransition - [30..31)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [31..40)::9
+                        CSharpCodeBlock - [31..40)::9
+                            CSharpExpressionLiteral - [31..40)::9 - [something] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[something];
+            MarkupTextLiteral - [40..41)::1 - [.] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[.];
+            MarkupTagBlock - [41..47)::6 - [</div>]
+                MarkupTextLiteral - [41..47)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [47..48)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                Whitespace;[ ];
+        CSharpStatementLiteral - [48..49)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+            RightBrace;[}];
+    CSharpStatementLiteral - [49..51)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.cspans.txt
index b7f50cae33..be60b063cc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.cspans.txt
@@ -5,7 +5,7 @@ Markup span at (52:1,17 [18] ) (Accepts:Any) - Parent: Markup block at (35:1,0 [
 Markup span at (70:2,16 [4] ) (Accepts:None) - Parent: Tag block at (70:2,16 [4] )
 Markup span at (74:2,20 [0] ) (Accepts:Any) - Parent: Markup block at (35:1,0 [307] )
 Transition span at (74:2,20 [1] ) (Accepts:None) - Parent: Expression block at (74:2,20 [7] )
-Code span at (75:2,21 [6] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (74:2,20 [7] )
+Code span at (75:2,21 [6] ) (Accepts:NonWhitespace) - Parent: Expression block at (74:2,20 [7] )
 Markup span at (81:2,27 [5] ) (Accepts:None) - Parent: Tag block at (81:2,27 [5] )
 Markup span at (86:2,32 [18] ) (Accepts:Any) - Parent: Markup block at (35:1,0 [307] )
 Markup span at (104:3,16 [4] ) (Accepts:None) - Parent: Tag block at (104:3,16 [4] )
@@ -18,12 +18,12 @@ Markup span at (187:5,24 [4] ) (Accepts:None) - Parent: Tag block at (187:5,24 [
 Markup span at (191:5,28 [2] ) (Accepts:Any) - Parent: Tag block at (191:5,28 [67] )
 Markup span at (193:5,30 [7] ) (Accepts:Any) - Parent: Markup block at (193:5,30 [64] )
 Transition span at (200:5,37 [1] ) (Accepts:None) - Parent: Expression block at (200:5,37 [56] )
-Code span at (201:5,38 [55] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (200:5,37 [56] )
+Code span at (201:5,38 [55] ) (Accepts:NonWhitespace) - Parent: Expression block at (200:5,37 [56] )
 Markup span at (256:5,93 [1] ) (Accepts:Any) - Parent: Markup block at (193:5,30 [64] )
 Markup span at (257:5,94 [1] ) (Accepts:None) - Parent: Tag block at (191:5,28 [67] )
 Markup span at (258:5,95 [0] ) (Accepts:Any) - Parent: Markup block at (163:5,0 [113] )
 Transition span at (258:5,95 [1] ) (Accepts:None) - Parent: Expression block at (258:5,95 [7] )
-Code span at (259:5,96 [6] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (258:5,95 [7] )
+Code span at (259:5,96 [6] ) (Accepts:NonWhitespace) - Parent: Expression block at (258:5,95 [7] )
 Markup span at (265:5,102 [4] ) (Accepts:None) - Parent: Tag block at (265:5,102 [4] )
 Markup span at (269:5,106 [5] ) (Accepts:None) - Parent: Tag block at (269:5,106 [5] )
 Markup span at (274:5,111 [2] ) (Accepts:None) - Parent: Markup block at (163:5,0 [113] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.stree.txt
index 13ca10275e..e37aa10fd3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.stree.txt
@@ -1,179 +1,194 @@
-Statement block - Gen<None> - 351 - (0:0,0)
-    Code span - Gen<Stmt> - [foreach(var c in db.Categories) {LF] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:15
-        CSharpTokenType.Keyword;[foreach];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[c];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[in];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[db];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Categories];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 307 - (35:1,0)
-        Markup span - Gen<Markup> - [            ] - SpanEditHandler;Accepts:Any - (35:1,0) - Tokens:1
-            HtmlTokenType.WhiteSpace;[            ];
-        Tag block - Gen<None> - 5 - (47:1,12)
-            Markup span - Gen<Markup> - [<div>] - SpanEditHandler;Accepts:None - (47:1,12) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[div];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF                ] - SpanEditHandler;Accepts:Any - (52:1,17) - Tokens:2
-            HtmlTokenType.NewLine;[LF];
-            HtmlTokenType.WhiteSpace;[                ];
-        Tag block - Gen<None> - 4 - (70:2,16)
-            Markup span - Gen<Markup> - [<h1>] - SpanEditHandler;Accepts:None - (70:2,16) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[h1];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (74:2,20) - Tokens:1
-            HtmlTokenType.Unknown;[];
-        Expression block - Gen<Expr> - 7 - (74:2,20)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (74:2,20) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Expr> - [c.Name] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (75:2,21) - Tokens:3
-                CSharpTokenType.Identifier;[c];
-                CSharpTokenType.Dot;[.];
-                CSharpTokenType.Identifier;[Name];
-        Tag block - Gen<None> - 5 - (81:2,27)
-            Markup span - Gen<Markup> - [</h1>] - SpanEditHandler;Accepts:None - (81:2,27) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[h1];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF                ] - SpanEditHandler;Accepts:Any - (86:2,32) - Tokens:2
-            HtmlTokenType.NewLine;[LF];
-            HtmlTokenType.WhiteSpace;[                ];
-        Tag block - Gen<None> - 4 - (104:3,16)
-            Markup span - Gen<Markup> - [<ul>] - SpanEditHandler;Accepts:None - (104:3,16) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[ul];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (108:3,20) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-        Statement block - Gen<None> - 189 - (110:4,0)
-            Code span - Gen<Stmt> - [                    ] - SpanEditHandler;Accepts:Any - (110:4,0) - Tokens:1
-                CSharpTokenType.WhiteSpace;[                    ];
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (130:4,20) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Stmt> - [foreach(var p in c.Products) {LF] - SpanEditHandler;Accepts:Any - (131:4,21) - Tokens:15
-                CSharpTokenType.Keyword;[foreach];
-                CSharpTokenType.LeftParenthesis;[(];
-                CSharpTokenType.Identifier;[var];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[p];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Keyword;[in];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[c];
-                CSharpTokenType.Dot;[.];
-                CSharpTokenType.Identifier;[Products];
-                CSharpTokenType.RightParenthesis;[)];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.LeftBrace;[{];
-                CSharpTokenType.NewLine;[LF];
-            Markup block - Gen<None> - 113 - (163:5,0)
-                Markup span - Gen<Markup> - [                        ] - SpanEditHandler;Accepts:Any - (163:5,0) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[                        ];
-                Tag block - Gen<None> - 4 - (187:5,24)
-                    Markup span - Gen<Markup> - [<li>] - SpanEditHandler;Accepts:None - (187:5,24) - Tokens:3
-                        HtmlTokenType.OpenAngle;[<];
-                        HtmlTokenType.Text;[li];
-                        HtmlTokenType.CloseAngle;[>];
-                Tag block - Gen<None> - 67 - (191:5,28)
-                    Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (191:5,28) - Tokens:2
-                        HtmlTokenType.OpenAngle;[<];
-                        HtmlTokenType.Text;[a];
-                    Markup block - Gen<Attr:href, href="@(193:5,30),"@(256:5,93)> - 64 - (193:5,30)
-                        Markup span - Gen<None> - [ href="] - SpanEditHandler;Accepts:Any - (193:5,30) - Tokens:4
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Text;[href];
-                            HtmlTokenType.Equals;[=];
-                            HtmlTokenType.DoubleQuote;["];
-                        Markup block - Gen<DynAttr:@(200:5,37)> - 56 - (200:5,37)
-                            Expression block - Gen<Expr> - 56 - (200:5,37)
-                                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (200:5,37) - Tokens:1
-                                    CSharpTokenType.Transition;[@];
-                                Code span - Gen<Expr> - [Html.ActionUrl("Products", "Detail", new { id = p.Id })] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (201:5,38) - Tokens:24
-                                    CSharpTokenType.Identifier;[Html];
-                                    CSharpTokenType.Dot;[.];
-                                    CSharpTokenType.Identifier;[ActionUrl];
-                                    CSharpTokenType.LeftParenthesis;[(];
-                                    CSharpTokenType.StringLiteral;["Products"];
-                                    CSharpTokenType.Comma;[,];
-                                    CSharpTokenType.WhiteSpace;[ ];
-                                    CSharpTokenType.StringLiteral;["Detail"];
-                                    CSharpTokenType.Comma;[,];
-                                    CSharpTokenType.WhiteSpace;[ ];
-                                    CSharpTokenType.Keyword;[new];
-                                    CSharpTokenType.WhiteSpace;[ ];
-                                    CSharpTokenType.LeftBrace;[{];
-                                    CSharpTokenType.WhiteSpace;[ ];
-                                    CSharpTokenType.Identifier;[id];
-                                    CSharpTokenType.WhiteSpace;[ ];
-                                    CSharpTokenType.Assign;[=];
-                                    CSharpTokenType.WhiteSpace;[ ];
-                                    CSharpTokenType.Identifier;[p];
-                                    CSharpTokenType.Dot;[.];
-                                    CSharpTokenType.Identifier;[Id];
-                                    CSharpTokenType.WhiteSpace;[ ];
-                                    CSharpTokenType.RightBrace;[}];
-                                    CSharpTokenType.RightParenthesis;[)];
-                        Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (256:5,93) - Tokens:1
-                            HtmlTokenType.DoubleQuote;["];
-                    Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (257:5,94) - Tokens:1
-                        HtmlTokenType.CloseAngle;[>];
-                Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (258:5,95) - Tokens:1
-                    HtmlTokenType.Unknown;[];
-                Expression block - Gen<Expr> - 7 - (258:5,95)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (258:5,95) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [p.Name] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (259:5,96) - Tokens:3
-                        CSharpTokenType.Identifier;[p];
-                        CSharpTokenType.Dot;[.];
-                        CSharpTokenType.Identifier;[Name];
-                Tag block - Gen<None> - 4 - (265:5,102)
-                    Markup span - Gen<Markup> - [</a>] - SpanEditHandler;Accepts:None - (265:5,102) - Tokens:4
-                        HtmlTokenType.OpenAngle;[<];
-                        HtmlTokenType.ForwardSlash;[/];
-                        HtmlTokenType.Text;[a];
-                        HtmlTokenType.CloseAngle;[>];
-                Tag block - Gen<None> - 5 - (269:5,106)
-                    Markup span - Gen<Markup> - [</li>] - SpanEditHandler;Accepts:None - (269:5,106) - Tokens:4
-                        HtmlTokenType.OpenAngle;[<];
-                        HtmlTokenType.ForwardSlash;[/];
-                        HtmlTokenType.Text;[li];
-                        HtmlTokenType.CloseAngle;[>];
-                Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (274:5,111) - Tokens:1
-                    HtmlTokenType.NewLine;[LF];
-            Code span - Gen<Stmt> - [                    }LF] - SpanEditHandler;Accepts:None - (276:6,0) - Tokens:3
-                CSharpTokenType.WhiteSpace;[                    ];
-                CSharpTokenType.RightBrace;[}];
-                CSharpTokenType.NewLine;[LF];
-        Markup span - Gen<Markup> - [                ] - SpanEditHandler;Accepts:Any - (299:7,0) - Tokens:1
-            HtmlTokenType.WhiteSpace;[                ];
-        Tag block - Gen<None> - 5 - (315:7,16)
-            Markup span - Gen<Markup> - [</ul>] - SpanEditHandler;Accepts:None - (315:7,16) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[ul];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF            ] - SpanEditHandler;Accepts:Any - (320:7,21) - Tokens:2
-            HtmlTokenType.NewLine;[LF];
-            HtmlTokenType.WhiteSpace;[            ];
-        Tag block - Gen<None> - 6 - (334:8,12)
-            Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:None - (334:8,12) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[div];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (340:8,18) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [        }] - SpanEditHandler;Accepts:None - (342:9,0) - Tokens:2
-        CSharpTokenType.WhiteSpace;[        ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..351)::351 - [foreach(var c in db.Categories) {LF            <div>LF                <h1>@c.Name</h1>LF                <ul>LF                    @foreach(var p in c.Products) {LF                        <li><a href="@Html.ActionUrl("Products", "Detail", new { id = p.Id })">@p.Name</a></li>LF                    }LF                </ul>LF            </div>LF        }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..35)::35 - [foreach(var c in db.Categories) {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[foreach];
+        LeftParenthesis;[(];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[c];
+        Whitespace;[ ];
+        Keyword;[in];
+        Whitespace;[ ];
+        Identifier;[db];
+        Dot;[.];
+        Identifier;[Categories];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+    MarkupBlock - [35..342)::307
+        MarkupTextLiteral - [35..47)::12 - [            ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[            ];
+        MarkupTagBlock - [47..52)::5 - [<div>]
+            MarkupTextLiteral - [47..52)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [52..70)::18 - [LF                ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+            Whitespace;[                ];
+        MarkupTagBlock - [70..74)::4 - [<h1>]
+            MarkupTextLiteral - [70..74)::4 - [<h1>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[h1];
+                CloseAngle;[>];
+        MarkupTextLiteral - [74..74)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [74..81)::7
+            CSharpImplicitExpression - [74..81)::7
+                CSharpTransition - [74..75)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [75..81)::6
+                    CSharpCodeBlock - [75..81)::6
+                        CSharpExpressionLiteral - [75..81)::6 - [c.Name] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[c];
+                            Dot;[.];
+                            Identifier;[Name];
+        MarkupTagBlock - [81..86)::5 - [</h1>]
+            MarkupTextLiteral - [81..86)::5 - [</h1>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[h1];
+                CloseAngle;[>];
+        MarkupTextLiteral - [86..104)::18 - [LF                ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+            Whitespace;[                ];
+        MarkupTagBlock - [104..108)::4 - [<ul>]
+            MarkupTextLiteral - [104..108)::4 - [<ul>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[ul];
+                CloseAngle;[>];
+        MarkupTextLiteral - [108..110)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [110..299)::189
+            CSharpStatementLiteral - [110..130)::20 - [                    ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[                    ];
+            CSharpTransition - [130..131)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [131..163)::32 - [foreach(var p in c.Products) {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[foreach];
+                LeftParenthesis;[(];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[p];
+                Whitespace;[ ];
+                Keyword;[in];
+                Whitespace;[ ];
+                Identifier;[c];
+                Dot;[.];
+                Identifier;[Products];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+            MarkupBlock - [163..276)::113
+                MarkupTextLiteral - [163..187)::24 - [                        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[                        ];
+                MarkupTagBlock - [187..191)::4 - [<li>]
+                    MarkupTextLiteral - [187..191)::4 - [<li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[li];
+                        CloseAngle;[>];
+                MarkupTagBlock - [191..258)::67 - [<a href="@Html.ActionUrl("Products", "Detail", new { id = p.Id })">]
+                    MarkupTextLiteral - [191..193)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[a];
+                    MarkupAttributeBlock - [193..257)::64 - [ href="@Html.ActionUrl("Products", "Detail", new { id = p.Id })"]
+                        MarkupTextLiteral - [193..194)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [194..198)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[href];
+                        Equals;[=];
+                        MarkupTextLiteral - [199..200)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        GenericBlock - [200..256)::56
+                            MarkupDynamicAttributeValue - [200..256)::56 - [@Html.ActionUrl("Products", "Detail", new { id = p.Id })]
+                                GenericBlock - [200..256)::56
+                                    CSharpCodeBlock - [200..256)::56
+                                        CSharpImplicitExpression - [200..256)::56
+                                            CSharpTransition - [200..201)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [201..256)::55
+                                                CSharpCodeBlock - [201..256)::55
+                                                    CSharpExpressionLiteral - [201..256)::55 - [Html.ActionUrl("Products", "Detail", new { id = p.Id })] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                        Identifier;[Html];
+                                                        Dot;[.];
+                                                        Identifier;[ActionUrl];
+                                                        LeftParenthesis;[(];
+                                                        StringLiteral;["Products"];
+                                                        Comma;[,];
+                                                        Whitespace;[ ];
+                                                        StringLiteral;["Detail"];
+                                                        Comma;[,];
+                                                        Whitespace;[ ];
+                                                        Keyword;[new];
+                                                        Whitespace;[ ];
+                                                        LeftBrace;[{];
+                                                        Whitespace;[ ];
+                                                        Identifier;[id];
+                                                        Whitespace;[ ];
+                                                        Assign;[=];
+                                                        Whitespace;[ ];
+                                                        Identifier;[p];
+                                                        Dot;[.];
+                                                        Identifier;[Id];
+                                                        Whitespace;[ ];
+                                                        RightBrace;[}];
+                                                        RightParenthesis;[)];
+                        MarkupTextLiteral - [256..257)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    MarkupTextLiteral - [257..258)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        CloseAngle;[>];
+                MarkupTextLiteral - [258..258)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Marker;[];
+                CSharpCodeBlock - [258..265)::7
+                    CSharpImplicitExpression - [258..265)::7
+                        CSharpTransition - [258..259)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [259..265)::6
+                            CSharpCodeBlock - [259..265)::6
+                                CSharpExpressionLiteral - [259..265)::6 - [p.Name] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                    Identifier;[p];
+                                    Dot;[.];
+                                    Identifier;[Name];
+                MarkupTagBlock - [265..269)::4 - [</a>]
+                    MarkupTextLiteral - [265..269)::4 - [</a>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[a];
+                        CloseAngle;[>];
+                MarkupTagBlock - [269..274)::5 - [</li>]
+                    MarkupTextLiteral - [269..274)::5 - [</li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[li];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [274..276)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    NewLine;[LF];
+            CSharpStatementLiteral - [276..299)::23 - [                    }LF] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Whitespace;[                    ];
+                RightBrace;[}];
+                NewLine;[LF];
+        MarkupTextLiteral - [299..315)::16 - [                ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[                ];
+        MarkupTagBlock - [315..320)::5 - [</ul>]
+            MarkupTextLiteral - [315..320)::5 - [</ul>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[ul];
+                CloseAngle;[>];
+        MarkupTextLiteral - [320..334)::14 - [LF            ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+            Whitespace;[            ];
+        MarkupTagBlock - [334..340)::6 - [</div>]
+            MarkupTextLiteral - [334..340)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [340..342)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+            NewLine;[LF];
+    CSharpStatementLiteral - [342..351)::9 - [        }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Whitespace;[        ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesElseIfBranchesOfIfStatement.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesElseIfBranchesOfIfStatement.stree.txt
index 5563401047..874dd8d640 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesElseIfBranchesOfIfStatement.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesElseIfBranchesOfIfStatement.stree.txt
@@ -1,95 +1,97 @@
-Statement block - Gen<None> - 180 - (0:0,0)
-    Code span - Gen<Stmt> - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF}] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:93
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"foo } bar"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"bar } baz"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..180)::180 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF}]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..180)::180 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"foo } bar"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"bar } baz"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.cspans.txt
index 2295e35eba..23578b778f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.cspans.txt
@@ -1,4 +1,4 @@
 Code span at (0:0,0 [10] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] )
 Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [13] )
-Code span at (11:0,11 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (10:0,10 [13] )
+Code span at (11:0,11 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [13] )
 Code span at (23:0,23 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.stree.txt
index 45b2fc09d2..ec306314dd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.stree.txt
@@ -1,24 +1,29 @@
-Statement block - Gen<None> - 25 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:7
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-    Expression block - Gen<Expr> - 13 - (10:0,10)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [foo[4].bar()] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (11:0,11) - Tokens:8
-            CSharpTokenType.Identifier;[foo];
-            CSharpTokenType.LeftBracket;[[];
-            CSharpTokenType.IntegerLiteral;[4];
-            CSharpTokenType.RightBracket;[]];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[bar];
-            CSharpTokenType.LeftParenthesis;[(];
-            CSharpTokenType.RightParenthesis;[)];
-    Code span - Gen<Stmt> - [ }] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:2
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..25)::25 - [if(foo) { @foo[4].bar() }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..10)::10 - [if(foo) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+    CSharpCodeBlock - [10..23)::13
+        CSharpImplicitExpression - [10..23)::13
+            CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpImplicitExpressionBody - [11..23)::12
+                CSharpCodeBlock - [11..23)::12
+                    CSharpExpressionLiteral - [11..23)::12 - [foo[4].bar()] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                        Identifier;[foo];
+                        LeftBracket;[[];
+                        IntegerLiteral;[4];
+                        RightBracket;[]];
+                        Dot;[.];
+                        Identifier;[bar];
+                        LeftParenthesis;[(];
+                        RightParenthesis;[)];
+    CSharpStatementLiteral - [23..25)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByOpenParen.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByOpenParen.stree.txt
index 09618cf66e..7a4de524bf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByOpenParen.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesExpressionOnSwitchCharacterFollowedByOpenParen.stree.txt
@@ -1,25 +1,30 @@
-Statement block - Gen<None> - 24 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:7
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-    Expression block - Gen<Expr> - 12 - (10:0,10)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (11:0,11) - Tokens:1
-            CSharpTokenType.LeftParenthesis;[(];
-        Code span - Gen<Expr> - [foo + bar] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:5
-            CSharpTokenType.Identifier;[foo];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Plus;[+];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[bar];
-        MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-            CSharpTokenType.RightParenthesis;[)];
-    Code span - Gen<Stmt> - [ }] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:2
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..24)::24 - [if(foo) { @(foo + bar) }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..10)::10 - [if(foo) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+    CSharpCodeBlock - [10..22)::12
+        CSharpExplicitExpression - [10..22)::12
+            CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpExplicitExpressionBody - [11..22)::11
+                RazorMetaCode - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    LeftParenthesis;[(];
+                CSharpCodeBlock - [12..21)::9
+                    CSharpExpressionLiteral - [12..21)::9 - [foo + bar] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                        Identifier;[foo];
+                        Whitespace;[ ];
+                        Plus;[+];
+                        Whitespace;[ ];
+                        Identifier;[bar];
+                RazorMetaCode - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    RightParenthesis;[)];
+    CSharpStatementLiteral - [22..24)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatement.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatement.stree.txt
index 05d2542f80..752dcb2972 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatement.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatement.stree.txt
@@ -1,239 +1,241 @@
-Statement block - Gen<None> - 459 - (0:0,0)
-    Code span - Gen<Stmt> - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF}] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:237
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"foo } bar"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"bar } baz"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"bar } baz"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"bar } baz"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"bar } baz"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..459)::459 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF}]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..459)::459 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"foo } bar"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"bar } baz"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"bar } baz"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"bar } baz"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"bar } baz"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch.stree.txt
index 766f7e4ddd..7fb831fefc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch.stree.txt
@@ -1,157 +1,159 @@
-Statement block - Gen<None> - 313 - (0:0,0)
-    Code span - Gen<Stmt> - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else { Debug.WriteLine(@"bar } baz"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:155
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"foo } bar"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"bar } baz"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"bar } baz"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"bar } baz"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..313)::313 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else { Debug.WriteLine(@"bar } baz"); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..313)::313 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else { Debug.WriteLine(@"bar } baz"); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"foo } bar"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"bar } baz"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"bar } baz"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"bar } baz"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat.stree.txt
index 9b0810ec74..103ef0ce0b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat.stree.txt
@@ -1,10 +1,14 @@
-Directive block - Gen<None> - 28 - (0:0,0)
-    Code span - Gen<Import: FooBarBaz = FooBarBaz;> - [using FooBarBaz = FooBarBaz;] - SpanEditHandler;Accepts:AnyExceptNewline - (0:0,0) - Tokens:8
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[FooBarBaz];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[FooBarBaz];
-        CSharpTokenType.Semicolon;[;];
+CSharpCodeBlock - [0..28)::28 - [using FooBarBaz = FooBarBaz;]
+    RazorDirective - [0..28)::28
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        RazorDirectiveBody - [0..28)::28
+            CSharpStatementLiteral - [0..28)::28 - [using FooBarBaz = FooBarBaz;] - Gen<Import: FooBarBaz = FooBarBaz;> - SpanEditHandler;Accepts:AnyExceptNewline
+                Keyword;[using];
+                Whitespace;[ ];
+                Identifier;[FooBarBaz];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[FooBarBaz];
+                Semicolon;[;];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat.stree.txt
index d9f8d37923..1884354be0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat.stree.txt
@@ -1,10 +1,14 @@
-Directive block - Gen<None> - 18 - (0:0,0)
-    Code span - Gen<Import: Foo.Bar.Baz;> - [using Foo.Bar.Baz;] - SpanEditHandler;Accepts:AnyExceptNewline - (0:0,0) - Tokens:8
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Baz];
-        CSharpTokenType.Semicolon;[;];
+CSharpCodeBlock - [0..18)::18 - [using Foo.Bar.Baz;]
+    RazorDirective - [0..18)::18
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        RazorDirectiveBody - [0..18)::18
+            CSharpStatementLiteral - [0..18)::18 - [using Foo.Bar.Baz;] - Gen<Import: Foo.Bar.Baz;> - SpanEditHandler;Accepts:AnyExceptNewline
+                Keyword;[using];
+                Whitespace;[ ];
+                Identifier;[Foo];
+                Dot;[.];
+                Identifier;[Bar];
+                Dot;[.];
+                Identifier;[Baz];
+                Semicolon;[;];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForKeyword.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForKeyword.stree.txt
index c19dcce9b3..5e4de13330 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForKeyword.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForKeyword.stree.txt
@@ -1,46 +1,48 @@
-Statement block - Gen<None> - 82 - (0:0,0)
-    Code span - Gen<Stmt> - [for(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:44
-        CSharpTokenType.Keyword;[for];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"foo } bar"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..82)::82 - [for(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..82)::82 - [for(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[for];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"foo } bar"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForeachKeyword.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForeachKeyword.stree.txt
index 8e095ff484..7bed8c30f3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForeachKeyword.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsForeachKeyword.stree.txt
@@ -1,46 +1,48 @@
-Statement block - Gen<None> - 86 - (0:0,0)
-    Code span - Gen<Stmt> - [foreach(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:44
-        CSharpTokenType.Keyword;[foreach];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"foo } bar"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..86)::86 - [foreach(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..86)::86 - [foreach(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[foreach];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"foo } bar"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches.stree.txt
index bb4eee2f14..f7f1f67c9b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches.stree.txt
@@ -1,46 +1,48 @@
-Statement block - Gen<None> - 81 - (0:0,0)
-    Code span - Gen<Stmt> - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:44
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"foo } bar"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..81)::81 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..81)::81 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"foo } bar"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsSwitchKeyword.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsSwitchKeyword.stree.txt
index f0e5015b28..46890c7936 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsSwitchKeyword.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsSwitchKeyword.stree.txt
@@ -1,54 +1,56 @@
-Statement block - Gen<None> - 161 - (0:0,0)
-    Code span - Gen<Stmt> - [switch(foo) {LF    case 0:LF        break;LF    case 1:LF        {LF            break;LF        }LF    case 2:LF        return;LF    default:LF        return;LF}] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:52
-        CSharpTokenType.Keyword;[switch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Keyword;[case];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Colon;[:];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[        ];
-        CSharpTokenType.Keyword;[break];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Keyword;[case];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[1];
-        CSharpTokenType.Colon;[:];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[        ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[            ];
-        CSharpTokenType.Keyword;[break];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[        ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Keyword;[case];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[2];
-        CSharpTokenType.Colon;[:];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[        ];
-        CSharpTokenType.Keyword;[return];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Keyword;[default];
-        CSharpTokenType.Colon;[:];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[        ];
-        CSharpTokenType.Keyword;[return];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..161)::161 - [switch(foo) {LF    case 0:LF        break;LF    case 1:LF        {LF            break;LF        }LF    case 2:LF        return;LF    default:LF        return;LF}]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..161)::161 - [switch(foo) {LF    case 0:LF        break;LF    case 1:LF        {LF            break;LF        }LF    case 2:LF        return;LF    default:LF        return;LF}] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[switch];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Keyword;[case];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Colon;[:];
+        NewLine;[LF];
+        Whitespace;[        ];
+        Keyword;[break];
+        Semicolon;[;];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Keyword;[case];
+        Whitespace;[ ];
+        IntegerLiteral;[1];
+        Colon;[:];
+        NewLine;[LF];
+        Whitespace;[        ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[            ];
+        Keyword;[break];
+        Semicolon;[;];
+        NewLine;[LF];
+        Whitespace;[        ];
+        RightBrace;[}];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Keyword;[case];
+        Whitespace;[ ];
+        IntegerLiteral;[2];
+        Colon;[:];
+        NewLine;[LF];
+        Whitespace;[        ];
+        Keyword;[return];
+        Semicolon;[;];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Keyword;[default];
+        Colon;[:];
+        NewLine;[LF];
+        Whitespace;[        ];
+        Keyword;[return];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsWhileKeyword.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsWhileKeyword.stree.txt
index 261becea48..2bb6e1023f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsWhileKeyword.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesBracesIfFirstIdentifierIsWhileKeyword.stree.txt
@@ -1,46 +1,48 @@
-Statement block - Gen<None> - 84 - (0:0,0)
-    Code span - Gen<Stmt> - [while(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:44
-        CSharpTokenType.Keyword;[while];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"foo } bar"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..84)::84 - [while(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..84)::84 - [while(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[while];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"foo } bar"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesIfFirstIdentifierIsUsingFollowedByParen.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesIfFirstIdentifierIsUsingFollowedByParen.stree.txt
index aaabf8bbd5..2a7208cd42 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesIfFirstIdentifierIsUsingFollowedByParen.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SkipsExprThenBalancesIfFirstIdentifierIsUsingFollowedByParen.stree.txt
@@ -1,46 +1,48 @@
-Statement block - Gen<None> - 84 - (0:0,0)
-    Code span - Gen<Stmt> - [using(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:44
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"foo } bar"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..84)::84 - [using(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..84)::84 - [using(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[using];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"foo } bar"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCatchClausesAfterFinallyBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCatchClausesAfterFinallyBlock.stree.txt
index c9a0cb5fa2..cb95bfbf57 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCatchClausesAfterFinallyBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCatchClausesAfterFinallyBlock.stree.txt
@@ -1,37 +1,39 @@
-Statement block - Gen<None> - 55 - (0:0,0)
-    Code span - Gen<Stmt> - [try { var foo = new { } } finally { var foo = new { } }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:35
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[finally];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..55)::55 - [try { var foo = new { } } finally { var foo = new { } }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..55)::55 - [try { var foo = new { } } finally { var foo = new { } }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[finally];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCodeAfterElseBranch.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCodeAfterElseBranch.stree.txt
index 8aea7b10e3..6f62c1d228 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCodeAfterElseBranch.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingCodeAfterElseBranch.stree.txt
@@ -1,109 +1,111 @@
-Statement block - Gen<None> - 220 - (0:0,0)
-    Code span - Gen<Stmt> - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else { Debug.WriteLine(@"bar } baz"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:107
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"foo } bar"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"bar } baz"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"bar } baz"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..220)::220 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else { Debug.WriteLine(@"bar } baz"); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..220)::220 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"bar } baz");LF} else { Debug.WriteLine(@"bar } baz"); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"foo } bar"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"bar } baz"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"bar } baz"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingIfIfStatementNotFollowedByElse.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingIfIfStatementNotFollowedByElse.stree.txt
index a6fde6d036..87799cf41a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingIfIfStatementNotFollowedByElse.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/StopsParsingIfIfStatementNotFollowedByElse.stree.txt
@@ -1,47 +1,49 @@
-Statement block - Gen<None> - 87 - (0:0,0)
-    Code span - Gen<Stmt> - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF}] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:45
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"foo } bar"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..87)::87 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF}]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..87)::87 - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF    Debug.WriteLine(@"foo } bar");LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"foo } bar"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenCatchAndFinallyClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenCatchAndFinallyClause.stree.txt
index 4dd24cad32..fed923fc3a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenCatchAndFinallyClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenCatchAndFinallyClause.stree.txt
@@ -1,41 +1,43 @@
-Statement block - Gen<None> - 75 - (0:0,0)
-    Code span - Gen<Stmt> - [try { bar(); } catch(bar) { baz(); } /* Foo */ /* Bar */ finally { biz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:39
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Comment;[/* Foo */];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Comment;[/* Bar */];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[finally];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[biz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..75)::75 - [try { bar(); } catch(bar) { baz(); } /* Foo */ /* Bar */ finally { biz(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..75)::75 - [try { bar(); } catch(bar) { baz(); } /* Foo */ /* Bar */ finally { biz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[bar];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        CSharpComment;[/* Foo */];
+        Whitespace;[ ];
+        CSharpComment;[/* Bar */];
+        Whitespace;[ ];
+        Keyword;[finally];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[biz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenDoAndWhileClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenDoAndWhileClause.stree.txt
index 89aeaa49b0..3388a65567 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenDoAndWhileClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenDoAndWhileClause.stree.txt
@@ -1,26 +1,28 @@
-Statement block - Gen<None> - 54 - (0:0,0)
-    Code span - Gen<Stmt> - [do { var foo = bar; } /* Foo */ /* Bar */ while(true);] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:24
-        CSharpTokenType.Keyword;[do];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Comment;[/* Foo */];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Comment;[/* Bar */];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[while];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
+CSharpCodeBlock - [0..54)::54 - [do { var foo = bar; } /* Foo */ /* Bar */ while(true);]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..54)::54 - [do { var foo = bar; } /* Foo */ /* Bar */ while(true);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[do];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        CSharpComment;[/* Foo */];
+        Whitespace;[ ];
+        CSharpComment;[/* Bar */];
+        Whitespace;[ ];
+        Keyword;[while];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Semicolon;[;];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenElseIfAndElseClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenElseIfAndElseClause.stree.txt
index 8beb9c4062..6bc688a451 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenElseIfAndElseClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenElseIfAndElseClause.stree.txt
@@ -1,46 +1,48 @@
-Statement block - Gen<None> - 78 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { bar(); } else if(bar) { baz(); } /* Foo */ /* Bar */ else { biz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:44
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Comment;[/* Foo */];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Comment;[/* Bar */];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[biz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..78)::78 - [if(foo) { bar(); } else if(bar) { baz(); } /* Foo */ /* Bar */ else { biz(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..78)::78 - [if(foo) { bar(); } else if(bar) { baz(); } /* Foo */ /* Bar */ else { biz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[bar];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        CSharpComment;[/* Foo */];
+        Whitespace;[ ];
+        CSharpComment;[/* Bar */];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[biz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseClause.stree.txt
index c00834cb33..53bf393628 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseClause.stree.txt
@@ -1,30 +1,32 @@
-Statement block - Gen<None> - 54 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { bar(); } /* Foo */ /* Bar */ else { baz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:28
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Comment;[/* Foo */];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Comment;[/* Bar */];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..54)::54 - [if(foo) { bar(); } /* Foo */ /* Bar */ else { baz(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..54)::54 - [if(foo) { bar(); } /* Foo */ /* Bar */ else { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        CSharpComment;[/* Foo */];
+        Whitespace;[ ];
+        CSharpComment;[/* Bar */];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseIfClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseIfClause.stree.txt
index 35a7c0c0e2..67306cce2d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseIfClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenIfAndElseIfClause.stree.txt
@@ -1,35 +1,37 @@
-Statement block - Gen<None> - 62 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { bar(); } /* Foo */ /* Bar */ else if(bar) { baz(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:33
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Comment;[/* Foo */];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Comment;[/* Bar */];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..62)::62 - [if(foo) { bar(); } /* Foo */ /* Bar */ else if(bar) { baz(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..62)::62 - [if(foo) { bar(); } /* Foo */ /* Bar */ else if(bar) { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        CSharpComment;[/* Foo */];
+        Whitespace;[ ];
+        CSharpComment;[/* Bar */];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[bar];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndCatchClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndCatchClause.stree.txt
index 4fb861d57f..7aa27c6657 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndCatchClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndCatchClause.stree.txt
@@ -1,30 +1,32 @@
-Statement block - Gen<None> - 56 - (0:0,0)
-    Code span - Gen<Stmt> - [try { bar(); } /* Foo */ /* Bar */ catch(bar) { baz(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:28
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Comment;[/* Foo */];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Comment;[/* Bar */];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..56)::56 - [try { bar(); } /* Foo */ /* Bar */ catch(bar) { baz(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..56)::56 - [try { bar(); } /* Foo */ /* Bar */ catch(bar) { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        CSharpComment;[/* Foo */];
+        Whitespace;[ ];
+        CSharpComment;[/* Bar */];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[bar];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndFinallyClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndFinallyClause.stree.txt
index 659643d83f..5ceedb1a4c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndFinallyClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsBlockCommentBetweenTryAndFinallyClause.stree.txt
@@ -1,27 +1,29 @@
-Statement block - Gen<None> - 53 - (0:0,0)
-    Code span - Gen<Stmt> - [try { bar(); } /* Foo */ /* Bar */ finally { baz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:25
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Comment;[/* Foo */];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Comment;[/* Bar */];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[finally];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..53)::53 - [try { bar(); } /* Foo */ /* Bar */ finally { baz(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..53)::53 - [try { bar(); } /* Foo */ /* Bar */ finally { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        CSharpComment;[/* Foo */];
+        Whitespace;[ ];
+        CSharpComment;[/* Bar */];
+        Whitespace;[ ];
+        Keyword;[finally];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsExceptionLessCatchClauses.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsExceptionLessCatchClauses.stree.txt
index bb84c5607a..a201eec076 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsExceptionLessCatchClauses.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsExceptionLessCatchClauses.stree.txt
@@ -1,37 +1,39 @@
-Statement block - Gen<None> - 53 - (0:0,0)
-    Code span - Gen<Stmt> - [try { var foo = new { } } catch { var foo = new { } }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:35
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..53)::53 - [try { var foo = new { } } catch { var foo = new { } }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..53)::53 - [try { var foo = new { } } catch { var foo = new { } }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenCatchAndFinallyClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenCatchAndFinallyClause.stree.txt
index b09a7b573c..299be65937 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenCatchAndFinallyClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenCatchAndFinallyClause.stree.txt
@@ -1,41 +1,43 @@
-Statement block - Gen<None> - 72 - (0:0,0)
-    Code span - Gen<Stmt> - [try { bar(); } catch(bar) { baz(); }LF// FooLF// BarLFfinally { biz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:39
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Comment;[// Foo];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Comment;[// Bar];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Keyword;[finally];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[biz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..72)::72 - [try { bar(); } catch(bar) { baz(); }LF// FooLF// BarLFfinally { biz(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..72)::72 - [try { bar(); } catch(bar) { baz(); }LF// FooLF// BarLFfinally { biz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[bar];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        NewLine;[LF];
+        CSharpComment;[// Foo];
+        NewLine;[LF];
+        CSharpComment;[// Bar];
+        NewLine;[LF];
+        Keyword;[finally];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[biz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenDoAndWhileClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenDoAndWhileClause.stree.txt
index 17b8ff17eb..34203c8a11 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenDoAndWhileClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenDoAndWhileClause.stree.txt
@@ -1,26 +1,28 @@
-Statement block - Gen<None> - 51 - (0:0,0)
-    Code span - Gen<Stmt> - [do { var foo = bar; }LF// FooLF// BarLFwhile(true);] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:24
-        CSharpTokenType.Keyword;[do];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Comment;[// Foo];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Comment;[// Bar];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Keyword;[while];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
+CSharpCodeBlock - [0..51)::51 - [do { var foo = bar; }LF// FooLF// BarLFwhile(true);]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..51)::51 - [do { var foo = bar; }LF// FooLF// BarLFwhile(true);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[do];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        NewLine;[LF];
+        CSharpComment;[// Foo];
+        NewLine;[LF];
+        CSharpComment;[// Bar];
+        NewLine;[LF];
+        Keyword;[while];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Semicolon;[;];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenElseIfAndElseClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenElseIfAndElseClause.stree.txt
index eb193d4c42..9e4a455d64 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenElseIfAndElseClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenElseIfAndElseClause.stree.txt
@@ -1,46 +1,48 @@
-Statement block - Gen<None> - 75 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { bar(); } else if(bar) { baz(); }LF// FooLF// BarLFelse { biz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:44
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Comment;[// Foo];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Comment;[// Bar];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[biz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..75)::75 - [if(foo) { bar(); } else if(bar) { baz(); }LF// FooLF// BarLFelse { biz(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..75)::75 - [if(foo) { bar(); } else if(bar) { baz(); }LF// FooLF// BarLFelse { biz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[bar];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        NewLine;[LF];
+        CSharpComment;[// Foo];
+        NewLine;[LF];
+        CSharpComment;[// Bar];
+        NewLine;[LF];
+        Keyword;[else];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[biz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseClause.stree.txt
index 5494eeaffe..b5623098dc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseClause.stree.txt
@@ -1,30 +1,32 @@
-Statement block - Gen<None> - 51 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { bar(); }LF// FooLF// BarLFelse { baz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:28
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Comment;[// Foo];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Comment;[// Bar];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..51)::51 - [if(foo) { bar(); }LF// FooLF// BarLFelse { baz(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..51)::51 - [if(foo) { bar(); }LF// FooLF// BarLFelse { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        NewLine;[LF];
+        CSharpComment;[// Foo];
+        NewLine;[LF];
+        CSharpComment;[// Bar];
+        NewLine;[LF];
+        Keyword;[else];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseIfClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseIfClause.stree.txt
index 9359227eaf..3743f86094 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseIfClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenIfAndElseIfClause.stree.txt
@@ -1,35 +1,37 @@
-Statement block - Gen<None> - 59 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { bar(); }LF// FooLF// BarLFelse if(bar) { baz(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:33
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Comment;[// Foo];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Comment;[// Bar];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..59)::59 - [if(foo) { bar(); }LF// FooLF// BarLFelse if(bar) { baz(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..59)::59 - [if(foo) { bar(); }LF// FooLF// BarLFelse if(bar) { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        NewLine;[LF];
+        CSharpComment;[// Foo];
+        NewLine;[LF];
+        CSharpComment;[// Bar];
+        NewLine;[LF];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[bar];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndCatchClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndCatchClause.stree.txt
index fd741d9327..efec2a5744 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndCatchClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndCatchClause.stree.txt
@@ -1,30 +1,32 @@
-Statement block - Gen<None> - 53 - (0:0,0)
-    Code span - Gen<Stmt> - [try { bar(); }LF// FooLF// BarLFcatch(bar) { baz(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:28
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Comment;[// Foo];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Comment;[// Bar];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..53)::53 - [try { bar(); }LF// FooLF// BarLFcatch(bar) { baz(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..53)::53 - [try { bar(); }LF// FooLF// BarLFcatch(bar) { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        NewLine;[LF];
+        CSharpComment;[// Foo];
+        NewLine;[LF];
+        CSharpComment;[// Bar];
+        NewLine;[LF];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[bar];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndFinallyClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndFinallyClause.stree.txt
index 4f6a067875..ab272ae2fa 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndFinallyClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsLineCommentBetweenTryAndFinallyClause.stree.txt
@@ -1,27 +1,29 @@
-Statement block - Gen<None> - 50 - (0:0,0)
-    Code span - Gen<Stmt> - [try { bar(); }LF// FooLF// BarLFfinally { baz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:25
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Comment;[// Foo];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Comment;[// Bar];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Keyword;[finally];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..50)::50 - [try { bar(); }LF// FooLF// BarLFfinally { baz(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..50)::50 - [try { bar(); }LF// FooLF// BarLFfinally { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        NewLine;[LF];
+        CSharpComment;[// Foo];
+        NewLine;[LF];
+        CSharpComment;[// Bar];
+        NewLine;[LF];
+        Keyword;[finally];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinAdditionalCatchClauses.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinAdditionalCatchClauses.stree.txt
index 12d1fbf839..ba3619a376 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinAdditionalCatchClauses.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinAdditionalCatchClauses.stree.txt
@@ -1,100 +1,102 @@
-Statement block - Gen<None> - 141 - (0:0,0)
-    Code span - Gen<Stmt> - [try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) {] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:78
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Baz];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Baz];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Baz];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 12 - (128:0,128)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (128:0,128) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 3 - (129:0,129)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (129:0,129) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (132:0,132) - Tokens:1
-            HtmlTokenType.Text;[Foo];
-        Tag block - Gen<None> - 4 - (135:0,135)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (135:0,135) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (139:0,139) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:Any - (140:0,140) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..141)::141 - [try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { <p>Foo</p> }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..128)::128 - [try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Identifier;[Baz];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Identifier;[Baz];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Identifier;[Baz];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+    MarkupBlock - [128..140)::12
+        MarkupTextLiteral - [128..129)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagBlock - [129..132)::3 - [<p>]
+            MarkupTextLiteral - [129..132)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [132..135)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+        MarkupTagBlock - [135..139)::4 - [</p>]
+            MarkupTextLiteral - [135..139)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [139..140)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+    CSharpStatementLiteral - [140..141)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinCatchClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinCatchClause.stree.txt
index eb1512a038..e7083ce8a7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinCatchClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinCatchClause.stree.txt
@@ -1,50 +1,52 @@
-Statement block - Gen<None> - 59 - (0:0,0)
-    Code span - Gen<Stmt> - [try { var foo = new { } } catch(Foo Bar Baz) {] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:28
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Baz];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 12 - (46:0,46)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 3 - (47:0,47)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (47:0,47) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (50:0,50) - Tokens:1
-            HtmlTokenType.Text;[Foo];
-        Tag block - Gen<None> - 4 - (53:0,53)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (53:0,53) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (57:0,57) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:Any - (58:0,58) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..59)::59 - [try { var foo = new { } } catch(Foo Bar Baz) { <p>Foo</p> }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..46)::46 - [try { var foo = new { } } catch(Foo Bar Baz) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Identifier;[Baz];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+    MarkupBlock - [46..58)::12
+        MarkupTextLiteral - [46..47)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagBlock - [47..50)::3 - [<p>]
+            MarkupTextLiteral - [47..50)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [50..53)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+        MarkupTagBlock - [53..57)::4 - [</p>]
+            MarkupTextLiteral - [53..57)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [57..58)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+    CSharpStatementLiteral - [58..59)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinFinallyClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinFinallyClause.stree.txt
index 4af8d90e1a..eff329eb33 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinFinallyClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinFinallyClause.stree.txt
@@ -1,43 +1,45 @@
-Statement block - Gen<None> - 48 - (0:0,0)
-    Code span - Gen<Stmt> - [try { var foo = new { } } finally {] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:21
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[finally];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 12 - (35:0,35)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 3 - (36:0,36)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:1
-            HtmlTokenType.Text;[Foo];
-        Tag block - Gen<None> - 4 - (42:0,42)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (42:0,42) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (46:0,46) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:None - (47:0,47) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..48)::48 - [try { var foo = new { } } finally { <p>Foo</p> }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..35)::35 - [try { var foo = new { } } finally {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[finally];
+        Whitespace;[ ];
+        LeftBrace;[{];
+    MarkupBlock - [35..47)::12
+        MarkupTextLiteral - [35..36)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagBlock - [36..39)::3 - [<p>]
+            MarkupTextLiteral - [36..39)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [39..42)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+        MarkupTagBlock - [42..46)::4 - [</p>]
+            MarkupTextLiteral - [42..46)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [46..47)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+    CSharpStatementLiteral - [47..48)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinTryClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinTryClause.stree.txt
index f7fc9e38f9..48537be736 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinTryClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinTryClause.stree.txt
@@ -1,25 +1,27 @@
-Statement block - Gen<None> - 18 - (0:0,0)
-    Code span - Gen<Stmt> - [try {] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 12 - (5:0,5)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 3 - (6:0,6)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-            HtmlTokenType.Text;[Foo];
-        Tag block - Gen<None> - 4 - (12:0,12)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..18)::18 - [try { <p>Foo</p> }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..5)::5 - [try {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+    MarkupBlock - [5..17)::12
+        MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagBlock - [6..9)::3 - [<p>]
+            MarkupTextLiteral - [6..9)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [9..12)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+        MarkupTagBlock - [12..16)::4 - [</p>]
+            MarkupTextLiteral - [12..16)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+    CSharpStatementLiteral - [17..18)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenCatchAndFinallyClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenCatchAndFinallyClause.stree.txt
index 7ebe9d2b86..5d8c7b08ae 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenCatchAndFinallyClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenCatchAndFinallyClause.stree.txt
@@ -1,63 +1,55 @@
-Statement block - Gen<None> - 75 - (0:0,0)
-    Code span - Gen<Stmt> - [try { bar(); } catch(bar) { baz(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:25
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-    Comment block - Gen<RazorComment> - 9 - (37:0,37)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (37:0,37) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [ Foo ] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:1
-            CSharpTokenType.RazorComment;[ Foo ];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (44:0,44) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (45:0,45) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-    Code span - Gen<Stmt> - [ ] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Comment block - Gen<RazorComment> - 9 - (47:0,47)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (47:0,47) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (48:0,48) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [ Bar ] - SpanEditHandler;Accepts:Any - (49:0,49) - Tokens:1
-            CSharpTokenType.RazorComment;[ Bar ];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (54:0,54) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (55:0,55) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-    Code span - Gen<Stmt> - [ finally { biz(); }] - SpanEditHandler;Accepts:None - (56:0,56) - Tokens:11
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[finally];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[biz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..75)::75 - [try { bar(); } catch(bar) { baz(); } @* Foo *@ @* Bar *@ finally { biz(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..37)::37 - [try { bar(); } catch(bar) { baz(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[bar];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+    RazorComment - [37..46)::9
+        RazorCommentTransition;[@];
+        RazorCommentStar;[*];
+        RazorCommentLiteral;[ Foo ];
+        RazorCommentStar;[*];
+        RazorCommentTransition;[@];
+    CSharpStatementLiteral - [46..47)::1 - [ ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+    RazorComment - [47..56)::9
+        RazorCommentTransition;[@];
+        RazorCommentStar;[*];
+        RazorCommentLiteral;[ Bar ];
+        RazorCommentStar;[*];
+        RazorCommentTransition;[@];
+    CSharpStatementLiteral - [56..75)::19 - [ finally { biz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
+        Keyword;[finally];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[biz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenDoAndWhileClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenDoAndWhileClause.stree.txt
index e31ec364b4..71b8b166ef 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenDoAndWhileClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenDoAndWhileClause.stree.txt
@@ -1,48 +1,40 @@
-Statement block - Gen<None> - 54 - (0:0,0)
-    Code span - Gen<Stmt> - [do { var foo = bar; } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:15
-        CSharpTokenType.Keyword;[do];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-    Comment block - Gen<RazorComment> - 9 - (22:0,22)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [ Foo ] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
-            CSharpTokenType.RazorComment;[ Foo ];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (29:0,29) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (30:0,30) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-    Code span - Gen<Stmt> - [ ] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Comment block - Gen<RazorComment> - 9 - (32:0,32)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (33:0,33) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [ Bar ] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:1
-            CSharpTokenType.RazorComment;[ Bar ];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (39:0,39) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-    Code span - Gen<Stmt> - [ while(true);] - SpanEditHandler;Accepts:None - (41:0,41) - Tokens:6
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[while];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
+CSharpCodeBlock - [0..54)::54 - [do { var foo = bar; } @* Foo *@ @* Bar *@ while(true);]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..22)::22 - [do { var foo = bar; } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[do];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+    RazorComment - [22..31)::9
+        RazorCommentTransition;[@];
+        RazorCommentStar;[*];
+        RazorCommentLiteral;[ Foo ];
+        RazorCommentStar;[*];
+        RazorCommentTransition;[@];
+    CSharpStatementLiteral - [31..32)::1 - [ ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+    RazorComment - [32..41)::9
+        RazorCommentTransition;[@];
+        RazorCommentStar;[*];
+        RazorCommentLiteral;[ Bar ];
+        RazorCommentStar;[*];
+        RazorCommentTransition;[@];
+    CSharpStatementLiteral - [41..54)::13 - [ while(true);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
+        Keyword;[while];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Semicolon;[;];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenElseIfAndElseClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenElseIfAndElseClause.stree.txt
index 36f17bd744..5d70ae76c1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenElseIfAndElseClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenElseIfAndElseClause.stree.txt
@@ -1,68 +1,60 @@
-Statement block - Gen<None> - 78 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { bar(); } else if(bar) { baz(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:30
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-    Comment block - Gen<RazorComment> - 9 - (43:0,43)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (43:0,43) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (44:0,44) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [ Foo ] - SpanEditHandler;Accepts:Any - (45:0,45) - Tokens:1
-            CSharpTokenType.RazorComment;[ Foo ];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (50:0,50) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (51:0,51) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-    Code span - Gen<Stmt> - [ ] - SpanEditHandler;Accepts:Any - (52:0,52) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Comment block - Gen<RazorComment> - 9 - (53:0,53)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (53:0,53) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (54:0,54) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [ Bar ] - SpanEditHandler;Accepts:Any - (55:0,55) - Tokens:1
-            CSharpTokenType.RazorComment;[ Bar ];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (60:0,60) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (61:0,61) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-    Code span - Gen<Stmt> - [ else { baz(); }] - SpanEditHandler;Accepts:None - (62:0,62) - Tokens:11
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..78)::78 - [if(foo) { bar(); } else if(bar) { baz(); } @* Foo *@ @* Bar *@ else { baz(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..43)::43 - [if(foo) { bar(); } else if(bar) { baz(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[bar];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+    RazorComment - [43..52)::9
+        RazorCommentTransition;[@];
+        RazorCommentStar;[*];
+        RazorCommentLiteral;[ Foo ];
+        RazorCommentStar;[*];
+        RazorCommentTransition;[@];
+    CSharpStatementLiteral - [52..53)::1 - [ ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+    RazorComment - [53..62)::9
+        RazorCommentTransition;[@];
+        RazorCommentStar;[*];
+        RazorCommentLiteral;[ Bar ];
+        RazorCommentStar;[*];
+        RazorCommentTransition;[@];
+    CSharpStatementLiteral - [62..78)::16 - [ else { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseClause.stree.txt
index 6a9926895b..fa6d7871f2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseClause.stree.txt
@@ -1,52 +1,44 @@
-Statement block - Gen<None> - 54 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:14
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-    Comment block - Gen<RazorComment> - 9 - (19:0,19)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [ Foo ] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-            CSharpTokenType.RazorComment;[ Foo ];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (26:0,26) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-    Code span - Gen<Stmt> - [ ] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Comment block - Gen<RazorComment> - 9 - (29:0,29)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (29:0,29) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (30:0,30) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [ Bar ] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-            CSharpTokenType.RazorComment;[ Bar ];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (37:0,37) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-    Code span - Gen<Stmt> - [ else { baz(); }] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:11
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..54)::54 - [if(foo) { bar(); } @* Foo *@ @* Bar *@ else { baz(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..19)::19 - [if(foo) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+    RazorComment - [19..28)::9
+        RazorCommentTransition;[@];
+        RazorCommentStar;[*];
+        RazorCommentLiteral;[ Foo ];
+        RazorCommentStar;[*];
+        RazorCommentTransition;[@];
+    CSharpStatementLiteral - [28..29)::1 - [ ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+    RazorComment - [29..38)::9
+        RazorCommentTransition;[@];
+        RazorCommentStar;[*];
+        RazorCommentLiteral;[ Bar ];
+        RazorCommentStar;[*];
+        RazorCommentTransition;[@];
+    CSharpStatementLiteral - [38..54)::16 - [ else { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseIfClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseIfClause.stree.txt
index f25afcea4d..e16b61a5df 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseIfClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenIfAndElseIfClause.stree.txt
@@ -1,57 +1,49 @@
-Statement block - Gen<None> - 62 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:14
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-    Comment block - Gen<RazorComment> - 9 - (19:0,19)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [ Foo ] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-            CSharpTokenType.RazorComment;[ Foo ];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (26:0,26) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-    Code span - Gen<Stmt> - [ ] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Comment block - Gen<RazorComment> - 9 - (29:0,29)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (29:0,29) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (30:0,30) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [ Bar ] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-            CSharpTokenType.RazorComment;[ Bar ];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (37:0,37) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-    Code span - Gen<Stmt> - [ else if(bar) { baz(); }] - SpanEditHandler;Accepts:Any - (38:0,38) - Tokens:16
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..62)::62 - [if(foo) { bar(); } @* Foo *@ @* Bar *@ else if(bar) { baz(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..19)::19 - [if(foo) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+    RazorComment - [19..28)::9
+        RazorCommentTransition;[@];
+        RazorCommentStar;[*];
+        RazorCommentLiteral;[ Foo ];
+        RazorCommentStar;[*];
+        RazorCommentTransition;[@];
+    CSharpStatementLiteral - [28..29)::1 - [ ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+    RazorComment - [29..38)::9
+        RazorCommentTransition;[@];
+        RazorCommentStar;[*];
+        RazorCommentLiteral;[ Bar ];
+        RazorCommentStar;[*];
+        RazorCommentTransition;[@];
+    CSharpStatementLiteral - [38..62)::24 - [ else if(bar) { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[bar];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndCatchClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndCatchClause.stree.txt
index 7ca64561f4..d9cccdcf46 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndCatchClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndCatchClause.stree.txt
@@ -1,51 +1,43 @@
-Statement block - Gen<None> - 55 - (0:0,0)
-    Code span - Gen<Stmt> - [try { bar(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:10
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-    Comment block - Gen<RazorComment> - 9 - (14:0,14)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [ Foo ] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-            CSharpTokenType.RazorComment;[ Foo ];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-    Code span - Gen<Stmt> - [ ] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Comment block - Gen<RazorComment> - 9 - (24:0,24)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [ Bar ] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:1
-            CSharpTokenType.RazorComment;[ Bar ];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-    Code span - Gen<Stmt> - [ catch(bar) { baz(); }] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:14
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..55)::55 - [try { bar(); }@* Foo *@ @* Bar *@ catch(bar) { baz(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..14)::14 - [try { bar(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+    RazorComment - [14..23)::9
+        RazorCommentTransition;[@];
+        RazorCommentStar;[*];
+        RazorCommentLiteral;[ Foo ];
+        RazorCommentStar;[*];
+        RazorCommentTransition;[@];
+    CSharpStatementLiteral - [23..24)::1 - [ ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+    RazorComment - [24..33)::9
+        RazorCommentTransition;[@];
+        RazorCommentStar;[*];
+        RazorCommentLiteral;[ Bar ];
+        RazorCommentStar;[*];
+        RazorCommentTransition;[@];
+    CSharpStatementLiteral - [33..55)::22 - [ catch(bar) { baz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[bar];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndFinallyClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndFinallyClause.stree.txt
index bb040a642a..c491cbcce0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndFinallyClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsRazorCommentBetweenTryAndFinallyClause.stree.txt
@@ -1,49 +1,41 @@
-Statement block - Gen<None> - 53 - (0:0,0)
-    Code span - Gen<Stmt> - [try { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:11
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-    Comment block - Gen<RazorComment> - 9 - (15:0,15)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [ Foo ] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-            CSharpTokenType.RazorComment;[ Foo ];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-    Code span - Gen<Stmt> - [ ] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Comment block - Gen<RazorComment> - 9 - (25:0,25)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (26:0,26) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [ Bar ] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:1
-            CSharpTokenType.RazorComment;[ Bar ];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:1
-            CSharpTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (33:0,33) - Tokens:1
-            CSharpTokenType.RazorCommentTransition;[@];
-    Code span - Gen<Stmt> - [ finally { biz(); }] - SpanEditHandler;Accepts:None - (34:0,34) - Tokens:11
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[finally];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[biz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..53)::53 - [try { bar(); } @* Foo *@ @* Bar *@ finally { biz(); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..15)::15 - [try { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+    RazorComment - [15..24)::9
+        RazorCommentTransition;[@];
+        RazorCommentStar;[*];
+        RazorCommentLiteral;[ Foo ];
+        RazorCommentStar;[*];
+        RazorCommentTransition;[@];
+    CSharpStatementLiteral - [24..25)::1 - [ ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+    RazorComment - [25..34)::9
+        RazorCommentTransition;[@];
+        RazorCommentStar;[*];
+        RazorCommentLiteral;[ Bar ];
+        RazorCommentStar;[*];
+        RazorCommentTransition;[@];
+    CSharpStatementLiteral - [34..53)::19 - [ finally { biz(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
+        Keyword;[finally];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[biz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithFinallyClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithFinallyClause.stree.txt
index c9a0cb5fa2..cb95bfbf57 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithFinallyClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithFinallyClause.stree.txt
@@ -1,37 +1,39 @@
-Statement block - Gen<None> - 55 - (0:0,0)
-    Code span - Gen<Stmt> - [try { var foo = new { } } finally { var foo = new { } }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:35
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[finally];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..55)::55 - [try { var foo = new { } } finally { var foo = new { } }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..55)::55 - [try { var foo = new { } } finally { var foo = new { } }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[finally];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithMultipleCatchClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithMultipleCatchClause.stree.txt
index b4bab579d7..15d720a6d8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithMultipleCatchClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithMultipleCatchClause.stree.txt
@@ -1,94 +1,96 @@
-Statement block - Gen<None> - 148 - (0:0,0)
-    Code span - Gen<Stmt> - [try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:92
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Baz];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Baz];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Baz];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..148)::148 - [try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..148)::148 - [try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Identifier;[Baz];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Identifier;[Baz];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Identifier;[Baz];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithNoAdditionalClauses.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithNoAdditionalClauses.stree.txt
index 8db73b2757..f31f9f22ae 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithNoAdditionalClauses.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithNoAdditionalClauses.stree.txt
@@ -1,19 +1,21 @@
-Statement block - Gen<None> - 25 - (0:0,0)
-    Code span - Gen<Stmt> - [try { var foo = new { } }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:17
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..25)::25 - [try { var foo = new { } }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..25)::25 - [try { var foo = new { } }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithOneCatchClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithOneCatchClause.stree.txt
index e83ac8d8ba..ff07101530 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithOneCatchClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsTryStatementWithOneCatchClause.stree.txt
@@ -1,44 +1,46 @@
-Statement block - Gen<None> - 66 - (0:0,0)
-    Code span - Gen<Stmt> - [try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:42
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Baz];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..66)::66 - [try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..66)::66 - [try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Identifier;[Baz];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsUsingsNestedWithinOtherBlocks.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsUsingsNestedWithinOtherBlocks.stree.txt
index 4618359626..867e696b2d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsUsingsNestedWithinOtherBlocks.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsUsingsNestedWithinOtherBlocks.stree.txt
@@ -1,55 +1,57 @@
-Statement block - Gen<None> - 96 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { using(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); } }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:53
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["baz"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"foo } bar"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..96)::96 - [if(foo) { using(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); } }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..96)::96 - [if(foo) { using(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); } }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Keyword;[using];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["baz"];
+        Whitespace;[ ];
+        RightBrace;[}];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"foo } bar"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.stree.txt
index c1ef9144c7..43cd0d98f6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesBlockCommentAtEndOfFile.stree.txt
@@ -1,16 +1,18 @@
-Statement block - Gen<None> - 38 - (0:0,0)
-    Code span - Gen<Stmt> - [foreach(var f in Foo) { /* foo bar baz] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:14
-        CSharpTokenType.Keyword;[foreach];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[f];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[in];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Comment;[/* foo bar baz];RZ1001(24:0,24 [1] )
+CSharpCodeBlock - [0..38)::38 - [foreach(var f in Foo) { /* foo bar baz]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..38)::38 - [foreach(var f in Foo) { /* foo bar baz] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[foreach];
+        LeftParenthesis;[(];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[f];
+        Whitespace;[ ];
+        Keyword;[in];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        CSharpComment;[/* foo bar baz];RZ1001(24:0,24 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesParenBalancingAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesParenBalancingAtEOF.stree.txt
index 74aaae6293..1b96a79303 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesParenBalancingAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesParenBalancingAtEOF.stree.txt
@@ -1,11 +1,14 @@
-Expression block - Gen<Expr> - 15 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [Html.En(code()] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:7
-        CSharpTokenType.Identifier;[Html];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[En];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[code];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..15)::15 - [@Html.En(code()]
+    CSharpImplicitExpression - [0..15)::15
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..15)::14
+            CSharpCodeBlock - [1..15)::14
+                CSharpExpressionLiteral - [1..15)::14 - [Html.En(code()] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Identifier;[Html];
+                    Dot;[.];
+                    Identifier;[En];
+                    LeftParenthesis;[(];
+                    Identifier;[code];
+                    LeftParenthesis;[(];
+                    RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleLineCommentAtEndOfFile.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleLineCommentAtEndOfFile.stree.txt
index 132a174cc4..51347e9a02 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleLineCommentAtEndOfFile.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleLineCommentAtEndOfFile.stree.txt
@@ -1,16 +1,18 @@
-Statement block - Gen<None> - 38 - (0:0,0)
-    Code span - Gen<Stmt> - [foreach(var f in Foo) { // foo bar baz] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:14
-        CSharpTokenType.Keyword;[foreach];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[f];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[in];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Comment;[// foo bar baz];
+CSharpCodeBlock - [0..38)::38 - [foreach(var f in Foo) { // foo bar baz]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..38)::38 - [foreach(var f in Foo) { // foo bar baz] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[foreach];
+        LeftParenthesis;[(];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[f];
+        Whitespace;[ ];
+        Keyword;[in];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        CSharpComment;[// foo bar baz];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleSlashAtEndOfFile.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleSlashAtEndOfFile.stree.txt
index fc3d51a91d..5fbe108031 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleSlashAtEndOfFile.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesSingleSlashAtEndOfFile.stree.txt
@@ -1,22 +1,24 @@
-Statement block - Gen<None> - 37 - (0:0,0)
-    Code span - Gen<Stmt> - [foreach(var f in Foo) { / foo bar baz] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:20
-        CSharpTokenType.Keyword;[foreach];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[f];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[in];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Slash;[/];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
+CSharpCodeBlock - [0..37)::37 - [foreach(var f in Foo) { / foo bar baz]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..37)::37 - [foreach(var f in Foo) { / foo bar baz] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[foreach];
+        LeftParenthesis;[(];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[f];
+        Whitespace;[ ];
+        Keyword;[in];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Slash;[/];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Whitespace;[ ];
+        Identifier;[baz];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock.stree.txt
index 96f6f0f501..0880fd7ca3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock.stree.txt
@@ -1,4 +1,4 @@
-Statement block - Gen<None> - 25 - (0:0,0)
-    Code span - Gen<Stmt> - [using                    ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.WhiteSpace;[                    ];
+CSharpCodeBlock - [0..25)::25 - [using                    ]
+    CSharpStatementLiteral - [0..25)::25 - [using                    ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[using];
+        Whitespace;[                    ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ThenBalancesBracesIfFirstIdentifierIsLockKeyword.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ThenBalancesBracesIfFirstIdentifierIsLockKeyword.stree.txt
index d1aea3ef3c..31249b0f21 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ThenBalancesBracesIfFirstIdentifierIsLockKeyword.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ThenBalancesBracesIfFirstIdentifierIsLockKeyword.stree.txt
@@ -1,18 +1,20 @@
-Statement block - Gen<None> - 44 - (0:0,0)
-    Code span - Gen<Stmt> - [lock(foo) { Debug.WriteLine(@"foo } bar"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:16
-        CSharpTokenType.Keyword;[lock];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Debug];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[WriteLine];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"foo } bar"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..44)::44 - [lock(foo) { Debug.WriteLine(@"foo } bar"); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..44)::44 - [lock(foo) { Debug.WriteLine(@"foo } bar"); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[lock];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Debug];
+        Dot;[.];
+        Identifier;[WriteLine];
+        LeftParenthesis;[(];
+        StringLiteral;[@"foo } bar"];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TreatsAtSignsAfterFirstPairAsPartOfCSharpStatement.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TreatsAtSignsAfterFirstPairAsPartOfCSharpStatement.stree.txt
index 2adfba5136..87ffa57e54 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TreatsAtSignsAfterFirstPairAsPartOfCSharpStatement.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TreatsAtSignsAfterFirstPairAsPartOfCSharpStatement.stree.txt
@@ -1,22 +1,24 @@
-Statement block - Gen<None> - 27 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:7
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<None> - [@] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [@@@class.Foo() }] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:10
-        CSharpTokenType.Transition;[@];
-        CSharpTokenType.Transition;[@];
-        CSharpTokenType.Transition;[@];
-        CSharpTokenType.Keyword;[class];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..27)::27 - [if(foo) { @@@@class.Foo() }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..10)::10 - [if(foo) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+    CSharpEphemeralTextLiteral - [10..11)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+        Transition;[@];
+    CSharpStatementLiteral - [11..27)::16 - [@@@class.Foo() }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Transition;[@];
+        Transition;[@];
+        Transition;[@];
+        Keyword;[class];
+        Dot;[.];
+        Identifier;[Foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart.stree.txt
index 2b2e1a980f..a2b3f220c2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/TreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart.stree.txt
@@ -1,20 +1,22 @@
-Statement block - Gen<None> - 25 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:7
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<None> - [@] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [@class.Foo() }] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:8
-        CSharpTokenType.Transition;[@];
-        CSharpTokenType.Keyword;[class];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..25)::25 - [if(foo) { @@class.Foo() }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..10)::10 - [if(foo) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+    CSharpEphemeralTextLiteral - [10..11)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+        Transition;[@];
+    CSharpStatementLiteral - [11..25)::14 - [@class.Foo() }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Transition;[@];
+        Keyword;[class];
+        Dot;[.];
+        Identifier;[Foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
index ac7bda2f5e..b7ffda307f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
@@ -1,31 +1,40 @@
-Statement block - Gen<None> - 22 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 20 - (1:0,1)
-        Tag block - Gen<None> - 20 - (1:0,1)
-            Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[span];
-            Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(17:0,17)> - 12 - (6:0,6)
-                Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[foo];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.SingleQuote;['];
-                Markup block - Gen<None> - 2 - (12:0,12)
-                    Markup span - Gen<LitAttr:@(12:0,12)> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                Markup span - Gen<LitAttr:@(14:0,14)> - [def] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                    HtmlTokenType.Text;[def];
-                Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-                    HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..22)::22 - [{<span foo='@@def' />}]
+    CSharpStatement - [0..22)::22
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..22)::22
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..21)::20
+                MarkupBlock - [1..21)::20
+                    MarkupTagBlock - [1..21)::20 - [<span foo='@@def' />]
+                        MarkupTextLiteral - [1..6)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            Text;[span];
+                        MarkupAttributeBlock - [6..18)::12 - [ foo='@@def']
+                            MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                            Equals;[=];
+                            MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                            GenericBlock - [12..17)::5
+                                MarkupBlock - [12..14)::2
+                                    MarkupTextLiteral - [12..13)::1 - [@] - Gen<LitAttr:@(12:0,12)> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    MarkupEphemeralTextLiteral - [13..14)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                MarkupLiteralAttributeValue - [14..17)::3 - [def]
+                                    MarkupTextLiteral - [14..17)::3 - [def] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[def];
+                            MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                        MarkupTextLiteral - [18..21)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                            ForwardSlash;[/];
+                            CloseAngle;[>];
+                CSharpStatementLiteral - [21..21)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Marker;[];
+            RazorMetaCode - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
index d7426b2aac..277f2e6290 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
@@ -1,31 +1,40 @@
-Statement block - Gen<None> - 22 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 20 - (1:0,1)
-        Tag block - Gen<None> - 20 - (1:0,1)
-            Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[span];
-            Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(17:0,17)> - 12 - (6:0,6)
-                Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[foo];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.SingleQuote;['];
-                Markup span - Gen<LitAttr:@(12:0,12)> - [abc] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                    HtmlTokenType.Text;[abc];
-                Markup block - Gen<None> - 2 - (15:0,15)
-                    Markup span - Gen<LitAttr:@(15:0,15)> - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-                    HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..22)::22 - [{<span foo='abc@@' />}]
+    CSharpStatement - [0..22)::22
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..22)::22
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..21)::20
+                MarkupBlock - [1..21)::20
+                    MarkupTagBlock - [1..21)::20 - [<span foo='abc@@' />]
+                        MarkupTextLiteral - [1..6)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            Text;[span];
+                        MarkupAttributeBlock - [6..18)::12 - [ foo='abc@@']
+                            MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                            Equals;[=];
+                            MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                            GenericBlock - [12..17)::5
+                                MarkupLiteralAttributeValue - [12..15)::3 - [abc]
+                                    MarkupTextLiteral - [12..15)::3 - [abc] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[abc];
+                                MarkupBlock - [15..17)::2
+                                    MarkupTextLiteral - [15..16)::1 - [@] - Gen<LitAttr:@(15:0,15)> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    MarkupEphemeralTextLiteral - [16..17)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                            MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                        MarkupTextLiteral - [18..21)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                            ForwardSlash;[/];
+                            CloseAngle;[>];
+                CSharpStatementLiteral - [21..21)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Marker;[];
+            RazorMetaCode - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
index 6ec5d3f78a..196257f350 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
@@ -1,35 +1,46 @@
-Statement block - Gen<None> - 27 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 25 - (1:0,1)
-        Tag block - Gen<None> - 25 - (1:0,1)
-            Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[span];
-            Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(22:0,22)> - 17 - (6:0,6)
-                Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[foo];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.SingleQuote;['];
-                Markup span - Gen<LitAttr:@(12:0,12)> - [abc] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                    HtmlTokenType.Text;[abc];
-                Markup block - Gen<None> - 3 - (15:0,15)
-                    Markup span - Gen<LitAttr: @(15:0,15)> - [ @] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:2
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                Markup span - Gen<LitAttr: @(18:0,18)> - [ def] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[def];
-                Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-                    HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (26:0,26) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..27)::27 - [{<span foo='abc @@ def' />}]
+    CSharpStatement - [0..27)::27
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..27)::27
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..26)::25
+                MarkupBlock - [1..26)::25
+                    MarkupTagBlock - [1..26)::25 - [<span foo='abc @@ def' />]
+                        MarkupTextLiteral - [1..6)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            Text;[span];
+                        MarkupAttributeBlock - [6..23)::17 - [ foo='abc @@ def']
+                            MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                            Equals;[=];
+                            MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                            GenericBlock - [12..22)::10
+                                MarkupLiteralAttributeValue - [12..15)::3 - [abc]
+                                    MarkupTextLiteral - [12..15)::3 - [abc] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[abc];
+                                MarkupBlock - [15..18)::3
+                                    MarkupTextLiteral - [15..17)::2 - [ @] - Gen<LitAttr: @(15:0,15)> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        Transition;[@];
+                                    MarkupEphemeralTextLiteral - [17..18)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                MarkupLiteralAttributeValue - [18..22)::4 - [ def]
+                                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [19..22)::3 - [def] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[def];
+                            MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                        MarkupTextLiteral - [23..26)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                            ForwardSlash;[/];
+                            CloseAngle;[>];
+                CSharpStatementLiteral - [26..26)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Marker;[];
+            RazorMetaCode - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
index 89200d1412..38ffb3ab75 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
@@ -1,29 +1,37 @@
-Statement block - Gen<None> - 19 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 17 - (1:0,1)
-        Tag block - Gen<None> - 17 - (1:0,1)
-            Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[span];
-            Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(14:0,14)> - 9 - (6:0,6)
-                Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[foo];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.SingleQuote;['];
-                Markup block - Gen<None> - 2 - (12:0,12)
-                    Markup span - Gen<LitAttr:@(12:0,12)> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                    HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..19)::19 - [{<span foo='@@' />}]
+    CSharpStatement - [0..19)::19
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..19)::19
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..18)::17
+                MarkupBlock - [1..18)::17
+                    MarkupTagBlock - [1..18)::17 - [<span foo='@@' />]
+                        MarkupTextLiteral - [1..6)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            Text;[span];
+                        MarkupAttributeBlock - [6..15)::9 - [ foo='@@']
+                            MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                            Equals;[=];
+                            MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                            GenericBlock - [12..14)::2
+                                MarkupBlock - [12..14)::2
+                                    MarkupTextLiteral - [12..13)::1 - [@] - Gen<LitAttr:@(12:0,12)> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    MarkupEphemeralTextLiteral - [13..14)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                            MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                        MarkupTextLiteral - [15..18)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                            ForwardSlash;[/];
+                            CloseAngle;[>];
+                CSharpStatementLiteral - [18..18)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Marker;[];
+            RazorMetaCode - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
index 5ff6c98e4d..01cbcf6027 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
@@ -1,42 +1,54 @@
-Statement block - Gen<None> - 44 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 42 - (1:0,1)
-        Tag block - Gen<None> - 42 - (1:0,1)
-            Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[span];
-            Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(39:0,39)> - 34 - (6:0,6)
-                Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[foo];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.SingleQuote;['];
-                Markup span - Gen<LitAttr:@(12:0,12)> - [abc@def.com] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                    HtmlTokenType.Text;[abc@def.com];
-                Markup span - Gen<LitAttr: @(23:0,23)> - [ abc] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[abc];
-                Markup block - Gen<None> - 2 - (27:0,27)
-                    Markup span - Gen<LitAttr:@(27:0,27)> - [@] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (28:0,28) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                Markup span - Gen<LitAttr:@(29:0,29)> - [def.com] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:1
-                    HtmlTokenType.Text;[def.com];
-                Markup block - Gen<None> - 3 - (36:0,36)
-                    Markup span - Gen<LitAttr: @(36:0,36)> - [ @] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:2
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:1
-                    HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (43:0,43) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..44)::44 - [{<span foo='abc@def.com abc@@def.com @@' />}]
+    CSharpStatement - [0..44)::44
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..44)::44
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..43)::42
+                MarkupBlock - [1..43)::42
+                    MarkupTagBlock - [1..43)::42 - [<span foo='abc@def.com abc@@def.com @@' />]
+                        MarkupTextLiteral - [1..6)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            Text;[span];
+                        MarkupAttributeBlock - [6..40)::34 - [ foo='abc@def.com abc@@def.com @@']
+                            MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                            Equals;[=];
+                            MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                            GenericBlock - [12..39)::27
+                                MarkupLiteralAttributeValue - [12..23)::11 - [abc@def.com]
+                                    MarkupTextLiteral - [12..23)::11 - [abc@def.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[abc@def.com];
+                                MarkupLiteralAttributeValue - [23..27)::4 - [ abc]
+                                    MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [24..27)::3 - [abc] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[abc];
+                                MarkupBlock - [27..29)::2
+                                    MarkupTextLiteral - [27..28)::1 - [@] - Gen<LitAttr:@(27:0,27)> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    MarkupEphemeralTextLiteral - [28..29)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                MarkupLiteralAttributeValue - [29..36)::7 - [def.com]
+                                    MarkupTextLiteral - [29..36)::7 - [def.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[def.com];
+                                MarkupBlock - [36..39)::3
+                                    MarkupTextLiteral - [36..38)::2 - [ @] - Gen<LitAttr: @(36:0,36)> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        Transition;[@];
+                                    MarkupEphemeralTextLiteral - [38..39)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                            MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                        MarkupTextLiteral - [40..43)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                            ForwardSlash;[/];
+                            CloseAngle;[>];
+                CSharpStatementLiteral - [43..43)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Marker;[];
+            RazorMetaCode - [43..44)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
index ae6eb40508..b98a56dae8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
@@ -1,75 +1,85 @@
-Statement block - Gen<None> - 117 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 115 - (1:0,1)
-        Tag block - Gen<None> - 115 - (1:0,1)
-            Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[span];
-            Markup block - Gen<Attr:foo, foo="@(6:0,6),"@(112:0,112)> - 107 - (6:0,6)
-                Markup span - Gen<None> - [ foo="] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[foo];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.DoubleQuote;["];
-                Markup span - Gen<LitAttr:@(12:0,12)> - [/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:14
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[^];
-                    HtmlTokenType.LeftBracket;[[];
-                    HtmlTokenType.Text;[a-z0-9];
-                    HtmlTokenType.Bang;[!];
-                    HtmlTokenType.Text;[#$%&];
-                    HtmlTokenType.SingleQuote;['];
-                    HtmlTokenType.Text;[*+\];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.QuestionMark;[?];
-                    HtmlTokenType.Text;[^_`{|}~.-];
-                    HtmlTokenType.RightBracket;[]];
-                    HtmlTokenType.Text;[+];
-                Markup block - Gen<None> - 2 - (44:0,44)
-                    Markup span - Gen<LitAttr:@(44:0,44)> - [@] - SpanEditHandler;Accepts:None - (44:0,44) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (45:0,45) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                Markup span - Gen<LitAttr:@(46:0,46)> - [[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:30
-                    HtmlTokenType.LeftBracket;[[];
-                    HtmlTokenType.Text;[a-z0-9];
-                    HtmlTokenType.RightBracket;[]];
-                    HtmlTokenType.Text;[(];
-                    HtmlTokenType.LeftBracket;[[];
-                    HtmlTokenType.Text;[a-z0-9-];
-                    HtmlTokenType.RightBracket;[]];
-                    HtmlTokenType.Text;[*];
-                    HtmlTokenType.LeftBracket;[[];
-                    HtmlTokenType.Text;[a-z0-9];
-                    HtmlTokenType.RightBracket;[]];
-                    HtmlTokenType.Text;[)];
-                    HtmlTokenType.QuestionMark;[?];
-                    HtmlTokenType.Text;[\.(];
-                    HtmlTokenType.LeftBracket;[[];
-                    HtmlTokenType.Text;[a-z0-9];
-                    HtmlTokenType.RightBracket;[]];
-                    HtmlTokenType.Text;[(];
-                    HtmlTokenType.LeftBracket;[[];
-                    HtmlTokenType.Text;[a-z0-9-];
-                    HtmlTokenType.RightBracket;[]];
-                    HtmlTokenType.Text;[*];
-                    HtmlTokenType.LeftBracket;[[];
-                    HtmlTokenType.Text;[a-z0-9];
-                    HtmlTokenType.RightBracket;[]];
-                    HtmlTokenType.Text;[)];
-                    HtmlTokenType.QuestionMark;[?];
-                    HtmlTokenType.Text;[)*$];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[i];
-                Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (112:0,112) - Tokens:1
-                    HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (113:0,113) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (116:0,116) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (116:0,116) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..117)::117 - [{<span foo="/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i" />}]
+    CSharpStatement - [0..117)::117
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..117)::117
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..116)::115
+                MarkupBlock - [1..116)::115
+                    MarkupTagBlock - [1..116)::115 - [<span foo="/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i" />]
+                        MarkupTextLiteral - [1..6)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            Text;[span];
+                        MarkupAttributeBlock - [6..113)::107 - [ foo="/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i"]
+                            MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                            Equals;[=];
+                            MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                DoubleQuote;["];
+                            GenericBlock - [12..112)::100
+                                MarkupLiteralAttributeValue - [12..44)::32 - [/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+]
+                                    MarkupTextLiteral - [12..44)::32 - [/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        ForwardSlash;[/];
+                                        Text;[^];
+                                        LeftBracket;[[];
+                                        Text;[a-z0-9];
+                                        Bang;[!];
+                                        Text;[#$%&];
+                                        SingleQuote;['];
+                                        Text;[*+\];
+                                        ForwardSlash;[/];
+                                        Equals;[=];
+                                        QuestionMark;[?];
+                                        Text;[^_`{|}~.-];
+                                        RightBracket;[]];
+                                        Text;[+];
+                                MarkupBlock - [44..46)::2
+                                    MarkupTextLiteral - [44..45)::1 - [@] - Gen<LitAttr:@(44:0,44)> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    MarkupEphemeralTextLiteral - [45..46)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                MarkupLiteralAttributeValue - [46..112)::66 - [[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i]
+                                    MarkupTextLiteral - [46..112)::66 - [[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        LeftBracket;[[];
+                                        Text;[a-z0-9];
+                                        RightBracket;[]];
+                                        Text;[(];
+                                        LeftBracket;[[];
+                                        Text;[a-z0-9-];
+                                        RightBracket;[]];
+                                        Text;[*];
+                                        LeftBracket;[[];
+                                        Text;[a-z0-9];
+                                        RightBracket;[]];
+                                        Text;[)];
+                                        QuestionMark;[?];
+                                        Text;[\.(];
+                                        LeftBracket;[[];
+                                        Text;[a-z0-9];
+                                        RightBracket;[]];
+                                        Text;[(];
+                                        LeftBracket;[[];
+                                        Text;[a-z0-9-];
+                                        RightBracket;[]];
+                                        Text;[*];
+                                        LeftBracket;[[];
+                                        Text;[a-z0-9];
+                                        RightBracket;[]];
+                                        Text;[)];
+                                        QuestionMark;[?];
+                                        Text;[)*$];
+                                        ForwardSlash;[/];
+                                        Text;[i];
+                            MarkupTextLiteral - [112..113)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                DoubleQuote;["];
+                        MarkupTextLiteral - [113..116)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                            ForwardSlash;[/];
+                            CloseAngle;[>];
+                CSharpStatementLiteral - [116..116)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Marker;[];
+            RazorMetaCode - [116..117)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.cspans.txt
index 6f209128d6..59e39ab54c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.cspans.txt
@@ -18,17 +18,17 @@ Markup span at (33:0,33 [1] ) (Accepts:None) - Parent: Markup block at (33:0,33
 Markup span at (34:0,34 [1] ) (Accepts:None) - Parent: Markup block at (33:0,33 [2] )
 Markup span at (35:0,35 [0] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [13] )
 Transition span at (35:0,35 [1] ) (Accepts:None) - Parent: Expression block at (35:0,35 [13] )
-Code span at (36:0,36 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (35:0,35 [13] )
+Code span at (36:0,36 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (35:0,35 [13] )
 Markup span at (48:0,48 [1] ) (Accepts:Any) - Parent: Markup block at (21:0,21 [28] )
 Markup span at (49:0,49 [6] ) (Accepts:Any) - Parent: Markup block at (49:0,49 [22] )
 Transition span at (55:0,55 [1] ) (Accepts:None) - Parent: Expression block at (55:0,55 [13] )
-Code span at (56:0,56 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (55:0,55 [13] )
+Code span at (56:0,56 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (55:0,55 [13] )
 Markup span at (68:0,68 [1] ) (Accepts:None) - Parent: Markup block at (68:0,68 [2] )
 Markup span at (69:0,69 [1] ) (Accepts:None) - Parent: Markup block at (68:0,68 [2] )
 Markup span at (70:0,70 [1] ) (Accepts:Any) - Parent: Markup block at (49:0,49 [22] )
 Markup span at (71:0,71 [6] ) (Accepts:Any) - Parent: Markup block at (71:0,71 [23] )
 Transition span at (77:0,77 [1] ) (Accepts:None) - Parent: Expression block at (77:0,77 [13] )
-Code span at (78:0,78 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (77:0,77 [13] )
+Code span at (78:0,78 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (77:0,77 [13] )
 Markup span at (90:0,90 [2] ) (Accepts:None) - Parent: Markup block at (90:0,90 [3] )
 Markup span at (92:0,92 [1] ) (Accepts:None) - Parent: Markup block at (90:0,90 [3] )
 Markup span at (93:0,93 [1] ) (Accepts:Any) - Parent: Markup block at (71:0,71 [23] )
@@ -37,7 +37,7 @@ Markup span at (100:0,100 [1] ) (Accepts:None) - Parent: Markup block at (100:0,
 Markup span at (101:0,101 [1] ) (Accepts:None) - Parent: Markup block at (100:0,100 [2] )
 Markup span at (102:0,102 [0] ) (Accepts:Any) - Parent: Markup block at (102:0,102 [13] )
 Transition span at (102:0,102 [1] ) (Accepts:None) - Parent: Expression block at (102:0,102 [13] )
-Code span at (103:0,103 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (102:0,102 [13] )
+Code span at (103:0,103 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (102:0,102 [13] )
 Markup span at (115:0,115 [1] ) (Accepts:Any) - Parent: Markup block at (94:0,94 [22] )
 Markup span at (116:0,116 [3] ) (Accepts:None) - Parent: Tag block at (1:0,1 [118] )
 Code span at (119:0,119 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [120] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
index c50182aa59..6415ccab3a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
@@ -1,144 +1,188 @@
-Statement block - Gen<None> - 120 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 118 - (1:0,1)
-        Tag block - Gen<None> - 118 - (1:0,1)
-            Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[span];
-            Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(20:0,20)> - 15 - (6:0,6)
-                Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[foo];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.SingleQuote;['];
-                Markup block - Gen<None> - 2 - (12:0,12)
-                    Markup span - Gen<LitAttr:@(12:0,12)> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                Markup block - Gen<DynAttr:@(14:0,14)> - 6 - (14:0,14)
-                    Markup span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                        HtmlTokenType.Unknown;[];
-                    Expression block - Gen<Expr> - 6 - (14:0,14)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-                            CSharpTokenType.LeftParenthesis;[(];
-                        Code span - Gen<Expr> - [2+3] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:3
-                            CSharpTokenType.IntegerLiteral;[2];
-                            CSharpTokenType.Plus;[+];
-                            CSharpTokenType.IntegerLiteral;[3];
-                        MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:1
-                            CSharpTokenType.RightParenthesis;[)];
-                Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-                    HtmlTokenType.SingleQuote;['];
-            Markup block - Gen<Attr:bar, bar='@(21:0,21),'@(48:0,48)> - 28 - (21:0,21)
-                Markup span - Gen<None> - [ bar='] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[bar];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.SingleQuote;['];
-                Markup block - Gen<DynAttr:@(27:0,27)> - 6 - (27:0,27)
-                    Expression block - Gen<Expr> - 6 - (27:0,27)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (28:0,28) - Tokens:1
-                            CSharpTokenType.LeftParenthesis;[(];
-                        Code span - Gen<Expr> - [2+3] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:3
-                            CSharpTokenType.IntegerLiteral;[2];
-                            CSharpTokenType.Plus;[+];
-                            CSharpTokenType.IntegerLiteral;[3];
-                        MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:1
-                            CSharpTokenType.RightParenthesis;[)];
-                Markup block - Gen<None> - 2 - (33:0,33)
-                    Markup span - Gen<LitAttr:@(33:0,33)> - [@] - SpanEditHandler;Accepts:None - (33:0,33) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (34:0,34) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                Markup block - Gen<DynAttr:@(35:0,35)> - 13 - (35:0,35)
-                    Markup span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1
-                        HtmlTokenType.Unknown;[];
-                    Expression block - Gen<Expr> - 13 - (35:0,35)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (35:0,35) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (36:0,36) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-                Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (48:0,48) - Tokens:1
-                    HtmlTokenType.SingleQuote;['];
-            Markup block - Gen<Attr:baz, baz='@(49:0,49),'@(70:0,70)> - 22 - (49:0,49)
-                Markup span - Gen<None> - [ baz='] - SpanEditHandler;Accepts:Any - (49:0,49) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[baz];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.SingleQuote;['];
-                Markup block - Gen<DynAttr:@(55:0,55)> - 13 - (55:0,55)
-                    Expression block - Gen<Expr> - 13 - (55:0,55)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (55:0,55) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (56:0,56) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-                Markup block - Gen<None> - 2 - (68:0,68)
-                    Markup span - Gen<LitAttr:@(68:0,68)> - [@] - SpanEditHandler;Accepts:None - (68:0,68) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (69:0,69) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (70:0,70) - Tokens:1
-                    HtmlTokenType.SingleQuote;['];
-            Markup block - Gen<Attr:bat, bat='@(71:0,71),'@(93:0,93)> - 23 - (71:0,71)
-                Markup span - Gen<None> - [ bat='] - SpanEditHandler;Accepts:Any - (71:0,71) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[bat];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.SingleQuote;['];
-                Markup block - Gen<DynAttr:@(77:0,77)> - 13 - (77:0,77)
-                    Expression block - Gen<Expr> - 13 - (77:0,77)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (77:0,77) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (78:0,78) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-                Markup block - Gen<None> - 3 - (90:0,90)
-                    Markup span - Gen<LitAttr: @(90:0,90)> - [ @] - SpanEditHandler;Accepts:None - (90:0,90) - Tokens:2
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (92:0,92) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (93:0,93) - Tokens:1
-                    HtmlTokenType.SingleQuote;['];
-            Markup block - Gen<Attr:zoo, zoo='@(94:0,94),'@(115:0,115)> - 22 - (94:0,94)
-                Markup span - Gen<None> - [ zoo='] - SpanEditHandler;Accepts:Any - (94:0,94) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[zoo];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.SingleQuote;['];
-                Markup block - Gen<None> - 2 - (100:0,100)
-                    Markup span - Gen<LitAttr:@(100:0,100)> - [@] - SpanEditHandler;Accepts:None - (100:0,100) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (101:0,101) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                Markup block - Gen<DynAttr:@(102:0,102)> - 13 - (102:0,102)
-                    Markup span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (102:0,102) - Tokens:1
-                        HtmlTokenType.Unknown;[];
-                    Expression block - Gen<Expr> - 13 - (102:0,102)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (102:0,102) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (103:0,103) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-                Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (115:0,115) - Tokens:1
-                    HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (116:0,116) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (119:0,119) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (119:0,119) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..120)::120 - [{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.Now' baz='@DateTime.Now@@' bat='@DateTime.Now @@' zoo='@@@DateTime.Now' />}]
+    CSharpStatement - [0..120)::120
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..120)::120
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..119)::118
+                MarkupBlock - [1..119)::118
+                    MarkupTagBlock - [1..119)::118 - [<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.Now' baz='@DateTime.Now@@' bat='@DateTime.Now @@' zoo='@@@DateTime.Now' />]
+                        MarkupTextLiteral - [1..6)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            Text;[span];
+                        MarkupAttributeBlock - [6..21)::15 - [ foo='@@@(2+3)']
+                            MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                            Equals;[=];
+                            MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                            GenericBlock - [12..20)::8
+                                MarkupBlock - [12..14)::2
+                                    MarkupTextLiteral - [12..13)::1 - [@] - Gen<LitAttr:@(12:0,12)> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    MarkupEphemeralTextLiteral - [13..14)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                MarkupDynamicAttributeValue - [14..20)::6 - [@(2+3)]
+                                    GenericBlock - [14..20)::6
+                                        MarkupTextLiteral - [14..14)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Marker;[];
+                                        CSharpCodeBlock - [14..20)::6
+                                            CSharpExplicitExpression - [14..20)::6
+                                                CSharpTransition - [14..15)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                CSharpExplicitExpressionBody - [15..20)::5
+                                                    RazorMetaCode - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        LeftParenthesis;[(];
+                                                    CSharpCodeBlock - [16..19)::3
+                                                        CSharpExpressionLiteral - [16..19)::3 - [2+3] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                                                            IntegerLiteral;[2];
+                                                            Plus;[+];
+                                                            IntegerLiteral;[3];
+                                                    RazorMetaCode - [19..20)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        RightParenthesis;[)];
+                            MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                        MarkupAttributeBlock - [21..49)::28 - [ bar='@(2+3)@@@DateTime.Now']
+                            MarkupTextLiteral - [21..22)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [22..25)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[bar];
+                            Equals;[=];
+                            MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                            GenericBlock - [27..48)::21
+                                MarkupDynamicAttributeValue - [27..33)::6 - [@(2+3)]
+                                    GenericBlock - [27..33)::6
+                                        CSharpCodeBlock - [27..33)::6
+                                            CSharpExplicitExpression - [27..33)::6
+                                                CSharpTransition - [27..28)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                CSharpExplicitExpressionBody - [28..33)::5
+                                                    RazorMetaCode - [28..29)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        LeftParenthesis;[(];
+                                                    CSharpCodeBlock - [29..32)::3
+                                                        CSharpExpressionLiteral - [29..32)::3 - [2+3] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                                                            IntegerLiteral;[2];
+                                                            Plus;[+];
+                                                            IntegerLiteral;[3];
+                                                    RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        RightParenthesis;[)];
+                                MarkupBlock - [33..35)::2
+                                    MarkupTextLiteral - [33..34)::1 - [@] - Gen<LitAttr:@(33:0,33)> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    MarkupEphemeralTextLiteral - [34..35)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                MarkupDynamicAttributeValue - [35..48)::13 - [@DateTime.Now]
+                                    GenericBlock - [35..48)::13
+                                        MarkupTextLiteral - [35..35)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Marker;[];
+                                        CSharpCodeBlock - [35..48)::13
+                                            CSharpImplicitExpression - [35..48)::13
+                                                CSharpTransition - [35..36)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                CSharpImplicitExpressionBody - [36..48)::12
+                                                    CSharpCodeBlock - [36..48)::12
+                                                        CSharpExpressionLiteral - [36..48)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                            Identifier;[DateTime];
+                                                            Dot;[.];
+                                                            Identifier;[Now];
+                            MarkupTextLiteral - [48..49)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                        MarkupAttributeBlock - [49..71)::22 - [ baz='@DateTime.Now@@']
+                            MarkupTextLiteral - [49..50)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [50..53)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[baz];
+                            Equals;[=];
+                            MarkupTextLiteral - [54..55)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                            GenericBlock - [55..70)::15
+                                MarkupDynamicAttributeValue - [55..68)::13 - [@DateTime.Now]
+                                    GenericBlock - [55..68)::13
+                                        CSharpCodeBlock - [55..68)::13
+                                            CSharpImplicitExpression - [55..68)::13
+                                                CSharpTransition - [55..56)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                CSharpImplicitExpressionBody - [56..68)::12
+                                                    CSharpCodeBlock - [56..68)::12
+                                                        CSharpExpressionLiteral - [56..68)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                            Identifier;[DateTime];
+                                                            Dot;[.];
+                                                            Identifier;[Now];
+                                MarkupBlock - [68..70)::2
+                                    MarkupTextLiteral - [68..69)::1 - [@] - Gen<LitAttr:@(68:0,68)> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    MarkupEphemeralTextLiteral - [69..70)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                            MarkupTextLiteral - [70..71)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                        MarkupAttributeBlock - [71..94)::23 - [ bat='@DateTime.Now @@']
+                            MarkupTextLiteral - [71..72)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [72..75)::3 - [bat] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[bat];
+                            Equals;[=];
+                            MarkupTextLiteral - [76..77)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                            GenericBlock - [77..93)::16
+                                MarkupDynamicAttributeValue - [77..90)::13 - [@DateTime.Now]
+                                    GenericBlock - [77..90)::13
+                                        CSharpCodeBlock - [77..90)::13
+                                            CSharpImplicitExpression - [77..90)::13
+                                                CSharpTransition - [77..78)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                CSharpImplicitExpressionBody - [78..90)::12
+                                                    CSharpCodeBlock - [78..90)::12
+                                                        CSharpExpressionLiteral - [78..90)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                            Identifier;[DateTime];
+                                                            Dot;[.];
+                                                            Identifier;[Now];
+                                MarkupBlock - [90..93)::3
+                                    MarkupTextLiteral - [90..92)::2 - [ @] - Gen<LitAttr: @(90:0,90)> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        Transition;[@];
+                                    MarkupEphemeralTextLiteral - [92..93)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                            MarkupTextLiteral - [93..94)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                        MarkupAttributeBlock - [94..116)::22 - [ zoo='@@@DateTime.Now']
+                            MarkupTextLiteral - [94..95)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [95..98)::3 - [zoo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[zoo];
+                            Equals;[=];
+                            MarkupTextLiteral - [99..100)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                            GenericBlock - [100..115)::15
+                                MarkupBlock - [100..102)::2
+                                    MarkupTextLiteral - [100..101)::1 - [@] - Gen<LitAttr:@(100:0,100)> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    MarkupEphemeralTextLiteral - [101..102)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                MarkupDynamicAttributeValue - [102..115)::13 - [@DateTime.Now]
+                                    GenericBlock - [102..115)::13
+                                        MarkupTextLiteral - [102..102)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Marker;[];
+                                        CSharpCodeBlock - [102..115)::13
+                                            CSharpImplicitExpression - [102..115)::13
+                                                CSharpTransition - [102..103)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                CSharpImplicitExpressionBody - [103..115)::12
+                                                    CSharpCodeBlock - [103..115)::12
+                                                        CSharpExpressionLiteral - [103..115)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                            Identifier;[DateTime];
+                                                            Dot;[.];
+                                                            Identifier;[Now];
+                            MarkupTextLiteral - [115..116)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                        MarkupTextLiteral - [116..119)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                            ForwardSlash;[/];
+                            CloseAngle;[>];
+                CSharpStatementLiteral - [119..119)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Marker;[];
+            RazorMetaCode - [119..120)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.stree.txt
index 2f4c6d6bfd..d9a8d250fa 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.stree.txt
@@ -1,21 +1,31 @@
-Statement block - Gen<None> - 14 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 13 - (1:0,1)
-        Tag block - Gen<None> - 13 - (1:0,1)
-            Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[span];
-            Markup block - Gen<Attr:foo, foo='@(6:0,6),@(14:0,14)> - 8 - (6:0,6)
-                Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[foo];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.SingleQuote;['];
-                Markup block - Gen<None> - 2 - (12:0,12)
-                    Markup span - Gen<LitAttr:@(12:0,12)> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-        Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-            HtmlTokenType.Unknown;[];
+CSharpCodeBlock - [0..14)::14 - [{<span foo='@@]
+    CSharpStatement - [0..14)::14
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..14)::14
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..14)::13
+                MarkupBlock - [1..14)::13
+                    MarkupTagBlock - [1..14)::13 - [<span foo='@@]
+                        MarkupTextLiteral - [1..6)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            Text;[span];
+                        MarkupAttributeBlock - [6..14)::8 - [ foo='@@]
+                            MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                            Equals;[=];
+                            MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                            GenericBlock - [12..14)::2
+                                MarkupBlock - [12..14)::2
+                                    MarkupTextLiteral - [12..13)::1 - [@] - Gen<LitAttr:@(12:0,12)> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    MarkupEphemeralTextLiteral - [13..14)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                    MarkupTextLiteral - [14..14)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Marker;[];
+            RazorMetaCode - [14..14)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.cspans.txt
index 0625febbf9..104cc1143d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.cspans.txt
@@ -2,10 +2,10 @@ MetaCode span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0
 Markup span at (1:0,1 [5] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [18] )
 Markup span at (6:0,6 [6] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [10] )
 Transition span at (12:0,12 [1] ) (Accepts:None) - Parent: Expression block at (12:0,12 [1] )
-Code span at (13:0,13 [0] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (12:0,12 [1] )
+Code span at (13:0,13 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (12:0,12 [1] )
 Markup span at (13:0,13 [1] ) (Accepts:Any) - Parent: Markup block at (13:0,13 [2] )
 Transition span at (14:0,14 [1] ) (Accepts:None) - Parent: Expression block at (14:0,14 [1] )
-Code span at (15:0,15 [0] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (14:0,14 [1] )
+Code span at (15:0,15 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (14:0,14 [1] )
 Markup span at (15:0,15 [1] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [10] )
 Markup span at (16:0,16 [3] ) (Accepts:None) - Parent: Tag block at (1:0,1 [18] )
 Code span at (19:0,19 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [20] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
index cfd73bfa96..a9904ed71d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
@@ -1,38 +1,54 @@
-Statement block - Gen<None> - 20 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 18 - (1:0,1)
-        Tag block - Gen<None> - 18 - (1:0,1)
-            Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[span];
-            Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(15:0,15)> - 10 - (6:0,6)
-                Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[foo];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.SingleQuote;['];
-                Markup block - Gen<DynAttr:@(12:0,12)> - 1 - (12:0,12)
-                    Expression block - Gen<Expr> - 1 - (12:0,12)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (13:0,13) - Tokens:1
-                            CSharpTokenType.Unknown;[];
-                Markup block - Gen<DynAttr: @(13:0,13)> - 2 - (13:0,13)
-                    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                        HtmlTokenType.WhiteSpace;[ ];
-                    Expression block - Gen<Expr> - 1 - (14:0,14)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (15:0,15) - Tokens:1
-                            CSharpTokenType.Unknown;[];
-                Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-                    HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..20)::20 - [{<span foo='@ @' />}]
+    CSharpStatement - [0..20)::20
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..20)::20
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..19)::18
+                MarkupBlock - [1..19)::18
+                    MarkupTagBlock - [1..19)::18 - [<span foo='@ @' />]
+                        MarkupTextLiteral - [1..6)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            Text;[span];
+                        MarkupAttributeBlock - [6..16)::10 - [ foo='@ @']
+                            MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                            Equals;[=];
+                            MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                            GenericBlock - [12..15)::3
+                                MarkupDynamicAttributeValue - [12..13)::1 - [@]
+                                    GenericBlock - [12..13)::1
+                                        CSharpCodeBlock - [12..13)::1
+                                            CSharpImplicitExpression - [12..13)::1
+                                                CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                CSharpImplicitExpressionBody - [13..13)::0
+                                                    CSharpCodeBlock - [13..13)::0
+                                                        CSharpExpressionLiteral - [13..13)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                            Marker;[];
+                                MarkupDynamicAttributeValue - [13..15)::2 - [ @]
+                                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    GenericBlock - [14..15)::1
+                                        CSharpCodeBlock - [14..15)::1
+                                            CSharpImplicitExpression - [14..15)::1
+                                                CSharpTransition - [14..15)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                CSharpImplicitExpressionBody - [15..15)::0
+                                                    CSharpCodeBlock - [15..15)::0
+                                                        CSharpExpressionLiteral - [15..15)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                            Marker;[];
+                            MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                        MarkupTextLiteral - [16..19)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                            ForwardSlash;[/];
+                            CloseAngle;[>];
+                CSharpStatementLiteral - [19..19)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Marker;[];
+            RazorMetaCode - [19..20)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
deleted file mode 100644
index 93afe6d654..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Directive block - Gen<None> - 18 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[addTagHelper];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<AddTagHelper:{Foo";Foo";;} [RZ1000(17:0,17 [1] ), RZ1019(14:0,14 [4] ), RZ1036(14:0,14 [4] )]> - [Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Tokens:2
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.StringLiteral;["];RZ1000(17:0,17 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.stree.txt
deleted file mode 100644
index c6f41fdd2d..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<None> - 17 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[addTagHelper];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<AddTagHelper:{Foo;Foo;;} [RZ1036(14:0,14 [3] )]> - [Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Tokens:1
-        CSharpTokenType.Identifier;[Foo];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_NoValue_Invalid.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_NoValue_Invalid.stree.txt
deleted file mode 100644
index 2008fd4abe..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_NoValue_Invalid.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<None> - 16 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[addTagHelper];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<AddTagHelper:{"";;;} [RZ1036(15:0,15 [1] )]> - [""] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Tokens:1
-        CSharpTokenType.StringLiteral;[""];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_RequiresValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_RequiresValue.stree.txt
deleted file mode 100644
index f3c8121f69..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_RequiresValue.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<None> - 14 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[addTagHelper];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<AddTagHelper:{;;;} [RZ1018(1:0,1 [12] ), RZ1036(14:0,14 [1] )]> - [] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Tokens:1
-        CSharpTokenType.Unknown;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.stree.txt
deleted file mode 100644
index 38b2a96f76..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<None> - 22 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[addTagHelper];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<AddTagHelper:{'*, Foo';'*, Foo';;} [RZ1036(14:0,14 [8] )]> - ['*, Foo'] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Tokens:1
-        CSharpTokenType.CharacterLiteral;['*, Foo'];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
deleted file mode 100644
index 1067f0e6c2..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<None> - 18 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[addTagHelper];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<AddTagHelper:{"Foo;"Foo;;} [RZ1000(14:0,14 [1] ), RZ1019(14:0,14 [4] ), RZ1036(14:0,14 [4] )]> - ["Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Tokens:1
-        CSharpTokenType.StringLiteral;["Foo];RZ1000(14:0,14 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SupportsSpaces.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SupportsSpaces.stree.txt
deleted file mode 100644
index 7b55abb278..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SupportsSpaces.stree.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Directive block - Gen<None> - 32 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[addTagHelper];
-    Markup span - Gen<None> - [     ] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-        CSharpTokenType.WhiteSpace;[     ];
-    Code span - Gen<AddTagHelper:{Foo,   Bar;Foo,   Bar;Foo;Bar}> - [Foo,   Bar    ] - SpanEditHandler;Accepts:AnyExceptNewline - (18:0,18) - Tokens:5
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[   ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[    ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt
deleted file mode 100644
index bae8b5002c..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<None> - 19 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[addTagHelper];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<AddTagHelper:{"Foo";Foo;;} [RZ1036(15:0,15 [3] )]> - ["Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Tokens:1
-        CSharpTokenType.StringLiteral;["Foo"];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt
deleted file mode 100644
index dd5b3b78c7..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Code span at (0:0,0 [4] ) (Accepts:Any) - Parent: Directive block at (0:0,0 [26] )
-Transition span at (4:1,2 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [26] )
-MetaCode span at (5:1,3 [12] ) (Accepts:None) - Parent: Directive block at (0:0,0 [26] )
-Markup span at (17:1,15 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [26] )
-Code span at (18:1,16 [8] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [26] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt
deleted file mode 100644
index 642f0611e8..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Directive block - Gen<None> - 26 - (0:0,0)
-    Code span - Gen<Stmt> - [LF  ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[  ];
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (4:1,2) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [addTagHelper] - SpanEditHandler;Accepts:None - (5:1,3) - Tokens:1
-        CSharpTokenType.Identifier;[addTagHelper];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (17:1,15) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<AddTagHelper:{"*, Foo";*, Foo;*;Foo}> - ["*, Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (18:1,16) - Tokens:1
-        CSharpTokenType.StringLiteral;["*, Foo"];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.cspans.txt
deleted file mode 100644
index a5e15b9d8e..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.cspans.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-MetaCode span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [28] )
-Code span at (1:0,1 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [28] )
-Transition span at (3:0,3 [1] ) (Accepts:None) - Parent: Directive block at (3:0,3 [22] )
-MetaCode span at (4:0,4 [12] ) (Accepts:None) - Parent: Directive block at (3:0,3 [22] )
-Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (3:0,3 [22] )
-Code span at (17:0,17 [8] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (3:0,3 [22] )
-Code span at (25:0,25 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [28] )
-MetaCode span at (27:1,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [28] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.stree.txt
deleted file mode 100644
index 2d4ada75c3..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.stree.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Statement block - Gen<None> - 28 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [  ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:1
-        CSharpTokenType.WhiteSpace;[  ];
-    Directive block - Gen<None> - 22 - (3:0,3)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [addTagHelper] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:1
-            CSharpTokenType.Identifier;[addTagHelper];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<AddTagHelper:{"*, Foo";*, Foo;*;Foo} [RZ2005(4:0,4 [12] )]> - ["*, Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1
-            CSharpTokenType.StringLiteral;["*, Foo"];
-    Code span - Gen<Stmt> - [LF] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
-        CSharpTokenType.NewLine;[LF];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (27:1,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.cspans.txt
deleted file mode 100644
index 39e6ab11a0..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.cspans.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [176] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [176] )
-Code span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [176] )
-Code span at (8:0,8 [7] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [176] )
-Code span at (15:0,15 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [176] )
-Code span at (16:0,16 [9] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [176] )
-Code span at (25:0,25 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [176] )
-Code span at (26:0,26 [21] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [176] )
-Code span at (47:0,47 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [176] )
-Code span at (48:0,48 [29] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [176] )
-Code span at (77:0,77 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [176] )
-Code span at (78:0,78 [31] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [176] )
-Code span at (109:0,109 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [176] )
-Code span at (110:0,110 [66] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [176] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.stree.txt
deleted file mode 100644
index 9c4daa1e93..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.stree.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted}> - 176 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Type;Opt:False}> - [string?] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:2
-        CSharpTokenType.Keyword;[string];
-        CSharpTokenType.QuestionMark;[?];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (15:0,15) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Type;Opt:False}> - [string?[]] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (16:0,16) - Tokens:4
-        CSharpTokenType.Keyword;[string];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.RightBracket;[]];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (25:0,25) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Type;Opt:False}> - [global::System.Int32?] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (26:0,26) - Tokens:6
-        CSharpTokenType.Identifier;[global];
-        CSharpTokenType.DoubleColon;[::];
-        CSharpTokenType.Identifier;[System];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Int32];
-        CSharpTokenType.QuestionMark;[?];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (47:0,47) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Type;Opt:False}> - [KeyValuePair<string, string>?] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (48:0,48) - Tokens:8
-        CSharpTokenType.Identifier;[KeyValuePair];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.Keyword;[string];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[string];
-        CSharpTokenType.GreaterThan;[>];
-        CSharpTokenType.QuestionMark;[?];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (77:0,77) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Type;Opt:False}> - [KeyValuePair<string, string>?[]] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (78:0,78) - Tokens:10
-        CSharpTokenType.Identifier;[KeyValuePair];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.Keyword;[string];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[string];
-        CSharpTokenType.GreaterThan;[>];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.RightBracket;[]];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (109:0,109) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Type;Opt:False}> - [global::System.Collections.Generic.KeyValuePair<string, string>?[]] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (110:0,110) - Tokens:18
-        CSharpTokenType.Identifier;[global];
-        CSharpTokenType.DoubleColon;[::];
-        CSharpTokenType.Identifier;[System];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Collections];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Generic];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[KeyValuePair];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.Keyword;[string];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[string];
-        CSharpTokenType.GreaterThan;[>];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.RightBracket;[]];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.cspans.txt
deleted file mode 100644
index 0ab29a7f29..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.cspans.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [246] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [246] )
-Code span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [246] )
-Code span at (8:0,8 [11] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [246] )
-Code span at (19:0,19 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [246] )
-Code span at (20:0,20 [20] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [246] )
-Code span at (40:0,40 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [246] )
-Code span at (41:0,41 [29] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [246] )
-Code span at (70:0,70 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [246] )
-Code span at (71:0,71 [37] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [246] )
-Code span at (108:0,108 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [246] )
-Code span at (109:0,109 [36] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [246] )
-Code span at (145:0,145 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [246] )
-Code span at (146:0,146 [100] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [246] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.stree.txt
deleted file mode 100644
index f9e21e7409..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.stree.txt
+++ /dev/null
@@ -1,155 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted}> - 246 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Type;Opt:False}> - [(bool, int)] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:6
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[bool];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.RightParenthesis;[)];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (19:0,19) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Type;Opt:False}> - [(int aa, string bb)?] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (20:0,20) - Tokens:11
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[aa];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[string];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bb];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.QuestionMark;[?];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (40:0,40) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Type;Opt:False}> - [(  int?   q   ,  bool   w   )] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (41:0,41) - Tokens:14
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.WhiteSpace;[  ];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.WhiteSpace;[   ];
-        CSharpTokenType.Identifier;[q];
-        CSharpTokenType.WhiteSpace;[   ];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[  ];
-        CSharpTokenType.Keyword;[bool];
-        CSharpTokenType.WhiteSpace;[   ];
-        CSharpTokenType.Identifier;[w];
-        CSharpTokenType.WhiteSpace;[   ];
-        CSharpTokenType.RightParenthesis;[)];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (70:0,70) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Type;Opt:False}> - [( int  ?  q, bool ?w ,(long ?  [])) ?] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (71:0,71) - Tokens:26
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[  ];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.WhiteSpace;[  ];
-        CSharpTokenType.Identifier;[q];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[bool];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.Identifier;[w];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[long];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.WhiteSpace;[  ];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.RightBracket;[]];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.QuestionMark;[?];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (108:0,108) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Type;Opt:False}> - [(List<(int, string)?> aa, string bb)] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (109:0,109) - Tokens:19
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[List];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[string];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.GreaterThan;[>];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[aa];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[string];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bb];
-        CSharpTokenType.RightParenthesis;[)];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (145:0,145) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Type;Opt:False}> - [(string ss, (int u, List<(string, int)> k, (Char c, bool b, List<int> l)), global::System.Int32[] a)] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (146:0,146) - Tokens:56
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[string];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[ss];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[u];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[List];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[string];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.GreaterThan;[>];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[k];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Char];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[c];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[bool];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[b];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[List];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.GreaterThan;[>];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[l];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[global];
-        CSharpTokenType.DoubleColon;[::];
-        CSharpTokenType.Identifier;[System];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Int32];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.RightBracket;[]];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[a];
-        CSharpTokenType.RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.cspans.txt
deleted file mode 100644
index 38b5d16324..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.cspans.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [23] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [23] )
-Code span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [23] )
-Code span at (8:0,8 [12] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [23] )
-None span at (20:0,20 [3] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [23] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.stree.txt
deleted file mode 100644
index 6116fb54b7..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.stree.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted}> - 23 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Type;Opt:False}> - [(bool, int?)] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:7
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[bool];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.RightParenthesis;[)];
-    None span - Gen<None> - [   ] - SpanEditHandler;Accepts:WhiteSpace - (20:0,20) - Tokens:1
-        CSharpTokenType.WhiteSpace;[   ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.cspans.txt
deleted file mode 100644
index 50c951eaaa..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.cspans.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [67] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [67] )
-Code span at (7:0,7 [4] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [67] )
-Code span at (11:0,11 [34] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [67] )
-Code span at (45:0,45 [7] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [67] )
-Code span at (52:0,52 [11] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [67] )
-None span at (63:0,63 [4] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [67] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.stree.txt
deleted file mode 100644
index 28cca39386..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.stree.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted}> - 67 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Code span - Gen<None> - [    ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[    ];
-    Code span - Gen<DirectiveToken {;Type;Opt:False}> - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (11:0,11) - Tokens:7
-        CSharpTokenType.Identifier;[System];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Text];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Encoding];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[ASCIIEncoding];
-    Code span - Gen<None> - [       ] - SpanEditHandler;Accepts:WhiteSpace - (45:0,45) - Tokens:1
-        CSharpTokenType.WhiteSpace;[       ];
-    Code span - Gen<DirectiveToken {;Member;Opt:False}> - [Some_Member] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (52:0,52) - Tokens:1
-        CSharpTokenType.Identifier;[Some_Member];
-    None span - Gen<None> - [    ] - SpanEditHandler;Accepts:WhiteSpace - (63:0,63) - Tokens:1
-        CSharpTokenType.WhiteSpace;[    ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.cspans.txt
deleted file mode 100644
index f8535e27f8..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.cspans.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-Code span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.stree.txt
deleted file mode 100644
index 1fee4f1796..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.stree.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted} [RZ1014(8:0,8 [7] )]> - 8 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.cspans.txt
deleted file mode 100644
index f8535e27f8..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.cspans.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-Code span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.stree.txt
deleted file mode 100644
index 1fee4f1796..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.stree.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted} [RZ1014(8:0,8 [7] )]> - 8 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.cspans.txt
deleted file mode 100644
index f8535e27f8..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.cspans.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-Code span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.stree.txt
deleted file mode 100644
index 1fee4f1796..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.stree.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted} [RZ1014(8:0,8 [7] )]> - 8 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.cspans.txt
deleted file mode 100644
index f8535e27f8..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.cspans.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-Code span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.stree.txt
deleted file mode 100644
index 1fee4f1796..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.stree.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted} [RZ1014(8:0,8 [7] )]> - 8 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.cspans.txt
deleted file mode 100644
index 08eda0a4f3..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.cspans.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
-Markup span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [16] )
-Code span at (8:0,8 [7] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [16] )
-None span at (15:0,15 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [16] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.stree.txt
deleted file mode 100644
index b108f825f7..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.stree.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted} [RZ1017(16:0,16 [7] )]> - 16 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;String;Opt:False}> - ["hello"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1
-        CSharpTokenType.StringLiteral;["hello"];
-    None span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (15:0,15) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.cspans.txt
deleted file mode 100644
index f8535e27f8..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.cspans.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-Code span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.stree.txt
deleted file mode 100644
index 66c8f9e22b..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.stree.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted} [RZ1015(8:0,8 [1] )]> - 8 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.cspans.txt
deleted file mode 100644
index 41583f7ddd..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.cspans.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [15] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [15] )
-Markup span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [15] )
-Code span at (8:0,8 [7] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [15] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.stree.txt
deleted file mode 100644
index 785e17335e..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<Directive:{custom;CodeBlock;Unrestricted} [RZ1012(15:0,15 [1] )]> - 15 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;String;Opt:False}> - ["Hello"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1
-        CSharpTokenType.StringLiteral;["Hello"];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.cspans.txt
deleted file mode 100644
index a1cf9382b0..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.cspans.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
-Markup span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [16] )
-Code span at (8:0,8 [7] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [16] )
-Markup span at (15:0,15 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [16] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.stree.txt
deleted file mode 100644
index d4346b5102..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.stree.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Directive block - Gen<Directive:{custom;CodeBlock;Unrestricted} [RZ1017(16:0,16 [5] )]> - 16 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;String;Opt:False}> - ["Hello"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1
-        CSharpTokenType.StringLiteral;["Hello"];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (15:0,15) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.stree.txt
deleted file mode 100644
index 15be232395..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.stree.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Directive block - Gen<Directive:{custom;CodeBlock;Unrestricted} [RZ1006(16:0,16 [1] )]> - 17 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;String;Opt:False}> - ["Hello"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1
-        CSharpTokenType.StringLiteral;["Hello"];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (15:0,15) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (16:0,16) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (17:0,17) - Tokens:1
-        CSharpTokenType.Unknown;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.stree.txt
deleted file mode 100644
index f9f16307e7..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.stree.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-Markup block - Gen<None> - 85 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{custom;SingleLine;FileScopedMultipleOccurring}> - 44 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[custom];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {;Type;Opt:False}> - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:7
-            CSharpTokenType.Identifier;[System];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[Text];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[Encoding];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[ASCIIEncoding];
-        Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:WhiteSpace - (42:0,42) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (44:1,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{custom;SingleLine;FileScopedMultipleOccurring}> - 41 - (44:1,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (44:1,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (45:1,1) - Tokens:1
-            CSharpTokenType.Identifier;[custom];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (51:1,7) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {;Type;Opt:False}> - [System.Text.Encoding.UTF8Encoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (52:1,8) - Tokens:7
-            CSharpTokenType.Identifier;[System];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[Text];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[Encoding];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[UTF8Encoding];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (85:1,41) - Tokens:1
-        HtmlTokenType.Unknown;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.stree.txt
deleted file mode 100644
index ed97532104..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.stree.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-Markup block - Gen<None> - 85 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{custom;SingleLine;FileScopedSinglyOccurring}> - 44 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[custom];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {;Type;Opt:False}> - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:7
-            CSharpTokenType.Identifier;[System];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[Text];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[Encoding];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[ASCIIEncoding];
-        Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:WhiteSpace - (42:0,42) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (44:1,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{custom;SingleLine;FileScopedSinglyOccurring} [RZ2001(44:1,0 [7] )]> - 41 - (44:1,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (44:1,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (45:1,1) - Tokens:1
-            CSharpTokenType.Identifier;[custom];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (51:1,7) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {;Type;Opt:False}> - [System.Text.Encoding.UTF8Encoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (52:1,8) - Tokens:7
-            CSharpTokenType.Identifier;[System];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[Text];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[Encoding];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[UTF8Encoding];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (85:1,41) - Tokens:1
-        HtmlTokenType.Unknown;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.stree.txt
deleted file mode 100644
index dabeb41382..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.stree.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Markup block - Gen<None> - 59 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{custom;SingleLine;FileScopedSinglyOccurring}> - 44 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[custom];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {;Type;Opt:False}> - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:7
-            CSharpTokenType.Identifier;[System];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[Text];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[Encoding];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[ASCIIEncoding];
-        Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:WhiteSpace - (42:0,42) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (44:1,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{something;SingleLine;FileScopedMultipleOccurring}> - 15 - (44:1,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (44:1,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [something] - SpanEditHandler;Accepts:None - (45:1,1) - Tokens:1
-            CSharpTokenType.Identifier;[something];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (54:1,10) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {;Member;Opt:False}> - [Else] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (55:1,11) - Tokens:1
-            CSharpTokenType.Identifier;[Else];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (59:1,15) - Tokens:1
-        HtmlTokenType.Unknown;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.stree.txt
deleted file mode 100644
index 203fd7aee0..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.stree.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-Markup block - Gen<None> - 130 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Comment block - Gen<RazorComment> - 43 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [ There are two directives beneath this ] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-            HtmlTokenType.RazorComment;[ There are two directives beneath this ];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (41:0,41) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (42:0,42) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Directive block - Gen<Directive:{custom;SingleLine;FileScopedSinglyOccurring}> - 44 - (45:1,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (45:1,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (46:1,1) - Tokens:1
-            CSharpTokenType.Identifier;[custom];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (52:1,7) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {;Type;Opt:False}> - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (53:1,8) - Tokens:7
-            CSharpTokenType.Identifier;[System];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[Text];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[Encoding];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[ASCIIEncoding];
-        Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:WhiteSpace - (87:1,42) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (89:2,0) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Directive block - Gen<Directive:{something;SingleLine;FileScopedMultipleOccurring}> - 17 - (91:3,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (91:3,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [something] - SpanEditHandler;Accepts:None - (92:3,1) - Tokens:1
-            CSharpTokenType.Identifier;[something];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (101:3,10) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {;Member;Opt:False}> - [Else] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (102:3,11) - Tokens:1
-            CSharpTokenType.Identifier;[Else];
-        Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:WhiteSpace - (106:3,15) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (108:4,0) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 3 - (110:5,0)
-        Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (110:5,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [This is extra] - SpanEditHandler;Accepts:Any - (113:5,3) - Tokens:5
-        HtmlTokenType.Text;[This];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[is];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[extra];
-    Tag block - Gen<None> - 4 - (126:5,16)
-        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (126:5,16) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.cspans.txt
deleted file mode 100644
index e25b16bc6a..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.cspans.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
-Markup span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [19] )
-Code span at (8:0,8 [7] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [19] )
-None span at (15:0,15 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [19] )
-MetaCode span at (16:0,16 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [19] )
-Markup span at (17:0,17 [2] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [19] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.stree.txt
deleted file mode 100644
index 6feb3829cd..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.stree.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted}> - 19 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;String;Opt:False}> - ["hello"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1
-        CSharpTokenType.StringLiteral;["hello"];
-    None span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (15:0,15) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [;] - SpanEditHandler;Accepts:WhiteSpace - (16:0,16) - Tokens:1
-        CSharpTokenType.Semicolon;[;];
-    Markup span - Gen<None> - [  ] - SpanEditHandler;Accepts:WhiteSpace - (17:0,17) - Tokens:1
-        CSharpTokenType.WhiteSpace;[  ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.cspans.txt
deleted file mode 100644
index f1fd6cb92b..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.cspans.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-Markup span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.stree.txt
deleted file mode 100644
index 8dfad4bd3c..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.stree.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted} [RZ1016(8:0,8 [1] )]> - 8 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.cspans.txt
deleted file mode 100644
index f1fd6cb92b..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.cspans.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-Markup span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.stree.txt
deleted file mode 100644
index fd51b1bf91..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.stree.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted} [RZ1016(8:0,8 [7] )]> - 8 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.cspans.txt
deleted file mode 100644
index f1fd6cb92b..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.cspans.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-Markup span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.stree.txt
deleted file mode 100644
index b65823863d..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.stree.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted} [RZ1016(8:0,8 [9] )]> - 8 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.cspans.txt
deleted file mode 100644
index f1fd6cb92b..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.cspans.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-Markup span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.stree.txt
deleted file mode 100644
index fd51b1bf91..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.stree.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted} [RZ1016(8:0,8 [7] )]> - 8 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.cspans.txt
deleted file mode 100644
index de1247ad81..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.cspans.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
-Markup span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [17] )
-Code span at (8:0,8 [9] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [17] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.stree.txt
deleted file mode 100644
index 7c8de4fbc1..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted} [RZ1011(17:0,17 [9] )]> - 17 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;String;Opt:False}> - ["string1"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1
-        CSharpTokenType.StringLiteral;["string1"];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.stree.txt
deleted file mode 100644
index 64c88fe4f9..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.stree.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Directive block - Gen<Directive:{custom;CodeBlock;Unrestricted}> - 32 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;String;Opt:False}> - ["Name"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1
-        CSharpTokenType.StringLiteral;["Name"];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (14:0,14) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (15:0,15) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ foo(); bar(); ] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (16:0,16) - Tokens:11
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.cspans.txt
deleted file mode 100644
index 3bd36e8664..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.cspans.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
-Code span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [19] )
-Code span at (8:0,8 [11] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [19] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.stree.txt
deleted file mode 100644
index c51aa18acd..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted}> - 19 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Member;Opt:False}> - [Some_Member] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1
-        CSharpTokenType.Identifier;[Some_Member];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.cspans.txt
deleted file mode 100644
index 07dfcef1d7..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.cspans.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [64] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [64] )
-Code span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [64] )
-Code span at (8:0,8 [34] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [64] )
-Code span at (42:0,42 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [64] )
-Code span at (43:0,43 [11] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [64] )
-Markup span at (54:0,54 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [64] )
-Code span at (55:0,55 [9] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [64] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.stree.txt
deleted file mode 100644
index 1cca925839..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.stree.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted}> - 64 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Type;Opt:False}> - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:7
-        CSharpTokenType.Identifier;[System];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Text];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Encoding];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[ASCIIEncoding];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (42:0,42) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Member;Opt:False}> - [Some_Member] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (43:0,43) - Tokens:1
-        CSharpTokenType.Identifier;[Some_Member];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (54:0,54) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;String;Opt:False}> - ["AString"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (55:0,55) - Tokens:1
-        CSharpTokenType.StringLiteral;["AString"];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.stree.txt
deleted file mode 100644
index c5bde0c85c..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.stree.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Directive block - Gen<Directive:{custom;RazorBlock;Unrestricted}> - 33 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;String;Opt:False}> - ["Header"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1
-        CSharpTokenType.StringLiteral;["Header"];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (16:0,16) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (17:0,17) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 14 - (18:0,18)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 3 - (19:0,19)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [F{o}o] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:5
-            HtmlTokenType.Text;[F];
-            HtmlTokenType.Text;[{];
-            HtmlTokenType.Text;[o];
-            HtmlTokenType.Text;[}];
-            HtmlTokenType.Text;[o];
-        Tag block - Gen<None> - 4 - (27:0,27)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.cspans.txt
deleted file mode 100644
index de1247ad81..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.cspans.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
-Markup span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [17] )
-Code span at (8:0,8 [9] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [17] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.stree.txt
deleted file mode 100644
index 3413cd7516..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted}> - 17 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;String;Opt:False}> - ["AString"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1
-        CSharpTokenType.StringLiteral;["AString"];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.cspans.txt
deleted file mode 100644
index 1bbf8de3f4..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.cspans.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [42] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [42] )
-Code span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [42] )
-Code span at (8:0,8 [34] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [42] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.stree.txt
deleted file mode 100644
index 4032e9314f..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.stree.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted}> - 42 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Type;Opt:False}> - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:7
-        CSharpTokenType.Identifier;[System];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Text];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Encoding];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[ASCIIEncoding];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Class.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Class.stree.txt
deleted file mode 100644
index 32fae95183..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Class.stree.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Directive block - Gen<Directive:{class;SingleLine;Unrestricted}> - 6 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [class] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Keyword;[class];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Namespace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Namespace.stree.txt
deleted file mode 100644
index 2beaf1fc4f..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Namespace.stree.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Directive block - Gen<Directive:{namespace;SingleLine;Unrestricted}> - 10 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [namespace] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Keyword;[namespace];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/EmptyFunctionsDirective.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/EmptyFunctionsDirective.stree.txt
deleted file mode 100644
index f4f2d2009c..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/EmptyFunctionsDirective.stree.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Directive block - Gen<Directive:{functions;CodeBlock;Unrestricted}> - 14 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [functions] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[functions];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (11:0,11) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ ] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (12:0,12) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt
deleted file mode 100644
index 13f5f32062..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Code span at (0:0,0 [4] ) (Accepts:Any) - Parent: Directive block at (0:0,0 [46] )
-Transition span at (4:1,2 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [46] )
-MetaCode span at (5:1,3 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [46] )
-Code span at (11:1,9 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [46] )
-Code span at (12:1,10 [34] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [46] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt
deleted file mode 100644
index cb071c8170..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted}> - 46 - (0:0,0)
-    Code span - Gen<Stmt> - [LF  ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[  ];
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (4:1,2) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (5:1,3) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (11:1,9) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Type;Opt:False}> - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (12:1,10) - Tokens:7
-        CSharpTokenType.Identifier;[System];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Text];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Encoding];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[ASCIIEncoding];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.cspans.txt
deleted file mode 100644
index 4cadbefff0..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.cspans.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-MetaCode span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [48] )
-Code span at (1:0,1 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [48] )
-Transition span at (3:0,3 [1] ) (Accepts:None) - Parent: Directive block at (3:0,3 [44] )
-MetaCode span at (4:0,4 [6] ) (Accepts:None) - Parent: Directive block at (3:0,3 [44] )
-Code span at (10:0,10 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (3:0,3 [44] )
-Code span at (11:0,11 [34] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (3:0,3 [44] )
-Markup span at (45:0,45 [2] ) (Accepts:WhiteSpace) - Parent: Directive block at (3:0,3 [44] )
-Code span at (47:1,0 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [48] )
-MetaCode span at (47:1,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [48] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.stree.txt
deleted file mode 100644
index ceac2d5c09..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.stree.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Statement block - Gen<None> - 48 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [  ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:1
-        CSharpTokenType.WhiteSpace;[  ];
-    Directive block - Gen<Directive:{custom;SingleLine;Unrestricted} [RZ2005(4:0,4 [6] )]> - 44 - (3:0,3)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:1
-            CSharpTokenType.Identifier;[custom];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (10:0,10) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {;Type;Opt:False}> - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (11:0,11) - Tokens:7
-            CSharpTokenType.Identifier;[System];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[Text];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[Encoding];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[ASCIIEncoding];
-        Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:WhiteSpace - (45:0,45) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (47:1,0) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (47:1,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsArrays.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsArrays.stree.txt
deleted file mode 100644
index 4dba3c76e7..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsArrays.stree.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Markup block - Gen<None> - 22 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{inherits;SingleLine;FileScopedSinglyOccurring}> - 22 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [inherits] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[inherits];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {TypeName;Type;Opt:False}> - [string[[]][]] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (10:0,10) - Tokens:7
-            CSharpTokenType.Keyword;[string];
-            CSharpTokenType.LeftBracket;[[];
-            CSharpTokenType.LeftBracket;[[];
-            CSharpTokenType.RightBracket;[]];
-            CSharpTokenType.RightBracket;[]];
-            CSharpTokenType.LeftBracket;[[];
-            CSharpTokenType.RightBracket;[]];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-        HtmlTokenType.Unknown;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsNestedGenerics.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsNestedGenerics.stree.txt
deleted file mode 100644
index 598a5043f8..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsNestedGenerics.stree.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Markup block - Gen<None> - 87 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{inherits;SingleLine;FileScopedSinglyOccurring}> - 87 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [inherits] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[inherits];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {TypeName;Type;Opt:False}> - [System.Web.Mvc.WebViewPage<IEnumerable<MvcApplication2.Models.RegisterModel>>] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (10:0,10) - Tokens:17
-            CSharpTokenType.Identifier;[System];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[Web];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[Mvc];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[WebViewPage];
-            CSharpTokenType.LessThan;[<];
-            CSharpTokenType.Identifier;[IEnumerable];
-            CSharpTokenType.LessThan;[<];
-            CSharpTokenType.Identifier;[MvcApplication2];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[Models];
-            CSharpTokenType.Dot;[.];
-            CSharpTokenType.Identifier;[RegisterModel];
-            CSharpTokenType.GreaterThan;[>];
-            CSharpTokenType.GreaterThan;[>];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (87:0,87) - Tokens:1
-        HtmlTokenType.Unknown;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsTypeKeywords.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsTypeKeywords.stree.txt
deleted file mode 100644
index a65a1bba4c..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsTypeKeywords.stree.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Markup block - Gen<None> - 16 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{inherits;SingleLine;FileScopedSinglyOccurring}> - 16 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [inherits] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[inherits];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {TypeName;Type;Opt:False}> - [string] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (10:0,10) - Tokens:1
-            CSharpTokenType.Keyword;[string];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-        HtmlTokenType.Unknown;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_AreSkipped.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_AreSkipped.cspans.txt
deleted file mode 100644
index f1fd6cb92b..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_AreSkipped.cspans.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-Markup span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_AreSkipped.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_AreSkipped.stree.txt
deleted file mode 100644
index 5b7ca1b209..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_AreSkipped.stree.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted}> - 8 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.cspans.txt
deleted file mode 100644
index a54168ebd2..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.cspans.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
-Markup span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [29] )
-Code span at (8:0,8 [21] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [29] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.stree.txt
deleted file mode 100644
index 1951c2e8a1..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted}> - 29 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;String;Opt:True}> - ["{formaction}?/{id}?"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1
-        CSharpTokenType.StringLiteral;["{formaction}?/{id}?"];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.cspans.txt
deleted file mode 100644
index 39ac31cfc7..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.cspans.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [43] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [43] )
-Markup span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [43] )
-Code span at (8:0,8 [21] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [43] )
-Code span at (29:0,29 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [43] )
-Code span at (30:0,30 [13] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [43] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.stree.txt
deleted file mode 100644
index 4f534b5d86..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.stree.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted}> - 43 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;String;Opt:True}> - ["{formaction}?/{id}?"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1
-        CSharpTokenType.StringLiteral;["{formaction}?/{id}?"];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (29:0,29) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Type;Opt:True}> - [System.String] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (30:0,30) - Tokens:3
-        CSharpTokenType.Identifier;[System];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[String];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.cspans.txt
deleted file mode 100644
index 2fca4ed7c1..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.cspans.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
-Markup span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [22] )
-Code span at (8:0,8 [14] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [22] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.stree.txt
deleted file mode 100644
index 1e6bb057fa..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted}> - 22 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;String;Opt:True}> - ["simple-value"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1
-        CSharpTokenType.StringLiteral;["simple-value"];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.cspans.txt
deleted file mode 100644
index 0e09c28b92..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.cspans.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
-MetaCode span at (1:0,1 [13] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
-Code span at (14:0,14 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [27] )
-Code span at (15:0,15 [12] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [27] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.stree.txt
deleted file mode 100644
index 114b39032d..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<Directive:{TestDirective;SingleLine;Unrestricted}> - 27 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [TestDirective] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[TestDirective];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (14:0,14) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Member;Opt:True}> - [PropertyName] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (15:0,15) - Tokens:1
-        CSharpTokenType.Identifier;[PropertyName];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.cspans.txt
deleted file mode 100644
index bd5a26dfaf..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.cspans.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [15] )
-MetaCode span at (1:0,1 [13] ) (Accepts:None) - Parent: Directive block at (0:0,0 [15] )
-Code span at (14:0,14 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [15] )
-Code span at (15:0,15 [0] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [15] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.stree.txt
deleted file mode 100644
index ee0063aa4b..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<Directive:{TestDirective;SingleLine;Unrestricted}> - 15 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [TestDirective] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[TestDirective];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (14:0,14) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Member;Opt:True}> - [] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (15:0,15) - Tokens:1
-        CSharpTokenType.Unknown;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_FunctionsDirective.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_FunctionsDirective.stree.txt
deleted file mode 100644
index 119a7b047b..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_FunctionsDirective.stree.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Directive block - Gen<Directive:{functions;CodeBlock;Unrestricted}> - 28 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [functions] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[functions];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (11:0,11) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ foo(); bar(); ] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (12:0,12) - Tokens:11
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_SectionDirective.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_SectionDirective.stree.txt
deleted file mode 100644
index 2af805b4b0..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_SectionDirective.stree.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 32 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[section];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [Header] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-        CSharpTokenType.Identifier;[Header];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (15:0,15) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (16:0,16) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 14 - (17:0,17)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 3 - (18:0,18)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [F{o}o] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:5
-            HtmlTokenType.Text;[F];
-            HtmlTokenType.Text;[{];
-            HtmlTokenType.Text;[o];
-            HtmlTokenType.Text;[}];
-            HtmlTokenType.Text;[o];
-        Tag block - Gen<None> - 4 - (26:0,26)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.cspans.txt
deleted file mode 100644
index 37abb54fcf..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.cspans.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
-Code span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [29] )
-Code span at (8:0,8 [21] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [29] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.stree.txt
deleted file mode 100644
index 9776383715..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.stree.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted}> - 29 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Namespace;Opt:False}> - [BaseNamespace.Foo.Bar] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:5
-        CSharpTokenType.Identifier;[BaseNamespace];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Bar];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.cspans.txt
deleted file mode 100644
index 6b4d8a5908..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.cspans.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
-MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
-Code span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [21] )
-Code span at (8:0,8 [13] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [21] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.stree.txt
deleted file mode 100644
index 8a637f25e1..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<Directive:{custom;SingleLine;Unrestricted}> - 21 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[custom];
-    Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<DirectiveToken {;Namespace;Opt:False}> - [BaseNamespace] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1
-        CSharpTokenType.Identifier;[BaseNamespace];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
deleted file mode 100644
index 2d3bc151de..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Directive block - Gen<None> - 21 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[removeTagHelper];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<RemoveTagHelper:{Foo";Foo";;} [RZ1000(20:0,20 [1] ), RZ1019(17:0,17 [4] ), RZ1036(17:0,17 [4] )]> - [Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:2
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.StringLiteral;["];RZ1000(20:0,20 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.stree.txt
deleted file mode 100644
index 062b5be2d7..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<None> - 20 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[removeTagHelper];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<RemoveTagHelper:{Foo;Foo;;} [RZ1036(17:0,17 [3] )]> - [Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1
-        CSharpTokenType.Identifier;[Foo];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.stree.txt
deleted file mode 100644
index b800b7d52b..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<None> - 19 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[removeTagHelper];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<RemoveTagHelper:{"";;;} [RZ1036(18:0,18 [1] )]> - [""] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1
-        CSharpTokenType.StringLiteral;[""];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_RequiresValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_RequiresValue.stree.txt
deleted file mode 100644
index 072bd0d67f..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_RequiresValue.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<None> - 17 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[removeTagHelper];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<RemoveTagHelper:{;;;} [RZ1018(1:0,1 [15] ), RZ1036(17:0,17 [1] )]> - [] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1
-        CSharpTokenType.Unknown;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.stree.txt
deleted file mode 100644
index 09c45b5793..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<None> - 25 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[removeTagHelper];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<RemoveTagHelper:{'*, Foo';'*, Foo';;} [RZ1036(17:0,17 [8] )]> - ['*, Foo'] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1
-        CSharpTokenType.CharacterLiteral;['*, Foo'];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
deleted file mode 100644
index f441701e1a..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<None> - 21 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[removeTagHelper];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<RemoveTagHelper:{"Foo;"Foo;;} [RZ1000(17:0,17 [1] ), RZ1019(17:0,17 [4] ), RZ1036(17:0,17 [4] )]> - ["Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1
-        CSharpTokenType.StringLiteral;["Foo];RZ1000(17:0,17 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.stree.txt
deleted file mode 100644
index 2bcd74c5e6..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.stree.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Directive block - Gen<None> - 35 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[removeTagHelper];
-    Markup span - Gen<None> - [     ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-        CSharpTokenType.WhiteSpace;[     ];
-    Code span - Gen<RemoveTagHelper:{Foo,   Bar;Foo,   Bar;Foo;Bar}> - [Foo,   Bar    ] - SpanEditHandler;Accepts:AnyExceptNewline - (21:0,21) - Tokens:5
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[   ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.WhiteSpace;[    ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt
deleted file mode 100644
index 70b0ecf8e8..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<None> - 22 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[removeTagHelper];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<RemoveTagHelper:{"Foo";Foo;;} [RZ1036(18:0,18 [3] )]> - ["Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1
-        CSharpTokenType.StringLiteral;["Foo"];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
deleted file mode 100644
index 6377f48d15..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Directive block - Gen<None> - 24 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [tagHelperPrefix] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[tagHelperPrefix];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<TagHelperPrefix:{Foo   ";Foo   "} [RZ1000(23:0,23 [1] ), RZ1019(17:0,17 [7] ), RZ1020(17:0,17 [7] )]> - [Foo   "] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:3
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[   ];
-        CSharpTokenType.StringLiteral;["];RZ1000(23:0,23 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.stree.txt
deleted file mode 100644
index 5a5e18da25..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<None> - 19 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [tagHelperPrefix] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[tagHelperPrefix];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<TagHelperPrefix:{"";}> - [""] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1
-        CSharpTokenType.StringLiteral;[""];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_RequiresValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_RequiresValue.stree.txt
deleted file mode 100644
index d63b77168e..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_RequiresValue.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<None> - 17 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [tagHelperPrefix] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[tagHelperPrefix];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<TagHelperPrefix:{;} [RZ1018(1:0,1 [15] )]> - [] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1
-        CSharpTokenType.Unknown;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
deleted file mode 100644
index 277fbd3a51..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<None> - 21 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [tagHelperPrefix] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[tagHelperPrefix];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<TagHelperPrefix:{"Foo;"Foo} [RZ1000(17:0,17 [1] ), RZ1019(17:0,17 [4] ), RZ1020(17:0,17 [4] )]> - ["Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1
-        CSharpTokenType.StringLiteral;["Foo];RZ1000(17:0,17 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_Succeeds.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_Succeeds.stree.txt
deleted file mode 100644
index 7e9a17d299..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_Succeeds.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<None> - 20 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [tagHelperPrefix] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[tagHelperPrefix];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<TagHelperPrefix:{Foo;Foo}> - [Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1
-        CSharpTokenType.Identifier;[Foo];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.stree.txt
deleted file mode 100644
index 1c5a3a9321..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.stree.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Directive block - Gen<None> - 22 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [tagHelperPrefix] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[tagHelperPrefix];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    Code span - Gen<TagHelperPrefix:{"Foo";Foo}> - ["Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1
-        CSharpTokenType.StringLiteral;["Foo"];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CapturesWhitespaceToEOLInInvalidUsingStmtAndTreatsAsFileCode.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CapturesWhitespaceToEOLInInvalidUsingStmtAndTreatsAsFileCode.stree.txt
index 6f18195cab..b18a8a91e5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CapturesWhitespaceToEOLInInvalidUsingStmtAndTreatsAsFileCode.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CapturesWhitespaceToEOLInInvalidUsingStmtAndTreatsAsFileCode.stree.txt
@@ -1,5 +1,5 @@
-Statement block - Gen<None> - 17 - (0:0,0)
-    Code span - Gen<Stmt> - [using          LF] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.WhiteSpace;[          ];
-        CSharpTokenType.NewLine;[LF];
+CSharpCodeBlock - [0..17)::17 - [using          LF]
+    CSharpStatementLiteral - [0..17)::17 - [using          LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[using];
+        Whitespace;[          ];
+        NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.stree.txt
index c0c22405e9..468237491a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.stree.txt
@@ -1,5 +1,10 @@
-Expression block - Gen<Expr> - 7 - (0:0,0)
-    Code span - Gen<Expr> - [Href(LF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Tokens:3
-        CSharpTokenType.Identifier;[Href];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.NewLine;[LF];
+CSharpCodeBlock - [0..7)::7 - [Href(LF]
+    CSharpImplicitExpression - [0..7)::7
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpImplicitExpressionBody - [0..7)::7
+            CSharpCodeBlock - [0..7)::7
+                CSharpExpressionLiteral - [0..7)::7 - [Href(LF] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Identifier;[Href];
+                    LeftParenthesis;[(];
+                    NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesAtSignInDelimitedBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesAtSignInDelimitedBlock.stree.txt
index 604a9bb8b6..2bcf3d8ecc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesAtSignInDelimitedBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesAtSignInDelimitedBlock.stree.txt
@@ -1,17 +1,22 @@
-Expression block - Gen<Expr> - 46 - (0:0,0)
-    MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftParenthesis;[(];
-    Code span - Gen<Expr> - [Request["description"] ?? @photo.Description] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:11
-        CSharpTokenType.Identifier;[Request];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.StringLiteral;["description"];
-        CSharpTokenType.RightBracket;[]];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NullCoalesce;[??];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Transition;[@];
-        CSharpTokenType.Identifier;[photo];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Description];
-    MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (45:0,45) - Tokens:1
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..46)::46 - [(Request["description"] ?? @photo.Description)]
+    CSharpExplicitExpression - [0..46)::46
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpExplicitExpressionBody - [0..46)::46
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftParenthesis;[(];
+            CSharpCodeBlock - [1..45)::44
+                CSharpExpressionLiteral - [1..45)::44 - [Request["description"] ?? @photo.Description] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                    Identifier;[Request];
+                    LeftBracket;[[];
+                    StringLiteral;["description"];
+                    RightBracket;[]];
+                    Whitespace;[ ];
+                    NullCoalesce;[??];
+                    Whitespace;[ ];
+                    Transition;[@];
+                    Identifier;[photo];
+                    Dot;[.];
+                    Identifier;[Description];
+            RazorMetaCode - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.cspans.txt
index df42b12e56..214565841a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.cspans.txt
@@ -2,7 +2,7 @@ Code span at (0:0,0 [43] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [64
 Markup span at (43:2,4 [3] ) (Accepts:None) - Parent: Tag block at (43:2,4 [3] )
 Markup span at (46:2,7 [7] ) (Accepts:Any) - Parent: Markup block at (43:2,4 [20] )
 Transition span at (53:2,14 [1] ) (Accepts:None) - Parent: Expression block at (53:2,14 [4] )
-Code span at (54:2,15 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (53:2,14 [4] )
+Code span at (54:2,15 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (53:2,14 [4] )
 Markup span at (57:2,18 [4] ) (Accepts:None) - Parent: Tag block at (57:2,18 [4] )
 Markup span at (61:2,22 [2] ) (Accepts:None) - Parent: Markup block at (43:2,4 [20] )
 Code span at (63:3,0 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [64] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.stree.txt
index 5f1e30a96d..d7ce8533ba 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.stree.txt
@@ -1,45 +1,50 @@
-Statement block - Gen<None> - 64 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) {LF    var foo = "foo bar bazLF    ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:17
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["foo bar baz];RZ1000(25:1,14 [1] )
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-    Markup block - Gen<None> - 20 - (43:2,4)
-        Tag block - Gen<None> - 3 - (43:2,4)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (43:2,4) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Foo is ] - SpanEditHandler;Accepts:Any - (46:2,7) - Tokens:4
-            HtmlTokenType.Text;[Foo];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[is];
-            HtmlTokenType.WhiteSpace;[ ];
-        Expression block - Gen<Expr> - 4 - (53:2,14)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (53:2,14) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (54:2,15) - Tokens:1
-                CSharpTokenType.Identifier;[foo];
-        Tag block - Gen<None> - 4 - (57:2,18)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (57:2,18) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (61:2,22) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:Any - (63:3,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..64)::64 - [if(foo) {LF    var foo = "foo bar bazLF    <p>Foo is @foo</p>LF}]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..43)::43 - [if(foo) {LF    var foo = "foo bar bazLF    ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["foo bar baz];RZ1000(25:1,14 [1] )
+        NewLine;[LF];
+        Whitespace;[    ];
+    MarkupBlock - [43..63)::20
+        MarkupTagBlock - [43..46)::3 - [<p>]
+            MarkupTextLiteral - [43..46)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [46..53)::7 - [Foo is ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+            Whitespace;[ ];
+            Text;[is];
+            Whitespace;[ ];
+        CSharpCodeBlock - [53..57)::4
+            CSharpImplicitExpression - [53..57)::4
+                CSharpTransition - [53..54)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [54..57)::3
+                    CSharpCodeBlock - [54..57)::3
+                        CSharpExpressionLiteral - [54..57)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+        MarkupTagBlock - [57..61)::4 - [</p>]
+            MarkupTextLiteral - [57..61)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [61..63)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+            NewLine;[LF];
+    CSharpStatementLiteral - [63..64)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.stree.txt
index 7832ba2cb6..5c1e798cb7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.stree.txt
@@ -1,24 +1,29 @@
-Statement block - Gen<None> - 29 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [string.Format(] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:4
-        CSharpTokenType.Keyword;[string];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Format];
-        CSharpTokenType.LeftParenthesis;[(];
-    Markup block - Gen<None> - 13 - (15:0,15)
-        Tag block - Gen<None> - 6 - (15:0,15)
-            Markup span - Gen<Markup> - [<html>] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[html];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 7 - (21:0,21)
-            Markup span - Gen<Markup> - [</html>] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[html];
-                HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (28:0,28) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..29)::29 - [{string.Format(<html></html>}]
+    CSharpStatement - [0..29)::29
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..29)::29
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..28)::27
+                CSharpStatementLiteral - [1..15)::14 - [string.Format(] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Keyword;[string];
+                    Dot;[.];
+                    Identifier;[Format];
+                    LeftParenthesis;[(];
+                MarkupBlock - [15..28)::13
+                    MarkupTagBlock - [15..21)::6 - [<html>]
+                        MarkupTextLiteral - [15..21)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[html];
+                            CloseAngle;[>];
+                    MarkupTagBlock - [21..28)::7 - [</html>]
+                        MarkupTextLiteral - [21..28)::7 - [</html>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[html];
+                            CloseAngle;[>];
+                CSharpStatementLiteral - [28..28)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Marker;[];
+            RazorMetaCode - [28..29)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.cspans.txt
index df81e75cc2..7d1e387fe4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [1] )
-Code span at (1:0,1 [0] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [1] )
+Code span at (1:0,1 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.stree.txt
index 8f8de632d0..ba1a0451b3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/HandlesQuotesAfterTransition.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 1 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Unknown;[];
+CSharpCodeBlock - [0..1)::1 - [@]
+    CSharpImplicitExpression - [0..1)::1
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..1)::0
+            CSharpCodeBlock - [1..1)::0
+                CSharpExpressionLiteral - [1..1)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.stree.txt
index 14a29b0b80..e8e84a746a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/IncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.stree.txt
@@ -1,20 +1,22 @@
-Statement block - Gen<None> - 27 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo)) { var bar = foo; }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:18
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..27)::27 - [if(foo)) { var bar = foo; }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..27)::27 - [if(foo)) { var bar = foo; }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.stree.txt
index 2a25f6f7de..783274bd75 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.stree.txt
@@ -1,5 +1,12 @@
-Statement block - Gen<None> - 1 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (1:0,1) - Tokens:1
-        CSharpTokenType.Unknown;[];
+CSharpCodeBlock - [0..1)::1 - [{]
+    CSharpStatement - [0..1)::1
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..1)::1
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..1)::0
+                CSharpStatementLiteral - [1..1)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                    Marker;[];
+            RazorMetaCode - [1..1)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty.stree.txt
index 898717d0f5..6e07f6a202 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty.stree.txt
@@ -1,7 +1,12 @@
-Statement block - Gen<None> - 2 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..2)::2 - [{}]
+    CSharpStatement - [0..2)::2
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..2)::2
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..1)::0
+                CSharpStatementLiteral - [1..1)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Marker;[];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.cspans.txt
index df81e75cc2..7d1e387fe4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [1] )
-Code span at (1:0,1 [0] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [1] )
+Code span at (1:0,1 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.stree.txt
index 8f8de632d0..ba1a0451b3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 1 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Unknown;[];
+CSharpCodeBlock - [0..1)::1 - [@]
+    CSharpImplicitExpression - [0..1)::1
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..1)::0
+            CSharpCodeBlock - [1..1)::0
+                CSharpExpressionLiteral - [1..1)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.cspans.txt
index a8ccb8bc5e..7fe5b3077c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.cspans.txt
@@ -1,5 +1,5 @@
 MetaCode span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [8] )
 Code span at (1:0,1 [6] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [8] )
 Transition span at (7:1,4 [1] ) (Accepts:None) - Parent: Expression block at (7:1,4 [1] )
-Code span at (8:1,5 [0] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (7:1,4 [1] )
+Code span at (8:1,5 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (7:1,4 [1] )
 Code span at (8:1,5 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.stree.txt
index d7a2344f3c..484ae4e146 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.stree.txt
@@ -1,13 +1,23 @@
-Statement block - Gen<None> - 8 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [LF    ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (1:0,1) - Tokens:2
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-    Expression block - Gen<Expr> - 1 - (7:1,4)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (7:1,4) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (8:1,5) - Tokens:1
-            CSharpTokenType.Unknown;[];
-    Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (8:1,5) - Tokens:1
-        CSharpTokenType.Unknown;[];
+CSharpCodeBlock - [0..8)::8 - [{LF    @]
+    CSharpStatement - [0..8)::8
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..8)::8
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..8)::7
+                CSharpStatementLiteral - [1..7)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                    NewLine;[LF];
+                    Whitespace;[    ];
+                CSharpCodeBlock - [7..8)::1
+                    CSharpImplicitExpression - [7..8)::1
+                        CSharpTransition - [7..8)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [8..8)::0
+                            CSharpCodeBlock - [8..8)::0
+                                CSharpExpressionLiteral - [8..8)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                    Marker;[];
+                CSharpStatementLiteral - [8..8)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Marker;[];
+            RazorMetaCode - [8..8)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.cspans.txt
index df81e75cc2..7d1e387fe4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [1] )
-Code span at (1:0,1 [0] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [1] )
+Code span at (1:0,1 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.stree.txt
index 8f8de632d0..ba1a0451b3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfNewlineFollowsTransition.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 1 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Unknown;[];
+CSharpCodeBlock - [0..1)::1 - [@]
+    CSharpImplicitExpression - [0..1)::1
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..1)::0
+            CSharpCodeBlock - [1..1)::0
+                CSharpExpressionLiteral - [1..1)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.cspans.txt
index fdf5c8e1ef..2c9f48a807 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.cspans.txt
@@ -1,6 +1,6 @@
 MetaCode span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [16] )
 Code span at (1:0,1 [6] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [16] )
 Transition span at (7:1,4 [1] ) (Accepts:None) - Parent: Expression block at (7:1,4 [1] )
-Code span at (8:1,5 [0] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (7:1,4 [1] )
+Code span at (8:1,5 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (7:1,4 [1] )
 Code span at (8:1,5 [7] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [16] )
 MetaCode span at (15:2,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [16] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.stree.txt
index cea41801d1..202bea6f3d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/MethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpr.stree.txt
@@ -1,18 +1,26 @@
-Statement block - Gen<None> - 16 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [LF    ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:2
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-    Expression block - Gen<Expr> - 1 - (7:1,4)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (7:1,4) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (8:1,5) - Tokens:1
-            CSharpTokenType.Unknown;[];
-    Code span - Gen<Stmt> - [   {}LF] - SpanEditHandler;Accepts:Any - (8:1,5) - Tokens:4
-        CSharpTokenType.WhiteSpace;[   ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.NewLine;[LF];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (15:2,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..16)::16 - [{LF    @   {}LF}]
+    CSharpStatement - [0..16)::16
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..16)::16
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..15)::14
+                CSharpStatementLiteral - [1..7)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    NewLine;[LF];
+                    Whitespace;[    ];
+                CSharpCodeBlock - [7..8)::1
+                    CSharpImplicitExpression - [7..8)::1
+                        CSharpTransition - [7..8)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [8..8)::0
+                            CSharpCodeBlock - [8..8)::0
+                                CSharpExpressionLiteral - [8..8)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                    Marker;[];
+                CSharpStatementLiteral - [8..15)::7 - [   {}LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Whitespace;[   ];
+                    LeftBrace;[{];
+                    RightBrace;[}];
+                    NewLine;[LF];
+            RazorMetaCode - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.stree.txt
index 691f6016fb..f7c288d0ed 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.stree.txt
@@ -1,30 +1,32 @@
-Statement block - Gen<None> - 23 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) {] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:6
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 13 - (9:0,9)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-            HtmlTokenType.Transition;[@];
-        Tag block - Gen<None> - 3 - (11:0,11)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (11:0,11) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Bar] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-            HtmlTokenType.Text;[Bar];
-        Tag block - Gen<None> - 4 - (17:0,17)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..23)::23 - [if(foo) { @<p>Bar</p> }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..9)::9 - [if(foo) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+    MarkupBlock - [9..22)::13
+        MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        MarkupTagBlock - [11..14)::3 - [<p>]
+            MarkupTextLiteral - [11..14)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [14..17)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Bar];
+        MarkupTagBlock - [17..21)::4 - [</p>]
+            MarkupTextLiteral - [17..21)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [21..22)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+    CSharpStatementLiteral - [22..23)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfCatchBlockUnterminatedAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfCatchBlockUnterminatedAtEOF.stree.txt
index dce1789d78..6346eaedf3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfCatchBlockUnterminatedAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfCatchBlockUnterminatedAtEOF.stree.txt
@@ -1,47 +1,49 @@
-Statement block - Gen<None> - 70 - (0:0,0)
-    Code span - Gen<Stmt> - [try { baz(); } catch(Foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:45
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NotEqual;[!=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[null];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
+CSharpCodeBlock - [0..70)::70 - [try { baz(); } catch(Foo) { var foo = bar; if(foo != null) { bar(); } ]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..70)::70 - [try { baz(); } catch(Foo) { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        NotEqual;[!=];
+        Whitespace;[ ];
+        Keyword;[null];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.cspans.txt
index 8944928f75..b5cfe654bc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.cspans.txt
@@ -1,4 +1,4 @@
 MetaCode span at (0:0,0 [9] ) (Accepts:None) - Parent: Directive block at (0:0,0 [54] )
-Markup span at (9:0,9 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [54] )
+Markup span at (9:0,9 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [54] )
 MetaCode span at (10:0,10 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [54] )
 Code span at (11:0,11 [43] ) (Accepts:Any) - Parent: Directive block at (0:0,0 [54] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.stree.txt
index 08147658a8..a8904978f6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfClassBlockUnterminatedAtEOF.stree.txt
@@ -1,36 +1,44 @@
-Directive block - Gen<Directive:{functions;CodeBlock;Unrestricted} [RZ1006(10:0,10 [1] )]> - 54 - (0:0,0)
-    MetaCode span - Gen<None> - [functions] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Identifier;[functions];
-    Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (9:0,9) - Tokens:1
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (10:0,10) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ var foo = bar; if(foo != null) { bar(); } ] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (11:0,11) - Tokens:28
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NotEqual;[!=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[null];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
+CSharpCodeBlock - [0..54)::54 - [functions { var foo = bar; if(foo != null) { bar(); } ]
+    RazorDirective - [0..54)::54 - Directive:{functions;CodeBlock;Unrestricted} [RZ1006(10:0,10 [1] )]
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        RazorDirectiveBody - [0..54)::54
+            RazorMetaCode - [0..9)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                Identifier;[functions];
+            CSharpCodeBlock - [9..54)::45
+                MarkupTextLiteral - [9..10)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                    Whitespace;[ ];
+                RazorMetaCode - [10..11)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                    LeftBrace;[{];
+                CSharpCodeBlock - [11..54)::43
+                    CSharpStatementLiteral - [11..54)::43 - [ var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                        Whitespace;[ ];
+                        Identifier;[var];
+                        Whitespace;[ ];
+                        Identifier;[foo];
+                        Whitespace;[ ];
+                        Assign;[=];
+                        Whitespace;[ ];
+                        Identifier;[bar];
+                        Semicolon;[;];
+                        Whitespace;[ ];
+                        Keyword;[if];
+                        LeftParenthesis;[(];
+                        Identifier;[foo];
+                        Whitespace;[ ];
+                        NotEqual;[!=];
+                        Whitespace;[ ];
+                        Keyword;[null];
+                        RightParenthesis;[)];
+                        Whitespace;[ ];
+                        LeftBrace;[{];
+                        Whitespace;[ ];
+                        Identifier;[bar];
+                        LeftParenthesis;[(];
+                        RightParenthesis;[)];
+                        Semicolon;[;];
+                        Whitespace;[ ];
+                        RightBrace;[}];
+                        Whitespace;[ ];
+                RazorMetaCode - [54..54)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                    RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfDoBlockUnterminatedAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfDoBlockUnterminatedAtEOF.stree.txt
index 73e25271f0..d00fd01cb4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfDoBlockUnterminatedAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfDoBlockUnterminatedAtEOF.stree.txt
@@ -1,33 +1,35 @@
-Statement block - Gen<None> - 47 - (0:0,0)
-    Code span - Gen<Stmt> - [do { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:31
-        CSharpTokenType.Keyword;[do];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NotEqual;[!=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[null];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
+CSharpCodeBlock - [0..47)::47 - [do { var foo = bar; if(foo != null) { bar(); } ]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..47)::47 - [do { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[do];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        NotEqual;[!=];
+        Whitespace;[ ];
+        Keyword;[null];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseBlockUnterminatedAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseBlockUnterminatedAtEOF.stree.txt
index 652f403cec..a83c042a6e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseBlockUnterminatedAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseBlockUnterminatedAtEOF.stree.txt
@@ -1,47 +1,49 @@
-Statement block - Gen<None> - 68 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { baz(); } else { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:45
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NotEqual;[!=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[null];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
+CSharpCodeBlock - [0..68)::68 - [if(foo) { baz(); } else { var foo = bar; if(foo != null) { bar(); } ]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..68)::68 - [if(foo) { baz(); } else { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        NotEqual;[!=];
+        Whitespace;[ ];
+        Keyword;[null];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseIfBlockUnterminatedAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseIfBlockUnterminatedAtEOF.stree.txt
index 4750dbca0e..b84d162673 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseIfBlockUnterminatedAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfElseIfBlockUnterminatedAtEOF.stree.txt
@@ -1,49 +1,51 @@
-Statement block - Gen<None> - 71 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { baz(); } else if { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:47
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NotEqual;[!=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[null];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
+CSharpCodeBlock - [0..71)::71 - [if(foo) { baz(); } else if { var foo = bar; if(foo != null) { bar(); } ]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..71)::71 - [if(foo) { baz(); } else if { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        NotEqual;[!=];
+        Whitespace;[ ];
+        Keyword;[null];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.stree.txt
index de02008232..067e430142 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.stree.txt
@@ -1,32 +1,39 @@
-Statement block - Gen<None> - 44 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ var foo = bar; if(foo != null) { bar(); } ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (1:0,1) - Tokens:28
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NotEqual;[!=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[null];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
+CSharpCodeBlock - [0..44)::44 - [{ var foo = bar; if(foo != null) { bar(); } ]
+    CSharpStatement - [0..44)::44
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..44)::44
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..44)::43
+                CSharpStatementLiteral - [1..44)::43 - [ var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    Keyword;[if];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    NotEqual;[!=];
+                    Whitespace;[ ];
+                    Keyword;[null];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    LeftParenthesis;[(];
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Whitespace;[ ];
+            RazorMetaCode - [44..44)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfFinallyBlockUnterminatedAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfFinallyBlockUnterminatedAtEOF.stree.txt
index 17ec773583..acb7cdbca8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfFinallyBlockUnterminatedAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfFinallyBlockUnterminatedAtEOF.stree.txt
@@ -1,44 +1,46 @@
-Statement block - Gen<None> - 67 - (0:0,0)
-    Code span - Gen<Stmt> - [try { baz(); } finally { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:42
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[finally];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NotEqual;[!=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[null];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
+CSharpCodeBlock - [0..67)::67 - [try { baz(); } finally { var foo = bar; if(foo != null) { bar(); } ]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..67)::67 - [try { baz(); } finally { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[baz];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[finally];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        NotEqual;[!=];
+        Whitespace;[ ];
+        Keyword;[null];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForBlockUnterminatedAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForBlockUnterminatedAtEOF.stree.txt
index f896c4413c..ec0e99c706 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForBlockUnterminatedAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForBlockUnterminatedAtEOF.stree.txt
@@ -1,37 +1,39 @@
-Statement block - Gen<None> - 54 - (0:0,0)
-    Code span - Gen<Stmt> - [for (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:35
-        CSharpTokenType.Keyword;[for];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NotEqual;[!=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[null];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
+CSharpCodeBlock - [0..54)::54 - [for (foo) { var foo = bar; if(foo != null) { bar(); } ]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..54)::54 - [for (foo) { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[for];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        NotEqual;[!=];
+        Whitespace;[ ];
+        Keyword;[null];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForeachBlockUnterminatedAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForeachBlockUnterminatedAtEOF.stree.txt
index f040273553..2786187184 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForeachBlockUnterminatedAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfForeachBlockUnterminatedAtEOF.stree.txt
@@ -1,37 +1,39 @@
-Statement block - Gen<None> - 58 - (0:0,0)
-    Code span - Gen<Stmt> - [foreach (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:35
-        CSharpTokenType.Keyword;[foreach];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NotEqual;[!=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[null];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
+CSharpCodeBlock - [0..58)::58 - [foreach (foo) { var foo = bar; if(foo != null) { bar(); } ]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..58)::58 - [foreach (foo) { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[foreach];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        NotEqual;[!=];
+        Whitespace;[ ];
+        Keyword;[null];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfIfBlockUnterminatedAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfIfBlockUnterminatedAtEOF.stree.txt
index 8940e51eb3..570fd40972 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfIfBlockUnterminatedAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfIfBlockUnterminatedAtEOF.stree.txt
@@ -1,37 +1,39 @@
-Statement block - Gen<None> - 53 - (0:0,0)
-    Code span - Gen<Stmt> - [if (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:35
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NotEqual;[!=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[null];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
+CSharpCodeBlock - [0..53)::53 - [if (foo) { var foo = bar; if(foo != null) { bar(); } ]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..53)::53 - [if (foo) { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        NotEqual;[!=];
+        Whitespace;[ ];
+        Keyword;[null];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfLockBlockUnterminatedAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfLockBlockUnterminatedAtEOF.stree.txt
index 2db346c06b..2fdc1d6161 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfLockBlockUnterminatedAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfLockBlockUnterminatedAtEOF.stree.txt
@@ -1,37 +1,39 @@
-Statement block - Gen<None> - 55 - (0:0,0)
-    Code span - Gen<Stmt> - [lock (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:35
-        CSharpTokenType.Keyword;[lock];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NotEqual;[!=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[null];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
+CSharpCodeBlock - [0..55)::55 - [lock (foo) { var foo = bar; if(foo != null) { bar(); } ]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..55)::55 - [lock (foo) { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[lock];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        NotEqual;[!=];
+        Whitespace;[ ];
+        Keyword;[null];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfSwitchBlockUnterminatedAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfSwitchBlockUnterminatedAtEOF.stree.txt
index 274707aa24..4f7feb2476 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfSwitchBlockUnterminatedAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfSwitchBlockUnterminatedAtEOF.stree.txt
@@ -1,37 +1,39 @@
-Statement block - Gen<None> - 57 - (0:0,0)
-    Code span - Gen<Stmt> - [switch (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:35
-        CSharpTokenType.Keyword;[switch];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NotEqual;[!=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[null];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
+CSharpCodeBlock - [0..57)::57 - [switch (foo) { var foo = bar; if(foo != null) { bar(); } ]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..57)::57 - [switch (foo) { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[switch];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        NotEqual;[!=];
+        Whitespace;[ ];
+        Keyword;[null];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfTryBlockUnterminatedAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfTryBlockUnterminatedAtEOF.stree.txt
index b8edb26e7e..269deab5f9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfTryBlockUnterminatedAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfTryBlockUnterminatedAtEOF.stree.txt
@@ -1,33 +1,35 @@
-Statement block - Gen<None> - 48 - (0:0,0)
-    Code span - Gen<Stmt> - [try { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:31
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NotEqual;[!=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[null];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
+CSharpCodeBlock - [0..48)::48 - [try { var foo = bar; if(foo != null) { bar(); } ]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..48)::48 - [try { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        NotEqual;[!=];
+        Whitespace;[ ];
+        Keyword;[null];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfUsingBlockUnterminatedAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfUsingBlockUnterminatedAtEOF.stree.txt
index 50ee1fda7f..b18009cd78 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfUsingBlockUnterminatedAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfUsingBlockUnterminatedAtEOF.stree.txt
@@ -1,37 +1,39 @@
-Statement block - Gen<None> - 56 - (0:0,0)
-    Code span - Gen<Stmt> - [using (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:35
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NotEqual;[!=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[null];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
+CSharpCodeBlock - [0..56)::56 - [using (foo) { var foo = bar; if(foo != null) { bar(); } ]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..56)::56 - [using (foo) { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[using];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        NotEqual;[!=];
+        Whitespace;[ ];
+        Keyword;[null];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfWhileBlockUnterminatedAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfWhileBlockUnterminatedAtEOF.stree.txt
index cef398b06c..89c3366824 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfWhileBlockUnterminatedAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ReportsErrorIfWhileBlockUnterminatedAtEOF.stree.txt
@@ -1,37 +1,39 @@
-Statement block - Gen<None> - 56 - (0:0,0)
-    Code span - Gen<Stmt> - [while (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:35
-        CSharpTokenType.Keyword;[while];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NotEqual;[!=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[null];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
+CSharpCodeBlock - [0..56)::56 - [while (foo) { var foo = bar; if(foo != null) { bar(); } ]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..56)::56 - [while (foo) { var foo = bar; if(foo != null) { bar(); } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[while];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[bar];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        NotEqual;[!=];
+        Whitespace;[ ];
+        Keyword;[null];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.stree.txt
index b7e771e87f..c73c39fea7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.stree.txt
@@ -1,66 +1,68 @@
-Statement block - Gen<None> - 58 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:5
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-    Markup block - Gen<None> - 11 - (8:0,8)
-        Tag block - Gen<None> - 3 - (8:0,8)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Bar] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-            HtmlTokenType.Text;[Bar];
-        Tag block - Gen<None> - 4 - (14:0,14)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Code span - Gen<Stmt> - [else if(bar) ] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:7
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-    Markup block - Gen<None> - 11 - (32:0,32)
-        Tag block - Gen<None> - 3 - (32:0,32)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Baz] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1
-            HtmlTokenType.Text;[Baz];
-        Tag block - Gen<None> - 4 - (38:0,38)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (42:0,42) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Code span - Gen<Stmt> - [else ] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:2
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-    Markup block - Gen<None> - 10 - (48:0,48)
-        Tag block - Gen<None> - 3 - (48:0,48)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (48:0,48) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Boz] - SpanEditHandler;Accepts:Any - (51:0,51) - Tokens:1
-            HtmlTokenType.Text;[Boz];
-        Tag block - Gen<None> - 4 - (54:0,54)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (54:0,54) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (58:0,58) - Tokens:1
-        CSharpTokenType.Unknown;[];
+CSharpCodeBlock - [0..58)::58 - [if(foo) <p>Bar</p> else if(bar) <p>Baz</p> else <p>Boz</p>]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..8)::8 - [if(foo) ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+    MarkupBlock - [8..19)::11
+        MarkupTagBlock - [8..11)::3 - [<p>]
+            MarkupTextLiteral - [8..11)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [11..14)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Bar];
+        MarkupTagBlock - [14..18)::4 - [</p>]
+            MarkupTextLiteral - [14..18)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+    CSharpStatementLiteral - [19..32)::13 - [else if(bar) ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[bar];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+    MarkupBlock - [32..43)::11
+        MarkupTagBlock - [32..35)::3 - [<p>]
+            MarkupTextLiteral - [32..35)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [35..38)::3 - [Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Baz];
+        MarkupTagBlock - [38..42)::4 - [</p>]
+            MarkupTextLiteral - [38..42)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+    CSharpStatementLiteral - [43..48)::5 - [else ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[else];
+        Whitespace;[ ];
+    MarkupBlock - [48..58)::10
+        MarkupTagBlock - [48..51)::3 - [<p>]
+            MarkupTextLiteral - [48..51)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [51..54)::3 - [Boz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Boz];
+        MarkupTagBlock - [54..58)::4 - [</p>]
+            MarkupTextLiteral - [54..58)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+    CSharpStatementLiteral - [58..58)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ResumesIfStatementAfterOpenParen.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ResumesIfStatementAfterOpenParen.stree.txt
index f1e59db50a..256126f941 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ResumesIfStatementAfterOpenParen.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ResumesIfStatementAfterOpenParen.stree.txt
@@ -1,28 +1,30 @@
-Statement block - Gen<None> - 24 - (0:0,0)
-    Code span - Gen<Stmt> - [if(LFelse {] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:6
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 12 - (11:1,6)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (11:1,6) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 3 - (12:1,7)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (12:1,7) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (15:1,10) - Tokens:1
-            HtmlTokenType.Text;[Foo];
-        Tag block - Gen<None> - 4 - (18:1,13)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (18:1,13) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (22:1,17) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:None - (23:1,18) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..24)::24 - [if(LFelse { <p>Foo</p> }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..11)::11 - [if(LFelse {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        NewLine;[LF];
+        Keyword;[else];
+        Whitespace;[ ];
+        LeftBrace;[{];
+    MarkupBlock - [11..23)::12
+        MarkupTextLiteral - [11..12)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagBlock - [12..15)::3 - [<p>]
+            MarkupTextLiteral - [12..15)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [15..18)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+        MarkupTagBlock - [18..22)::4 - [</p>]
+            MarkupTextLiteral - [18..22)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+    CSharpStatementLiteral - [23..24)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.stree.txt
index 72e23a8a3c..1f0a3bc0e9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.stree.txt
@@ -1,12 +1,17 @@
-Expression block - Gen<Expr> - 22 - (0:0,0)
-    Code span - Gen<Expr> - [Foo[Bar[Baz]LFBizLFBoz] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Tokens:10
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.Identifier;[Baz];
-        CSharpTokenType.RightBracket;[]];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Identifier;[Biz];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Identifier;[Boz];
+CSharpCodeBlock - [0..22)::22 - [Foo[Bar[Baz]LFBizLFBoz]
+    CSharpImplicitExpression - [0..22)::22
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpImplicitExpressionBody - [0..22)::22
+            CSharpCodeBlock - [0..22)::22
+                CSharpExpressionLiteral - [0..22)::22 - [Foo[Bar[Baz]LFBizLFBoz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Identifier;[Foo];
+                    LeftBracket;[[];
+                    Identifier;[Bar];
+                    LeftBracket;[[];
+                    Identifier;[Baz];
+                    RightBracket;[]];
+                    NewLine;[LF];
+                    Identifier;[Biz];
+                    NewLine;[LF];
+                    Identifier;[Boz];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExprUnclosed.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExprUnclosed.stree.txt
index 78cdf0005e..766d81299a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExprUnclosed.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExprUnclosed.stree.txt
@@ -1,9 +1,16 @@
-Expression block - Gen<Expr> - 13 - (0:0,0)
-    MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftParenthesis;[(];
-    Code span - Gen<Expr> - [foo barLFbaz] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:5
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Identifier;[baz];
+CSharpCodeBlock - [0..13)::13 - [(foo barLFbaz]
+    CSharpExplicitExpression - [0..13)::13
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpExplicitExpressionBody - [0..13)::13
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftParenthesis;[(];
+            CSharpCodeBlock - [1..13)::12
+                CSharpExpressionLiteral - [1..13)::12 - [foo barLFbaz] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    NewLine;[LF];
+                    Identifier;[baz];
+            RazorMetaCode - [13..13)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                RightParenthesis;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfParenInImplicitExprUnclosed.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfParenInImplicitExprUnclosed.stree.txt
index 8a2b46772d..e23f852f62 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfParenInImplicitExprUnclosed.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtEOFIfParenInImplicitExprUnclosed.stree.txt
@@ -1,12 +1,17 @@
-Expression block - Gen<Expr> - 22 - (0:0,0)
-    Code span - Gen<Expr> - [Foo(Bar(Baz)LFBizLFBoz] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Tokens:10
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Baz];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Identifier;[Biz];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Identifier;[Boz];
+CSharpCodeBlock - [0..22)::22 - [Foo(Bar(Baz)LFBizLFBoz]
+    CSharpImplicitExpression - [0..22)::22
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpImplicitExpressionBody - [0..22)::22
+            CSharpCodeBlock - [0..22)::22
+                CSharpExpressionLiteral - [0..22)::22 - [Foo(Bar(Baz)LFBizLFBoz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Identifier;[Foo];
+                    LeftParenthesis;[(];
+                    Identifier;[Bar];
+                    LeftParenthesis;[(];
+                    Identifier;[Baz];
+                    RightParenthesis;[)];
+                    NewLine;[LF];
+                    Identifier;[Biz];
+                    NewLine;[LF];
+                    Identifier;[Boz];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExprUnclosed.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExprUnclosed.stree.txt
index ec70a45174..80c61bdeee 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExprUnclosed.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExprUnclosed.stree.txt
@@ -1,11 +1,16 @@
-Expression block - Gen<Expr> - 19 - (0:0,0)
-    Code span - Gen<Expr> - [Foo[Bar[Baz]LFBizLF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Tokens:9
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.Identifier;[Baz];
-        CSharpTokenType.RightBracket;[]];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Identifier;[Biz];
-        CSharpTokenType.NewLine;[LF];
+CSharpCodeBlock - [0..19)::19 - [Foo[Bar[Baz]LFBizLF]
+    CSharpImplicitExpression - [0..19)::19
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpImplicitExpressionBody - [0..19)::19
+            CSharpCodeBlock - [0..19)::19
+                CSharpExpressionLiteral - [0..19)::19 - [Foo[Bar[Baz]LFBizLF] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Identifier;[Foo];
+                    LeftBracket;[[];
+                    Identifier;[Bar];
+                    LeftBracket;[[];
+                    Identifier;[Baz];
+                    RightBracket;[]];
+                    NewLine;[LF];
+                    Identifier;[Biz];
+                    NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExprUnclosed.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExprUnclosed.stree.txt
index c23684a3e4..783b2be037 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExprUnclosed.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExprUnclosed.stree.txt
@@ -1,8 +1,15 @@
-Expression block - Gen<Expr> - 10 - (0:0,0)
-    MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftParenthesis;[(];
-    Code span - Gen<Expr> - [foo barLF] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:4
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.NewLine;[LF];
+CSharpCodeBlock - [0..10)::10 - [(foo barLF]
+    CSharpExplicitExpression - [0..10)::10
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpExplicitExpressionBody - [0..10)::10
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftParenthesis;[(];
+            CSharpCodeBlock - [1..10)::9
+                CSharpExpressionLiteral - [1..10)::9 - [foo barLF] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    NewLine;[LF];
+            RazorMetaCode - [10..10)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                RightParenthesis;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.stree.txt
index e8a7af923b..87fcb7b68c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.stree.txt
@@ -1,11 +1,16 @@
-Expression block - Gen<Expr> - 19 - (0:0,0)
-    Code span - Gen<Expr> - [Foo(Bar(Baz)LFBizLF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Tokens:9
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Baz];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Identifier;[Biz];
-        CSharpTokenType.NewLine;[LF];
+CSharpCodeBlock - [0..19)::19 - [Foo(Bar(Baz)LFBizLF]
+    CSharpImplicitExpression - [0..19)::19
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpImplicitExpressionBody - [0..19)::19
+            CSharpCodeBlock - [0..19)::19
+                CSharpExpressionLiteral - [0..19)::19 - [Foo(Bar(Baz)LFBizLF] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Identifier;[Foo];
+                    LeftParenthesis;[(];
+                    Identifier;[Bar];
+                    LeftParenthesis;[(];
+                    Identifier;[Baz];
+                    RightParenthesis;[)];
+                    NewLine;[LF];
+                    Identifier;[Biz];
+                    NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
index 7bbc78e8ff..70277e63f7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
@@ -1,8 +1,10 @@
-Statement block - Gen<None> - 17 - (0:0,0)
-    Code span - Gen<Stmt> - [foreach(foo barLF] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:6
-        CSharpTokenType.Keyword;[foreach];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.NewLine;[LF];
+CSharpCodeBlock - [0..17)::17 - [foreach(foo barLF]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..17)::17 - [foreach(foo barLF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[foreach];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Identifier;[bar];
+        NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
index d12e4eeb98..48e421bb19 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
@@ -1,8 +1,10 @@
-Statement block - Gen<None> - 12 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo barLF] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:6
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.NewLine;[LF];
+CSharpCodeBlock - [0..12)::12 - [if(foo barLF]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..12)::12 - [if(foo barLF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Identifier;[bar];
+        NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.stree.txt
index 83c5c0e7bc..4239af8886 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.stree.txt
@@ -1,21 +1,23 @@
-Statement block - Gen<None> - 41 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) {LF    var p = "foo bar bazLF;LF}] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:19
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[p];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["foo bar baz];RZ1000(23:1,12 [1] )
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..41)::41 - [if(foo) {LF    var p = "foo bar bazLF;LF}]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..41)::41 - [if(foo) {LF    var p = "foo bar bazLF;LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[p];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["foo bar baz];RZ1000(23:1,12 [1] )
+        NewLine;[LF];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.stree.txt
index f62bdc8820..8d5349ea50 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesNormalStringAtEndOfFile.stree.txt
@@ -1,16 +1,18 @@
-Statement block - Gen<None> - 45 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { var foo = "blah blah blah blah blah] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:14
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["blah blah blah blah blah];RZ1000(20:0,20 [1] )
+CSharpCodeBlock - [0..45)::45 - [if(foo) { var foo = "blah blah blah blah blah]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..45)::45 - [if(foo) { var foo = "blah blah blah blah blah] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["blah blah blah blah blah];RZ1000(20:0,20 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
index c0593ccb6f..4364777d94 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
@@ -1,8 +1,10 @@
-Statement block - Gen<None> - 15 - (0:0,0)
-    Code span - Gen<Stmt> - [using(foo barLF] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:6
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.NewLine;[LF];
+CSharpCodeBlock - [0..15)::15 - [using(foo barLF]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..15)::15 - [using(foo barLF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[using];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Identifier;[bar];
+        NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.stree.txt
index b657dfb7d1..6de37b9cac 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesVerbatimStringAtEndOfFile.stree.txt
@@ -1,16 +1,18 @@
-Statement block - Gen<None> - 60 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) { var foo = @"blah LFblah; LF<p>Foo</p>LFblah LFblah] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:14
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;[@"blah LFblah; LF<p>Foo</p>LFblah LFblah];RZ1000(20:0,20 [1] )
+CSharpCodeBlock - [0..60)::60 - [if(foo) { var foo = @"blah LFblah; LF<p>Foo</p>LFblah LFblah]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..60)::60 - [if(foo) { var foo = @"blah LFblah; LF<p>Foo</p>LFblah LFblah] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;[@"blah LFblah; LF<p>Foo</p>LFblah LFblah];RZ1000(20:0,20 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesWhileClauseInDoStmtAtEOLWhenRecoveringFromMissingCloseParen.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesWhileClauseInDoStmtAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
index 9f5bb09d03..d9a5319120 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesWhileClauseInDoStmtAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/TerminatesWhileClauseInDoStmtAtEOLWhenRecoveringFromMissingCloseParen.stree.txt
@@ -1,14 +1,16 @@
-Statement block - Gen<None> - 22 - (0:0,0)
-    Code span - Gen<Stmt> - [do { } while(foo barLF] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:12
-        CSharpTokenType.Keyword;[do];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[while];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.NewLine;[LF];
+CSharpCodeBlock - [0..22)::22 - [do { } while(foo barLF]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..22)::22 - [do { } while(foo barLF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[do];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[while];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Identifier;[bar];
+        NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.cspans.txt
index aa175869a4..c1231b2190 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [7] )
-Code span at (1:0,1 [6] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [7] )
+Code span at (1:0,1 [6] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [7] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.stree.txt
index 1454016ba1..9f58fb8d4f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/WithHelperDirectiveProducesError.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 7 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [helper] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[helper];
+CSharpCodeBlock - [0..7)::7 - [@helper]
+    CSharpImplicitExpression - [0..7)::7
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..7)::6
+            CSharpCodeBlock - [1..7)::6
+                CSharpExpressionLiteral - [1..7)::6 - [helper] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[helper];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/WithNestedCodeBlockProducesError.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/WithNestedCodeBlockProducesError.stree.txt
index bf52f4c935..cd9063b5dd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/WithNestedCodeBlockProducesError.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/WithNestedCodeBlockProducesError.stree.txt
@@ -1,20 +1,23 @@
-Statement block - Gen<None> - 11 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [if { ] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:4
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-    Statement block - Gen<None> - 3 - (6:0,6)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (7:0,7) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (8:0,8) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Code span - Gen<Stmt> - [ }] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:2
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..11)::11 - [@if { @{} }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..6)::5 - [if { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+    CSharpCodeBlock - [6..9)::3
+        CSharpStatement - [6..9)::3
+            CSharpTransition - [6..7)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementBody - [7..9)::2
+                RazorMetaCode - [7..8)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    LeftBrace;[{];
+                CSharpCodeBlock - [8..8)::0
+                    CSharpStatementLiteral - [8..8)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                        Marker;[];
+                RazorMetaCode - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    RightBrace;[}];
+    CSharpStatementLiteral - [9..11)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings.stree.txt
index ab2776cd54..f49a76b026 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings.stree.txt
@@ -1,9 +1,12 @@
-Expression block - Gen<Expr> - 9 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.LeftParenthesis;[(];
-    Code span - Gen<Expr> - ["\"\""] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-        CSharpTokenType.StringLiteral;["\"\""];
-    MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:1
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..9)::9 - [@("\"\"")]
+    CSharpExplicitExpression - [0..9)::9
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpExplicitExpressionBody - [1..9)::8
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftParenthesis;[(];
+            CSharpCodeBlock - [2..8)::6
+                CSharpExpressionLiteral - [2..8)::6 - ["\"\""] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                    StringLiteral;["\"\""];
+            RazorMetaCode - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings.stree.txt
index 173672adb1..e69f9b164d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings.stree.txt
@@ -1,9 +1,12 @@
-Expression block - Gen<Expr> - 10 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.LeftParenthesis;[(];
-    Code span - Gen<Expr> - [@""""""] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-        CSharpTokenType.StringLiteral;[@""""""];
-    MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:1
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..10)::10 - [@(@"""""")]
+    CSharpExplicitExpression - [0..10)::10
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpExplicitExpressionBody - [1..10)::9
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftParenthesis;[(];
+            CSharpCodeBlock - [2..9)::7
+                CSharpExpressionLiteral - [2..9)::7 - [@""""""] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                    StringLiteral;[@""""""];
+            RazorMetaCode - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInNonVerbatimStrings.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInNonVerbatimStrings.stree.txt
index 28ef6bad21..c06f7074d8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInNonVerbatimStrings.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInNonVerbatimStrings.stree.txt
@@ -1,9 +1,12 @@
-Expression block - Gen<Expr> - 7 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.LeftParenthesis;[(];
-    Code span - Gen<Expr> - ["\""] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-        CSharpTokenType.StringLiteral;["\""];
-    MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:1
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..7)::7 - [@("\"")]
+    CSharpExplicitExpression - [0..7)::7
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpExplicitExpressionBody - [1..7)::6
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftParenthesis;[(];
+            CSharpCodeBlock - [2..6)::4
+                CSharpExpressionLiteral - [2..6)::4 - ["\""] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                    StringLiteral;["\""];
+            RazorMetaCode - [6..7)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInVerbatimStrings.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInVerbatimStrings.stree.txt
index e8c4fd0f60..cd3c0cbcf0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInVerbatimStrings.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptEscapedQuoteInVerbatimStrings.stree.txt
@@ -1,9 +1,12 @@
-Expression block - Gen<Expr> - 8 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.LeftParenthesis;[(];
-    Code span - Gen<Expr> - [@""""] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-        CSharpTokenType.StringLiteral;[@""""];
-    MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (7:0,7) - Tokens:1
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..8)::8 - [@(@"""")]
+    CSharpExplicitExpression - [0..8)::8
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpExplicitExpressionBody - [1..8)::7
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftParenthesis;[(];
+            CSharpCodeBlock - [2..7)::5
+                CSharpExpressionLiteral - [2..7)::5 - [@""""] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                    StringLiteral;[@""""];
+            RazorMetaCode - [7..8)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultiLineVerbatimStrings.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultiLineVerbatimStrings.stree.txt
index c30fec9476..37413cbf13 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultiLineVerbatimStrings.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultiLineVerbatimStrings.stree.txt
@@ -1,9 +1,12 @@
-Expression block - Gen<Expr> - 23 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.LeftParenthesis;[(];
-    Code span - Gen<Expr> - [@"LFFooLFBarLFBazLF"] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-        CSharpTokenType.StringLiteral;[@"LFFooLFBarLFBazLF"];
-    MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (22:4,1) - Tokens:1
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..23)::23 - [@(@"LFFooLFBarLFBazLF")]
+    CSharpExplicitExpression - [0..23)::23
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpExplicitExpressionBody - [1..23)::22
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftParenthesis;[(];
+            CSharpCodeBlock - [2..22)::20
+                CSharpExpressionLiteral - [2..22)::20 - [@"LFFooLFBarLFBazLF"] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                    StringLiteral;[@"LFFooLFBarLFBazLF"];
+            RazorMetaCode - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings.stree.txt
index 054fbe06a9..34c432a1d2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings.stree.txt
@@ -1,9 +1,12 @@
-Expression block - Gen<Expr> - 21 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.LeftParenthesis;[(];
-    Code span - Gen<Expr> - ["\"hello, world\""] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-        CSharpTokenType.StringLiteral;["\"hello, world\""];
-    MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..21)::21 - [@("\"hello, world\"")]
+    CSharpExplicitExpression - [0..21)::21
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpExplicitExpressionBody - [1..21)::20
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftParenthesis;[(];
+            CSharpCodeBlock - [2..20)::18
+                CSharpExpressionLiteral - [2..20)::18 - ["\"hello, world\""] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                    StringLiteral;["\"hello, world\""];
+            RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInVerbatimStrings.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInVerbatimStrings.stree.txt
index a77e2669da..0f798f47a8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInVerbatimStrings.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleEscapedQuotesInVerbatimStrings.stree.txt
@@ -1,9 +1,12 @@
-Expression block - Gen<Expr> - 22 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.LeftParenthesis;[(];
-    Code span - Gen<Expr> - [@"""hello, world"""] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-        CSharpTokenType.StringLiteral;[@"""hello, world"""];
-    MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..22)::22 - [@(@"""hello, world""")]
+    CSharpExplicitExpression - [0..22)::22
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpExplicitExpressionBody - [1..22)::21
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftParenthesis;[(];
+            CSharpCodeBlock - [2..21)::19
+                CSharpExpressionLiteral - [2..21)::19 - [@"""hello, world"""] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                    StringLiteral;[@"""hello, world"""];
+            RazorMetaCode - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings.stree.txt
index 173672adb1..e69f9b164d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings.stree.txt
@@ -1,9 +1,12 @@
-Expression block - Gen<Expr> - 10 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.LeftParenthesis;[(];
-    Code span - Gen<Expr> - [@""""""] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-        CSharpTokenType.StringLiteral;[@""""""];
-    MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:1
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..10)::10 - [@(@"""""")]
+    CSharpExplicitExpression - [0..10)::10
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpExplicitExpressionBody - [1..10)::9
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftParenthesis;[(];
+            CSharpCodeBlock - [2..9)::7
+                CSharpExpressionLiteral - [2..9)::7 - [@""""""] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                    StringLiteral;[@""""""];
+            RazorMetaCode - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpr.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpr.stree.txt
index f477a803b1..7d069c8afc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpr.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpr.stree.txt
@@ -1,7 +1,12 @@
-Expression block - Gen<Expr> - 2 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.LeftParenthesis;[(];
-    Code span - Gen<Expr> - [] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-        CSharpTokenType.Unknown;[];
+CSharpCodeBlock - [0..2)::2 - [@(]
+    CSharpExplicitExpression - [0..2)::2
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpExplicitExpressionBody - [1..2)::1
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftParenthesis;[(];
+            CSharpCodeBlock - [2..2)::0
+                CSharpExpressionLiteral - [2..2)::0 - [] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                    Marker;[];
+            RazorMetaCode - [2..2)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                RightParenthesis;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty.stree.txt
index ac2afba6aa..ef8d7b9f41 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty.stree.txt
@@ -1,9 +1,12 @@
-Expression block - Gen<Expr> - 3 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.LeftParenthesis;[(];
-    Code span - Gen<Expr> - [] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:1
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..3)::3 - [@()]
+    CSharpExplicitExpression - [0..3)::3
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpExplicitExpressionBody - [1..3)::2
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftParenthesis;[(];
+            CSharpCodeBlock - [2..2)::0
+                CSharpExpressionLiteral - [2..2)::0 - [] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                    Marker;[];
+            RazorMetaCode - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/AcceptsNonEnglishCharactersThatAreValidIdentifiers.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/AcceptsNonEnglishCharactersThatAreValidIdentifiers.cspans.txt
index befccd6124..5796fa527a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/AcceptsNonEnglishCharactersThatAreValidIdentifiers.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/AcceptsNonEnglishCharactersThatAreValidIdentifiers.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
-Code span at (1:0,1 [7] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [8] )
+Code span at (1:0,1 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/AcceptsNonEnglishCharactersThatAreValidIdentifiers.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/AcceptsNonEnglishCharactersThatAreValidIdentifiers.stree.txt
index 7d0e4caeab..dc6218dac5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/AcceptsNonEnglishCharactersThatAreValidIdentifiers.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/AcceptsNonEnglishCharactersThatAreValidIdentifiers.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 8 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [हळूँजद॔] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[हळूँजद॔];
+CSharpCodeBlock - [0..8)::8 - [@हळूँजद॔]
+    CSharpImplicitExpression - [0..8)::8
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..8)::7
+            CSharpCodeBlock - [1..8)::7
+                CSharpExpressionLiteral - [1..8)::7 - [हळूँजद॔] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[हळूँजद॔];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.cspans.txt
index cdb23fb755..5d8d6c3b55 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
-Code span at (1:0,1 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.stree.txt
index 8967206fd1..fae52862a5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 4 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[foo];
+CSharpCodeBlock - [0..4)::4 - [@foo]
+    CSharpImplicitExpression - [0..4)::4
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..4)::3
+            CSharpCodeBlock - [1..4)::3
+                CSharpExpressionLiteral - [1..4)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotAtEOFInImplicitExpression.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotAtEOFInImplicitExpression.cspans.txt
index befccd6124..5796fa527a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotAtEOFInImplicitExpression.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotAtEOFInImplicitExpression.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
-Code span at (1:0,1 [7] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [8] )
+Code span at (1:0,1 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotAtEOFInImplicitExpression.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotAtEOFInImplicitExpression.stree.txt
index a319543617..330a241eff 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotAtEOFInImplicitExpression.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotAtEOFInImplicitExpression.stree.txt
@@ -1,7 +1,10 @@
-Expression block - Gen<Expr> - 8 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo.bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[bar];
+CSharpCodeBlock - [0..8)::8 - [@foo.bar]
+    CSharpImplicitExpression - [0..8)::8
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..8)::7
+            CSharpCodeBlock - [1..8)::7
+                CSharpExpressionLiteral - [1..8)::7 - [foo.bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
+                    Dot;[.];
+                    Identifier;[bar];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr1.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr1.cspans.txt
index befccd6124..5796fa527a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr1.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr1.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
-Code span at (1:0,1 [7] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [8] )
+Code span at (1:0,1 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr1.stree.txt
index a319543617..330a241eff 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr1.stree.txt
@@ -1,7 +1,10 @@
-Expression block - Gen<Expr> - 8 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo.bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[bar];
+CSharpCodeBlock - [0..8)::8 - [@foo.bar]
+    CSharpImplicitExpression - [0..8)::8
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..8)::7
+            CSharpCodeBlock - [1..8)::7
+                CSharpExpressionLiteral - [1..8)::7 - [foo.bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
+                    Dot;[.];
+                    Identifier;[bar];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr2.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr2.cspans.txt
index befccd6124..5796fa527a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr2.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr2.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
-Code span at (1:0,1 [7] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [8] )
+Code span at (1:0,1 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr2.stree.txt
index a319543617..330a241eff 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeDotFollowedByInvalidIdentifierCharInImplicitExpr2.stree.txt
@@ -1,7 +1,10 @@
-Expression block - Gen<Expr> - 8 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo.bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[bar];
+CSharpCodeBlock - [0..8)::8 - [@foo.bar]
+    CSharpImplicitExpression - [0..8)::8
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..8)::7
+            CSharpCodeBlock - [1..8)::7
+                CSharpExpressionLiteral - [1..8)::7 - [foo.bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
+                    Dot;[.];
+                    Identifier;[bar];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeSemicolonAfterDot.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeSemicolonAfterDot.cspans.txt
index befccd6124..5796fa527a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeSemicolonAfterDot.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeSemicolonAfterDot.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
-Code span at (1:0,1 [7] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [8] )
+Code span at (1:0,1 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeSemicolonAfterDot.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeSemicolonAfterDot.stree.txt
index a319543617..330a241eff 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeSemicolonAfterDot.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/DoesNotIncludeSemicolonAfterDot.stree.txt
@@ -1,7 +1,10 @@
-Expression block - Gen<Expr> - 8 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo.bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[bar];
+CSharpCodeBlock - [0..8)::8 - [@foo.bar]
+    CSharpImplicitExpression - [0..8)::8
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..8)::7
+            CSharpCodeBlock - [1..8)::7
+                CSharpExpressionLiteral - [1..8)::7 - [foo.bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
+                    Dot;[.];
+                    Identifier;[bar];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfDottedIdentifiers.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfDottedIdentifiers.cspans.txt
index 4c546c5213..0ee2dadc29 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfDottedIdentifiers.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfDottedIdentifiers.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [12] )
-Code span at (1:0,1 [11] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [12] )
+Code span at (1:0,1 [11] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [12] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfDottedIdentifiers.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfDottedIdentifiers.stree.txt
index b130a21495..14504470ec 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfDottedIdentifiers.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfDottedIdentifiers.stree.txt
@@ -1,9 +1,12 @@
-Expression block - Gen<Expr> - 12 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo.bar.baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:5
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[baz];
+CSharpCodeBlock - [0..12)::12 - [@foo.bar.baz]
+    CSharpImplicitExpression - [0..12)::12
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..12)::11
+            CSharpCodeBlock - [1..12)::11
+                CSharpExpressionLiteral - [1..12)::11 - [foo.bar.baz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
+                    Dot;[.];
+                    Identifier;[bar];
+                    Dot;[.];
+                    Identifier;[baz];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfSimpleImplicitExpression.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfSimpleImplicitExpression.cspans.txt
index cdb23fb755..5d8d6c3b55 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfSimpleImplicitExpression.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfSimpleImplicitExpression.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
-Code span at (1:0,1 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfSimpleImplicitExpression.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfSimpleImplicitExpression.stree.txt
index 8967206fd1..fae52862a5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfSimpleImplicitExpression.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/IgnoresSemicolonAtEndOfSimpleImplicitExpression.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 4 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[foo];
+CSharpCodeBlock - [0..4)::4 - [@foo]
+    CSharpImplicitExpression - [0..4)::4
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..4)::3
+            CSharpCodeBlock - [1..4)::3
+                CSharpExpressionLiteral - [1..4)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.cspans.txt
index 345383cbb0..70ce638f46 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.cspans.txt
@@ -1,4 +1,4 @@
 Code span at (0:0,0 [12] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [18] )
 Transition span at (12:0,12 [1] ) (Accepts:None) - Parent: Expression block at (12:0,12 [4] )
-Code span at (13:0,13 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (12:0,12 [4] )
+Code span at (13:0,13 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (12:0,12 [4] )
 Code span at (16:0,16 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [18] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.stree.txt
index ca459f326c..3c07560c0d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.stree.txt
@@ -1,18 +1,23 @@
-Statement block - Gen<None> - 18 - (0:0,0)
-    Code span - Gen<Stmt> - [if (true) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:8
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-    Expression block - Gen<Expr> - 4 - (12:0,12)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (13:0,13) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-    Code span - Gen<Stmt> - [ }] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:2
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..18)::18 - [if (true) { @foo }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..12)::12 - [if (true) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+    CSharpCodeBlock - [12..16)::4
+        CSharpImplicitExpression - [12..16)::4
+            CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpImplicitExpressionBody - [13..16)::3
+                CSharpCodeBlock - [13..16)::3
+                    CSharpExpressionLiteral - [13..16)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                        Identifier;[foo];
+    CSharpStatementLiteral - [16..18)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputExpressionIfModuleTokenNotFollowedByBrace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputExpressionIfModuleTokenNotFollowedByBrace.cspans.txt
index 91506cb48b..41c54b6b10 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputExpressionIfModuleTokenNotFollowedByBrace.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputExpressionIfModuleTokenNotFollowedByBrace.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [13] )
-Code span at (1:0,1 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [13] )
+Code span at (1:0,1 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [13] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputExpressionIfModuleTokenNotFollowedByBrace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputExpressionIfModuleTokenNotFollowedByBrace.stree.txt
index e32608be70..1bd76d3d01 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputExpressionIfModuleTokenNotFollowedByBrace.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputExpressionIfModuleTokenNotFollowedByBrace.stree.txt
@@ -1,9 +1,12 @@
-Expression block - Gen<Expr> - 13 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [module.foo()] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:5
-        CSharpTokenType.Identifier;[module];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..13)::13 - [@module.foo()]
+    CSharpImplicitExpression - [0..13)::13
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..13)::12
+            CSharpCodeBlock - [1..13)::12
+                CSharpExpressionLiteral - [1..13)::12 - [module.foo()] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[module];
+                    Dot;[.];
+                    Identifier;[foo];
+                    LeftParenthesis;[(];
+                    RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.cspans.txt
index df81e75cc2..7d1e387fe4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [1] )
-Code span at (1:0,1 [0] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [1] )
+Code span at (1:0,1 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.stree.txt
index 8f8de632d0..ba1a0451b3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 1 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Unknown;[];
+CSharpCodeBlock - [0..1)::1 - [@]
+    CSharpImplicitExpression - [0..1)::1
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..1)::0
+            CSharpCodeBlock - [1..1)::0
+                CSharpExpressionLiteral - [1..1)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.cspans.txt
index df81e75cc2..7d1e387fe4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [1] )
-Code span at (1:0,1 [0] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [1] )
+Code span at (1:0,1 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.stree.txt
index 8f8de632d0..ba1a0451b3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/OutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 1 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Unknown;[];
+CSharpCodeBlock - [0..1)::1 - [@]
+    CSharpImplicitExpression - [0..1)::1
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..1)::0
+            CSharpCodeBlock - [1..1)::0
+                CSharpExpressionLiteral - [1..1)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesDottedIdentifiersAsImplicitExpression.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesDottedIdentifiersAsImplicitExpression.cspans.txt
index 4c546c5213..0ee2dadc29 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesDottedIdentifiersAsImplicitExpression.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesDottedIdentifiersAsImplicitExpression.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [12] )
-Code span at (1:0,1 [11] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [12] )
+Code span at (1:0,1 [11] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [12] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesDottedIdentifiersAsImplicitExpression.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesDottedIdentifiersAsImplicitExpression.stree.txt
index b130a21495..14504470ec 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesDottedIdentifiersAsImplicitExpression.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesDottedIdentifiersAsImplicitExpression.stree.txt
@@ -1,9 +1,12 @@
-Expression block - Gen<Expr> - 12 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo.bar.baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:5
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[baz];
+CSharpCodeBlock - [0..12)::12 - [@foo.bar.baz]
+    CSharpImplicitExpression - [0..12)::12
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..12)::11
+            CSharpCodeBlock - [1..12)::11
+                CSharpExpressionLiteral - [1..12)::11 - [foo.bar.baz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
+                    Dot;[.];
+                    Identifier;[bar];
+                    Dot;[.];
+                    Identifier;[baz];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket1.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket1.cspans.txt
index cdb23fb755..5d8d6c3b55 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket1.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket1.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
-Code span at (1:0,1 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket1.stree.txt
index d0922098d3..d192fdd05b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket1.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 4 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[val];
+CSharpCodeBlock - [0..4)::4 - [@val]
+    CSharpImplicitExpression - [0..4)::4
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..4)::3
+            CSharpCodeBlock - [1..4)::3
+                CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket10.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket10.cspans.txt
index 76e4befa6f..ec7b977780 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket10.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket10.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [9] )
-Code span at (1:0,1 [8] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [9] )
+Code span at (1:0,1 [8] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [9] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket10.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket10.stree.txt
index a03e6f1514..e0ab082b48 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket10.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket10.stree.txt
@@ -1,10 +1,13 @@
-Expression block - Gen<Expr> - 9 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?[-1]] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:6
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.Minus;[-];
-        CSharpTokenType.IntegerLiteral;[1];
-        CSharpTokenType.RightBracket;[]];
+CSharpCodeBlock - [0..9)::9 - [@val?[-1]]
+    CSharpImplicitExpression - [0..9)::9
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..9)::8
+            CSharpCodeBlock - [1..9)::8
+                CSharpExpressionLiteral - [1..9)::8 - [val?[-1]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    LeftBracket;[[];
+                    Minus;[-];
+                    IntegerLiteral;[1];
+                    RightBracket;[]];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket11.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket11.stree.txt
index 2445b36952..dfc4db003b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket11.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket11.stree.txt
@@ -1,12 +1,15 @@
-Expression block - Gen<Expr> - 15 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?[abc]?[def] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:8
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.Identifier;[abc];
-        CSharpTokenType.RightBracket;[]];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.Identifier;[def];
+CSharpCodeBlock - [0..15)::15 - [@val?[abc]?[def]
+    CSharpImplicitExpression - [0..15)::15
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..15)::14
+            CSharpCodeBlock - [1..15)::14
+                CSharpExpressionLiteral - [1..15)::14 - [val?[abc]?[def] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    LeftBracket;[[];
+                    Identifier;[abc];
+                    RightBracket;[]];
+                    QuestionMark;[?];
+                    LeftBracket;[[];
+                    Identifier;[def];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket12.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket12.cspans.txt
index bde230d5d2..864c7d8d23 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket12.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket12.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [14] )
-Code span at (1:0,1 [13] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [14] )
+Code span at (1:0,1 [13] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [14] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket12.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket12.stree.txt
index fcfaadd462..37ae5f3343 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket12.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket12.stree.txt
@@ -1,13 +1,16 @@
-Expression block - Gen<Expr> - 14 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?[abc]?[2]] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:9
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.Identifier;[abc];
-        CSharpTokenType.RightBracket;[]];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.IntegerLiteral;[2];
-        CSharpTokenType.RightBracket;[]];
+CSharpCodeBlock - [0..14)::14 - [@val?[abc]?[2]]
+    CSharpImplicitExpression - [0..14)::14
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..14)::13
+            CSharpCodeBlock - [1..14)::13
+                CSharpExpressionLiteral - [1..14)::13 - [val?[abc]?[2]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    LeftBracket;[[];
+                    Identifier;[abc];
+                    RightBracket;[]];
+                    QuestionMark;[?];
+                    LeftBracket;[[];
+                    IntegerLiteral;[2];
+                    RightBracket;[]];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket13.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket13.cspans.txt
index 234d8ba877..35b87f10d7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket13.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket13.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [22] )
-Code span at (1:0,1 [21] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [22] )
+Code span at (1:0,1 [21] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [22] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket13.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket13.stree.txt
index 3c1fe5005f..12942f3d78 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket13.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket13.stree.txt
@@ -1,16 +1,19 @@
-Expression block - Gen<Expr> - 22 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?[abc]?.more?[def]] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:12
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.Identifier;[abc];
-        CSharpTokenType.RightBracket;[]];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[more];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.Identifier;[def];
-        CSharpTokenType.RightBracket;[]];
+CSharpCodeBlock - [0..22)::22 - [@val?[abc]?.more?[def]]
+    CSharpImplicitExpression - [0..22)::22
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..22)::21
+            CSharpCodeBlock - [1..22)::21
+                CSharpExpressionLiteral - [1..22)::21 - [val?[abc]?.more?[def]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    LeftBracket;[[];
+                    Identifier;[abc];
+                    RightBracket;[]];
+                    QuestionMark;[?];
+                    Dot;[.];
+                    Identifier;[more];
+                    QuestionMark;[?];
+                    LeftBracket;[[];
+                    Identifier;[def];
+                    RightBracket;[]];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket14.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket14.cspans.txt
index 49e8605cc5..fbdf3c744b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket14.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket14.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [21] )
-Code span at (1:0,1 [20] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [21] )
+Code span at (1:0,1 [20] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [21] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket14.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket14.stree.txt
index 24b8db6eaf..ee022171e8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket14.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket14.stree.txt
@@ -1,15 +1,18 @@
-Expression block - Gen<Expr> - 21 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?[abc]?.more?.abc] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:11
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.Identifier;[abc];
-        CSharpTokenType.RightBracket;[]];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[more];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[abc];
+CSharpCodeBlock - [0..21)::21 - [@val?[abc]?.more?.abc]
+    CSharpImplicitExpression - [0..21)::21
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..21)::20
+            CSharpCodeBlock - [1..21)::20
+                CSharpExpressionLiteral - [1..21)::20 - [val?[abc]?.more?.abc] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    LeftBracket;[[];
+                    Identifier;[abc];
+                    RightBracket;[]];
+                    QuestionMark;[?];
+                    Dot;[.];
+                    Identifier;[more];
+                    QuestionMark;[?];
+                    Dot;[.];
+                    Identifier;[abc];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket15.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket15.cspans.txt
index 8df3e04068..520ec8b081 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket15.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket15.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [19] )
-Code span at (1:0,1 [18] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [19] )
+Code span at (1:0,1 [18] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [19] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket15.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket15.stree.txt
index d8b3eb81dd..1cfcda0fd3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket15.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket15.stree.txt
@@ -1,13 +1,16 @@
-Expression block - Gen<Expr> - 19 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?[null ?? true]] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:9
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.Keyword;[null];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NullCoalesce;[??];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightBracket;[]];
+CSharpCodeBlock - [0..19)::19 - [@val?[null ?? true]]
+    CSharpImplicitExpression - [0..19)::19
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..19)::18
+            CSharpCodeBlock - [1..19)::18
+                CSharpExpressionLiteral - [1..19)::18 - [val?[null ?? true]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    LeftBracket;[[];
+                    Keyword;[null];
+                    Whitespace;[ ];
+                    NullCoalesce;[??];
+                    Whitespace;[ ];
+                    Keyword;[true];
+                    RightBracket;[]];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket16.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket16.cspans.txt
index 9c65443a64..ae2be86cae 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket16.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket16.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [20] )
-Code span at (1:0,1 [19] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [20] )
+Code span at (1:0,1 [19] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [20] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket16.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket16.stree.txt
index 6cef2a04b9..d6fb60a93e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket16.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket16.stree.txt
@@ -1,17 +1,20 @@
-Expression block - Gen<Expr> - 20 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?[abc?.gef?[-1]]] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:13
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.Identifier;[abc];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[gef];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.Minus;[-];
-        CSharpTokenType.IntegerLiteral;[1];
-        CSharpTokenType.RightBracket;[]];
-        CSharpTokenType.RightBracket;[]];
+CSharpCodeBlock - [0..20)::20 - [@val?[abc?.gef?[-1]]]
+    CSharpImplicitExpression - [0..20)::20
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..20)::19
+            CSharpCodeBlock - [1..20)::19
+                CSharpExpressionLiteral - [1..20)::19 - [val?[abc?.gef?[-1]]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    LeftBracket;[[];
+                    Identifier;[abc];
+                    QuestionMark;[?];
+                    Dot;[.];
+                    Identifier;[gef];
+                    QuestionMark;[?];
+                    LeftBracket;[[];
+                    Minus;[-];
+                    IntegerLiteral;[1];
+                    RightBracket;[]];
+                    RightBracket;[]];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket2.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket2.cspans.txt
index cdb23fb755..5d8d6c3b55 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket2.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket2.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
-Code span at (1:0,1 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket2.stree.txt
index d0922098d3..d192fdd05b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket2.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 4 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[val];
+CSharpCodeBlock - [0..4)::4 - [@val]
+    CSharpImplicitExpression - [0..4)::4
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..4)::3
+            CSharpCodeBlock - [1..4)::3
+                CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket3.stree.txt
index 6323d68f11..5de915db6f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket3.stree.txt
@@ -1,7 +1,10 @@
-Expression block - Gen<Expr> - 6 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?[] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
+CSharpCodeBlock - [0..6)::6 - [@val?[]
+    CSharpImplicitExpression - [0..6)::6
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..6)::5
+            CSharpCodeBlock - [1..6)::5
+                CSharpExpressionLiteral - [1..6)::5 - [val?[] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    LeftBracket;[[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket4.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket4.cspans.txt
index cdb23fb755..5d8d6c3b55 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket4.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket4.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
-Code span at (1:0,1 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket4.stree.txt
index d0922098d3..d192fdd05b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket4.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 4 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[val];
+CSharpCodeBlock - [0..4)::4 - [@val]
+    CSharpImplicitExpression - [0..4)::4
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..4)::3
+            CSharpCodeBlock - [1..4)::3
+                CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket5.stree.txt
index a46eeb9133..c588b95505 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket5.stree.txt
@@ -1,8 +1,11 @@
-Expression block - Gen<Expr> - 10 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?[more] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:4
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.Identifier;[more];
+CSharpCodeBlock - [0..10)::10 - [@val?[more]
+    CSharpImplicitExpression - [0..10)::10
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..10)::9
+            CSharpCodeBlock - [1..10)::9
+                CSharpExpressionLiteral - [1..10)::9 - [val?[more] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    LeftBracket;[[];
+                    Identifier;[more];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket6.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket6.cspans.txt
index befccd6124..5796fa527a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket6.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket6.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
-Code span at (1:0,1 [7] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [8] )
+Code span at (1:0,1 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket6.stree.txt
index b57c6e2517..26101c41b3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket6.stree.txt
@@ -1,9 +1,12 @@
-Expression block - Gen<Expr> - 8 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?[0]] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:5
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.RightBracket;[]];
+CSharpCodeBlock - [0..8)::8 - [@val?[0]]
+    CSharpImplicitExpression - [0..8)::8
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..8)::7
+            CSharpCodeBlock - [1..8)::7
+                CSharpExpressionLiteral - [1..8)::7 - [val?[0]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    LeftBracket;[[];
+                    IntegerLiteral;[0];
+                    RightBracket;[]];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket7.stree.txt
index 6323d68f11..5de915db6f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket7.stree.txt
@@ -1,7 +1,10 @@
-Expression block - Gen<Expr> - 6 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?[] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
+CSharpCodeBlock - [0..6)::6 - [@val?[]
+    CSharpImplicitExpression - [0..6)::6
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..6)::5
+            CSharpCodeBlock - [1..6)::5
+                CSharpExpressionLiteral - [1..6)::5 - [val?[] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    LeftBracket;[[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket8.stree.txt
index 61ca8525a6..2c87b8e475 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket8.stree.txt
@@ -1,9 +1,12 @@
-Expression block - Gen<Expr> - 11 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?[more.] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:5
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.Identifier;[more];
-        CSharpTokenType.Dot;[.];
+CSharpCodeBlock - [0..11)::11 - [@val?[more.]
+    CSharpImplicitExpression - [0..11)::11
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..11)::10
+            CSharpCodeBlock - [1..11)::10
+                CSharpExpressionLiteral - [1..11)::10 - [val?[more.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    LeftBracket;[[];
+                    Identifier;[more];
+                    Dot;[.];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket9.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket9.cspans.txt
index cdb23fb755..5d8d6c3b55 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket9.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket9.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
-Code span at (1:0,1 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket9.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket9.stree.txt
index d0922098d3..d192fdd05b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket9.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Bracket9.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 4 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[val];
+CSharpCodeBlock - [0..4)::4 - [@val]
+    CSharpImplicitExpression - [0..4)::4
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..4)::3
+            CSharpCodeBlock - [1..4)::3
+                CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot1.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot1.cspans.txt
index cdb23fb755..5d8d6c3b55 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot1.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot1.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
-Code span at (1:0,1 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot1.stree.txt
index d0922098d3..d192fdd05b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot1.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 4 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[val];
+CSharpCodeBlock - [0..4)::4 - [@val]
+    CSharpImplicitExpression - [0..4)::4
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..4)::3
+            CSharpCodeBlock - [1..4)::3
+                CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot10.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot10.cspans.txt
index 6c0269d3fa..10f688db0f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot10.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot10.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [10] )
-Code span at (1:0,1 [9] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [10] )
+Code span at (1:0,1 [9] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [10] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot10.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot10.stree.txt
index 957c73bbe7..6e31b6d803 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot10.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot10.stree.txt
@@ -1,8 +1,11 @@
-Expression block - Gen<Expr> - 10 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?.more] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:4
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[more];
+CSharpCodeBlock - [0..10)::10 - [@val?.more]
+    CSharpImplicitExpression - [0..10)::10
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..10)::9
+            CSharpCodeBlock - [1..10)::9
+                CSharpExpressionLiteral - [1..10)::9 - [val?.more] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    Dot;[.];
+                    Identifier;[more];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot11.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot11.cspans.txt
index cdb23fb755..5d8d6c3b55 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot11.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot11.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
-Code span at (1:0,1 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot11.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot11.stree.txt
index d0922098d3..d192fdd05b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot11.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot11.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 4 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[val];
+CSharpCodeBlock - [0..4)::4 - [@val]
+    CSharpImplicitExpression - [0..4)::4
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..4)::3
+            CSharpCodeBlock - [1..4)::3
+                CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot12.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot12.cspans.txt
index 8df3e04068..520ec8b081 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot12.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot12.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [19] )
-Code span at (1:0,1 [18] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [19] )
+Code span at (1:0,1 [18] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [19] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot12.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot12.stree.txt
index 0a0c3e1a67..918469033e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot12.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot12.stree.txt
@@ -1,13 +1,16 @@
-Expression block - Gen<Expr> - 19 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?.more(false)?.] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:9
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[more];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[false];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.Dot;[.];
+CSharpCodeBlock - [0..19)::19 - [@val?.more(false)?.]
+    CSharpImplicitExpression - [0..19)::19
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..19)::18
+            CSharpCodeBlock - [1..19)::18
+                CSharpExpressionLiteral - [1..19)::18 - [val?.more(false)?.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    Dot;[.];
+                    Identifier;[more];
+                    LeftParenthesis;[(];
+                    Keyword;[false];
+                    RightParenthesis;[)];
+                    QuestionMark;[?];
+                    Dot;[.];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot13.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot13.cspans.txt
index 234d8ba877..35b87f10d7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot13.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot13.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [22] )
-Code span at (1:0,1 [21] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [22] )
+Code span at (1:0,1 [21] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [22] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot13.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot13.stree.txt
index 8f54d19b74..569911daeb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot13.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot13.stree.txt
@@ -1,14 +1,17 @@
-Expression block - Gen<Expr> - 22 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?.more(false)?.abc] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:10
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[more];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[false];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[abc];
+CSharpCodeBlock - [0..22)::22 - [@val?.more(false)?.abc]
+    CSharpImplicitExpression - [0..22)::22
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..22)::21
+            CSharpCodeBlock - [1..22)::21
+                CSharpExpressionLiteral - [1..22)::21 - [val?.more(false)?.abc] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    Dot;[.];
+                    Identifier;[more];
+                    LeftParenthesis;[(];
+                    Keyword;[false];
+                    RightParenthesis;[)];
+                    QuestionMark;[?];
+                    Dot;[.];
+                    Identifier;[abc];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot14.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot14.cspans.txt
index 451e06d958..07751b0177 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot14.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot14.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [29] )
-Code span at (1:0,1 [28] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [29] )
+Code span at (1:0,1 [28] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [29] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot14.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot14.stree.txt
index bfb8b54625..f7d7e07ff3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot14.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot14.stree.txt
@@ -1,18 +1,21 @@
-Expression block - Gen<Expr> - 29 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?.more(null ?? true)?.abc] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:14
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[more];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[null];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.NullCoalesce;[??];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[abc];
+CSharpCodeBlock - [0..29)::29 - [@val?.more(null ?? true)?.abc]
+    CSharpImplicitExpression - [0..29)::29
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..29)::28
+            CSharpCodeBlock - [1..29)::28
+                CSharpExpressionLiteral - [1..29)::28 - [val?.more(null ?? true)?.abc] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    Dot;[.];
+                    Identifier;[more];
+                    LeftParenthesis;[(];
+                    Keyword;[null];
+                    Whitespace;[ ];
+                    NullCoalesce;[??];
+                    Whitespace;[ ];
+                    Keyword;[true];
+                    RightParenthesis;[)];
+                    QuestionMark;[?];
+                    Dot;[.];
+                    Identifier;[abc];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot2.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot2.cspans.txt
index cdb23fb755..5d8d6c3b55 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot2.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot2.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
-Code span at (1:0,1 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot2.stree.txt
index d0922098d3..d192fdd05b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot2.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 4 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[val];
+CSharpCodeBlock - [0..4)::4 - [@val]
+    CSharpImplicitExpression - [0..4)::4
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..4)::3
+            CSharpCodeBlock - [1..4)::3
+                CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot3.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot3.cspans.txt
index cdb23fb755..5d8d6c3b55 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot3.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot3.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
-Code span at (1:0,1 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot3.stree.txt
index d0922098d3..d192fdd05b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot3.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 4 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[val];
+CSharpCodeBlock - [0..4)::4 - [@val]
+    CSharpImplicitExpression - [0..4)::4
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..4)::3
+            CSharpCodeBlock - [1..4)::3
+                CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot4.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot4.cspans.txt
index cdb23fb755..5d8d6c3b55 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot4.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot4.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
-Code span at (1:0,1 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot4.stree.txt
index d0922098d3..d192fdd05b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot4.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 4 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[val];
+CSharpCodeBlock - [0..4)::4 - [@val]
+    CSharpImplicitExpression - [0..4)::4
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..4)::3
+            CSharpCodeBlock - [1..4)::3
+                CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot5.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot5.cspans.txt
index dd3f06b886..4b957e0a7e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot5.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot5.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [6] )
-Code span at (1:0,1 [5] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [6] )
+Code span at (1:0,1 [5] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot5.stree.txt
index 3860072ffb..c65efbf473 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot5.stree.txt
@@ -1,7 +1,10 @@
-Expression block - Gen<Expr> - 6 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?.] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.Dot;[.];
+CSharpCodeBlock - [0..6)::6 - [@val?.]
+    CSharpImplicitExpression - [0..6)::6
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..6)::5
+            CSharpCodeBlock - [1..6)::5
+                CSharpExpressionLiteral - [1..6)::5 - [val?.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    Dot;[.];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot6.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot6.cspans.txt
index cdb23fb755..5d8d6c3b55 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot6.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot6.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
-Code span at (1:0,1 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot6.stree.txt
index d0922098d3..d192fdd05b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot6.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 4 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[val];
+CSharpCodeBlock - [0..4)::4 - [@val]
+    CSharpImplicitExpression - [0..4)::4
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..4)::3
+            CSharpCodeBlock - [1..4)::3
+                CSharpExpressionLiteral - [1..4)::3 - [val] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot7.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot7.cspans.txt
index dd3f06b886..4b957e0a7e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot7.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot7.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [6] )
-Code span at (1:0,1 [5] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [6] )
+Code span at (1:0,1 [5] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot7.stree.txt
index 3860072ffb..c65efbf473 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot7.stree.txt
@@ -1,7 +1,10 @@
-Expression block - Gen<Expr> - 6 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?.] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.Dot;[.];
+CSharpCodeBlock - [0..6)::6 - [@val?.]
+    CSharpImplicitExpression - [0..6)::6
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..6)::5
+            CSharpCodeBlock - [1..6)::5
+                CSharpExpressionLiteral - [1..6)::5 - [val?.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    Dot;[.];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot8.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot8.cspans.txt
index dd3f06b886..4b957e0a7e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot8.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot8.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [6] )
-Code span at (1:0,1 [5] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [6] )
+Code span at (1:0,1 [5] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot8.stree.txt
index 3860072ffb..c65efbf473 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot8.stree.txt
@@ -1,7 +1,10 @@
-Expression block - Gen<Expr> - 6 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?.] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.Dot;[.];
+CSharpCodeBlock - [0..6)::6 - [@val?.]
+    CSharpImplicitExpression - [0..6)::6
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..6)::5
+            CSharpCodeBlock - [1..6)::5
+                CSharpExpressionLiteral - [1..6)::5 - [val?.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    Dot;[.];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot9.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot9.cspans.txt
index 6c0269d3fa..10f688db0f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot9.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot9.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [10] )
-Code span at (1:0,1 [9] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [10] )
+Code span at (1:0,1 [9] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [10] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot9.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot9.stree.txt
index 957c73bbe7..6e31b6d803 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot9.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesNullConditionalOperatorImplicitExpression_Dot9.stree.txt
@@ -1,8 +1,11 @@
-Expression block - Gen<Expr> - 10 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [val?.more] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:4
-        CSharpTokenType.Identifier;[val];
-        CSharpTokenType.QuestionMark;[?];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[more];
+CSharpCodeBlock - [0..10)::10 - [@val?.more]
+    CSharpImplicitExpression - [0..10)::10
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..10)::9
+            CSharpCodeBlock - [1..10)::9
+                CSharpExpressionLiteral - [1..10)::9 - [val?.more] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[val];
+                    QuestionMark;[?];
+                    Dot;[.];
+                    Identifier;[more];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesSingleIdentifierAsImplicitExpression.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesSingleIdentifierAsImplicitExpression.cspans.txt
index cdb23fb755..5d8d6c3b55 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesSingleIdentifierAsImplicitExpression.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesSingleIdentifierAsImplicitExpression.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
-Code span at (1:0,1 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesSingleIdentifierAsImplicitExpression.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesSingleIdentifierAsImplicitExpression.stree.txt
index 8967206fd1..fae52862a5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesSingleIdentifierAsImplicitExpression.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParsesSingleIdentifierAsImplicitExpression.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 4 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[foo];
+CSharpCodeBlock - [0..4)::4 - [@foo]
+    CSharpImplicitExpression - [0..4)::4
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..4)::3
+            CSharpCodeBlock - [1..4)::3
+                CSharpExpressionLiteral - [1..4)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesBracketsAndBalancesThemInImplicitExpression.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesBracketsAndBalancesThemInImplicitExpression.cspans.txt
index 5daaaee8dd..e36107cf2e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesBracketsAndBalancesThemInImplicitExpression.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesBracketsAndBalancesThemInImplicitExpression.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [34] )
-Code span at (1:0,1 [33] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [34] )
+Code span at (1:0,1 [33] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [34] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesBracketsAndBalancesThemInImplicitExpression.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesBracketsAndBalancesThemInImplicitExpression.stree.txt
index b600515ce2..5fd275a687 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesBracketsAndBalancesThemInImplicitExpression.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesBracketsAndBalancesThemInImplicitExpression.stree.txt
@@ -1,25 +1,28 @@
-Expression block - Gen<Expr> - 34 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo.bar[4 * (8 + 7)]["fo\"o"].baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:21
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.IntegerLiteral;[4];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Star;[*];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.IntegerLiteral;[8];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Plus;[+];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[7];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.RightBracket;[]];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.StringLiteral;["fo\"o"];
-        CSharpTokenType.RightBracket;[]];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[baz];
+CSharpCodeBlock - [0..34)::34 - [@foo.bar[4 * (8 + 7)]["fo\"o"].baz]
+    CSharpImplicitExpression - [0..34)::34
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..34)::33
+            CSharpCodeBlock - [1..34)::33
+                CSharpExpressionLiteral - [1..34)::33 - [foo.bar[4 * (8 + 7)]["fo\"o"].baz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
+                    Dot;[.];
+                    Identifier;[bar];
+                    LeftBracket;[[];
+                    IntegerLiteral;[4];
+                    Whitespace;[ ];
+                    Star;[*];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    IntegerLiteral;[8];
+                    Whitespace;[ ];
+                    Plus;[+];
+                    Whitespace;[ ];
+                    IntegerLiteral;[7];
+                    RightParenthesis;[)];
+                    RightBracket;[]];
+                    LeftBracket;[[];
+                    StringLiteral;["fo\"o"];
+                    RightBracket;[]];
+                    Dot;[.];
+                    Identifier;[baz];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesParenthesesAndBalancesThemInImplicitExpression.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesParenthesesAndBalancesThemInImplicitExpression.cspans.txt
index f685dcc492..37fa7b6ae0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesParenthesesAndBalancesThemInImplicitExpression.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesParenthesesAndBalancesThemInImplicitExpression.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [115] )
-Code span at (1:0,1 [114] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [115] )
+Code span at (1:0,1 [114] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [115] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesParenthesesAndBalancesThemInImplicitExpression.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesParenthesesAndBalancesThemInImplicitExpression.stree.txt
index 860b824f83..f5a664425e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesParenthesesAndBalancesThemInImplicitExpression.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ProperlyParsesParenthesesAndBalancesThemInImplicitExpression.stree.txt
@@ -1,63 +1,66 @@
-Expression block - Gen<Expr> - 115 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo().bar("bi\"z", 4)("chained method; call").baz(@"bo""z", '\'', () => { return 4; }, (4+5+new { foo = bar[4] }))] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:59
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;["bi\"z"];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[4];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;["chained method; call"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;[@"bo""z"];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.CharacterLiteral;['\''];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.GreaterThanEqual;[=>];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[return];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[4];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.IntegerLiteral;[4];
-        CSharpTokenType.Plus;[+];
-        CSharpTokenType.IntegerLiteral;[5];
-        CSharpTokenType.Plus;[+];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftBracket;[[];
-        CSharpTokenType.IntegerLiteral;[4];
-        CSharpTokenType.RightBracket;[]];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..115)::115 - [@foo().bar("bi\"z", 4)("chained method; call").baz(@"bo""z", '\'', () => { return 4; }, (4+5+new { foo = bar[4] }))]
+    CSharpImplicitExpression - [0..115)::115
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..115)::114
+            CSharpCodeBlock - [1..115)::114
+                CSharpExpressionLiteral - [1..115)::114 - [foo().bar("bi\"z", 4)("chained method; call").baz(@"bo""z", '\'', () => { return 4; }, (4+5+new { foo = bar[4] }))] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
+                    LeftParenthesis;[(];
+                    RightParenthesis;[)];
+                    Dot;[.];
+                    Identifier;[bar];
+                    LeftParenthesis;[(];
+                    StringLiteral;["bi\"z"];
+                    Comma;[,];
+                    Whitespace;[ ];
+                    IntegerLiteral;[4];
+                    RightParenthesis;[)];
+                    LeftParenthesis;[(];
+                    StringLiteral;["chained method; call"];
+                    RightParenthesis;[)];
+                    Dot;[.];
+                    Identifier;[baz];
+                    LeftParenthesis;[(];
+                    StringLiteral;[@"bo""z"];
+                    Comma;[,];
+                    Whitespace;[ ];
+                    CharacterLiteral;['\''];
+                    Comma;[,];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    GreaterThanEqual;[=>];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Keyword;[return];
+                    Whitespace;[ ];
+                    IntegerLiteral;[4];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Comma;[,];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    IntegerLiteral;[4];
+                    Plus;[+];
+                    IntegerLiteral;[5];
+                    Plus;[+];
+                    Keyword;[new];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    LeftBracket;[[];
+                    IntegerLiteral;[4];
+                    RightBracket;[]];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    RightParenthesis;[)];
+                    RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/StopsBalancingParenthesesAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/StopsBalancingParenthesesAtEOF.stree.txt
index baef337685..aa7e5347dc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/StopsBalancingParenthesesAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/StopsBalancingParenthesesAtEOF.stree.txt
@@ -1,8 +1,11 @@
-Expression block - Gen<Expr> - 7 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo(()] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:4
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..7)::7 - [@foo(()]
+    CSharpImplicitExpression - [0..7)::7
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..7)::6
+            CSharpCodeBlock - [1..7)::6
+                CSharpExpressionLiteral - [1..7)::6 - [foo(()] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
+                    LeftParenthesis;[(];
+                    LeftParenthesis;[(];
+                    RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/SupportsSlashesWithinComplexImplicitExpressions.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/SupportsSlashesWithinComplexImplicitExpressions.cspans.txt
index a9cb762b3d..5c4dc5a1d4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/SupportsSlashesWithinComplexImplicitExpressions.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/SupportsSlashesWithinComplexImplicitExpressions.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [103] )
-Code span at (1:0,1 [102] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [103] )
+Code span at (1:0,1 [102] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [103] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/SupportsSlashesWithinComplexImplicitExpressions.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/SupportsSlashesWithinComplexImplicitExpressions.stree.txt
index 00f9a55723..2154a5e70e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/SupportsSlashesWithinComplexImplicitExpressions.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/SupportsSlashesWithinComplexImplicitExpressions.stree.txt
@@ -1,39 +1,42 @@
-Expression block - Gen<Expr> - 103 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [DataGridColumn.Template("Years of Service", e => (int)Math.Round((DateTime.Now - dt).TotalDays / 365))] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:35
-        CSharpTokenType.Identifier;[DataGridColumn];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Template];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;["Years of Service"];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[e];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.GreaterThanEqual;[=>];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Identifier;[Math];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Round];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[DateTime];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Now];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Minus;[-];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[dt];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[TotalDays];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Slash;[/];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[365];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..103)::103 - [@DataGridColumn.Template("Years of Service", e => (int)Math.Round((DateTime.Now - dt).TotalDays / 365))]
+    CSharpImplicitExpression - [0..103)::103
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..103)::102
+            CSharpCodeBlock - [1..103)::102
+                CSharpExpressionLiteral - [1..103)::102 - [DataGridColumn.Template("Years of Service", e => (int)Math.Round((DateTime.Now - dt).TotalDays / 365))] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[DataGridColumn];
+                    Dot;[.];
+                    Identifier;[Template];
+                    LeftParenthesis;[(];
+                    StringLiteral;["Years of Service"];
+                    Comma;[,];
+                    Whitespace;[ ];
+                    Identifier;[e];
+                    Whitespace;[ ];
+                    GreaterThanEqual;[=>];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    Keyword;[int];
+                    RightParenthesis;[)];
+                    Identifier;[Math];
+                    Dot;[.];
+                    Identifier;[Round];
+                    LeftParenthesis;[(];
+                    LeftParenthesis;[(];
+                    Identifier;[DateTime];
+                    Dot;[.];
+                    Identifier;[Now];
+                    Whitespace;[ ];
+                    Minus;[-];
+                    Whitespace;[ ];
+                    Identifier;[dt];
+                    RightParenthesis;[)];
+                    Dot;[.];
+                    Identifier;[TotalDays];
+                    Whitespace;[ ];
+                    Slash;[/];
+                    Whitespace;[ ];
+                    IntegerLiteral;[365];
+                    RightParenthesis;[)];
+                    RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpr.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpr.cspans.txt
index befccd6124..5796fa527a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpr.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpr.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
-Code span at (1:0,1 [7] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [8] )
+Code span at (1:0,1 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpr.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpr.stree.txt
index a319543617..330a241eff 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpr.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpr.stree.txt
@@ -1,7 +1,10 @@
-Expression block - Gen<Expr> - 8 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo.bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[bar];
+CSharpCodeBlock - [0..8)::8 - [@foo.bar]
+    CSharpImplicitExpression - [0..8)::8
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..8)::7
+            CSharpCodeBlock - [1..8)::7
+                CSharpExpressionLiteral - [1..8)::7 - [foo.bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
+                    Dot;[.];
+                    Identifier;[bar];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExprBeforeDotIfDotNotFollowedByIdentifierStartChar.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExprBeforeDotIfDotNotFollowedByIdentifierStartChar.cspans.txt
index bde230d5d2..864c7d8d23 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExprBeforeDotIfDotNotFollowedByIdentifierStartChar.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExprBeforeDotIfDotNotFollowedByIdentifierStartChar.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [14] )
-Code span at (1:0,1 [13] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [14] )
+Code span at (1:0,1 [13] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [14] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExprBeforeDotIfDotNotFollowedByIdentifierStartChar.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExprBeforeDotIfDotNotFollowedByIdentifierStartChar.stree.txt
index 505ddd1f05..d2344bfa28 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExprBeforeDotIfDotNotFollowedByIdentifierStartChar.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExprBeforeDotIfDotNotFollowedByIdentifierStartChar.stree.txt
@@ -1,11 +1,14 @@
-Expression block - Gen<Expr> - 14 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo().bar.baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:7
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[baz];
+CSharpCodeBlock - [0..14)::14 - [@foo().bar.baz]
+    CSharpImplicitExpression - [0..14)::14
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..14)::13
+            CSharpCodeBlock - [1..14)::13
+                CSharpExpressionLiteral - [1..14)::13 - [foo().bar.baz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
+                    LeftParenthesis;[(];
+                    RightParenthesis;[)];
+                    Dot;[.];
+                    Identifier;[bar];
+                    Dot;[.];
+                    Identifier;[baz];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlEndTag.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlEndTag.cspans.txt
index bde230d5d2..864c7d8d23 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlEndTag.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlEndTag.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [14] )
-Code span at (1:0,1 [13] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [14] )
+Code span at (1:0,1 [13] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [14] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlEndTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlEndTag.stree.txt
index 505ddd1f05..d2344bfa28 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlEndTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlEndTag.stree.txt
@@ -1,11 +1,14 @@
-Expression block - Gen<Expr> - 14 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo().bar.baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:7
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[baz];
+CSharpCodeBlock - [0..14)::14 - [@foo().bar.baz]
+    CSharpImplicitExpression - [0..14)::14
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..14)::13
+            CSharpCodeBlock - [1..14)::13
+                CSharpExpressionLiteral - [1..14)::13 - [foo().bar.baz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
+                    LeftParenthesis;[(];
+                    RightParenthesis;[)];
+                    Dot;[.];
+                    Identifier;[bar];
+                    Dot;[.];
+                    Identifier;[baz];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlStartTag.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlStartTag.cspans.txt
index bde230d5d2..864c7d8d23 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlStartTag.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlStartTag.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [14] )
-Code span at (1:0,1 [13] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [14] )
+Code span at (1:0,1 [13] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [14] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlStartTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlStartTag.stree.txt
index 505ddd1f05..d2344bfa28 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlStartTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtHtmlStartTag.stree.txt
@@ -1,11 +1,14 @@
-Expression block - Gen<Expr> - 14 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo().bar.baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:7
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[baz];
+CSharpCodeBlock - [0..14)::14 - [@foo().bar.baz]
+    CSharpImplicitExpression - [0..14)::14
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..14)::13
+            CSharpCodeBlock - [1..14)::13
+                CSharpExpressionLiteral - [1..14)::13 - [foo().bar.baz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
+                    LeftParenthesis;[(];
+                    RightParenthesis;[)];
+                    Dot;[.];
+                    Identifier;[bar];
+                    Dot;[.];
+                    Identifier;[baz];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.cspans.txt
index cdb23fb755..5d8d6c3b55 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
-Code span at (1:0,1 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.stree.txt
index 8967206fd1..fae52862a5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 4 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[foo];
+CSharpCodeBlock - [0..4)::4 - [@foo]
+    CSharpImplicitExpression - [0..4)::4
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..4)::3
+            CSharpCodeBlock - [1..4)::3
+                CSharpExpressionLiteral - [1..4)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.cspans.txt
index 6c0269d3fa..10f688db0f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [10] )
-Code span at (1:0,1 [9] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [10] )
+Code span at (1:0,1 [9] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [10] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.stree.txt
index 7dc1a3a043..8b9c2926b3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.stree.txt
@@ -1,9 +1,12 @@
-Expression block - Gen<Expr> - 10 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo.bar()] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:5
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..10)::10 - [@foo.bar()]
+    CSharpImplicitExpression - [0..10)::10
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..10)::9
+            CSharpCodeBlock - [1..10)::9
+                CSharpExpressionLiteral - [1..10)::9 - [foo.bar()] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
+                    Dot;[.];
+                    Identifier;[bar];
+                    LeftParenthesis;[(];
+                    RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.cspans.txt
index cdb23fb755..5d8d6c3b55 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
-Code span at (1:0,1 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.stree.txt
index 8967206fd1..fae52862a5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/TerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 4 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[foo];
+CSharpCodeBlock - [0..4)::4 - [@foo]
+    CSharpImplicitExpression - [0..4)::4
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..4)::3
+            CSharpCodeBlock - [1..4)::3
+                CSharpExpressionLiteral - [1..4)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[foo];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedCodeBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedCodeBlock.stree.txt
index f34e002cbb..23cef6534e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedCodeBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedCodeBlock.stree.txt
@@ -1,29 +1,29 @@
-Statement block - Gen<None> - 35 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [while(true) { { { { foo(); } } } }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:25
-        CSharpTokenType.Keyword;[while];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..35)::35 - [@while(true) { { { { foo(); } } } }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..35)::34 - [while(true) { { { { foo(); } } } }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[while];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedExplicitExpression.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedExplicitExpression.stree.txt
index e7571bdb11..555f64dafe 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedExplicitExpression.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedExplicitExpression.stree.txt
@@ -1,23 +1,26 @@
-Statement block - Gen<None> - 23 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [while(true) { ] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:7
-        CSharpTokenType.Keyword;[while];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-    Expression block - Gen<Expr> - 6 - (15:0,15)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-            CSharpTokenType.LeftParenthesis;[(];
-        Code span - Gen<Expr> - [foo] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-        MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1
-            CSharpTokenType.RightParenthesis;[)];
-    Code span - Gen<Stmt> - [ }] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:2
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..23)::23 - [@while(true) { @(foo) }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..15)::14 - [while(true) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[while];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+    CSharpCodeBlock - [15..21)::6
+        CSharpExplicitExpression - [15..21)::6
+            CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpExplicitExpressionBody - [16..21)::5
+                RazorMetaCode - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    LeftParenthesis;[(];
+                CSharpCodeBlock - [17..20)::3
+                    CSharpExpressionLiteral - [17..20)::3 - [foo] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                        Identifier;[foo];
+                RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    RightParenthesis;[)];
+    CSharpStatementLiteral - [21..23)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.cspans.txt
index 6f05c63fa9..c33ed4d08a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.cspans.txt
@@ -1,5 +1,5 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
 Code span at (1:0,1 [14] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [21] )
 Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Expression block at (15:0,15 [4] )
-Code span at (16:0,16 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (15:0,15 [4] )
+Code span at (16:0,16 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (15:0,15 [4] )
 Code span at (19:0,19 [2] ) (Accepts:None) - Parent: Statement block at (0:0,0 [21] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.stree.txt
index 2f0e49b1ad..749472b558 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.stree.txt
@@ -1,19 +1,22 @@
-Statement block - Gen<None> - 21 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [while(true) { ] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:7
-        CSharpTokenType.Keyword;[while];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-    Expression block - Gen<Expr> - 4 - (15:0,15)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (16:0,16) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-    Code span - Gen<Stmt> - [ }] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:2
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..21)::21 - [@while(true) { @foo }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..15)::14 - [while(true) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[while];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+    CSharpCodeBlock - [15..19)::4
+        CSharpImplicitExpression - [15..19)::4
+            CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpImplicitExpressionBody - [16..19)::3
+                CSharpCodeBlock - [16..19)::3
+                    CSharpExpressionLiteral - [16..19)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                        Identifier;[foo];
+    CSharpStatementLiteral - [19..21)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedKeywordStatement.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedKeywordStatement.stree.txt
index f7c3782b99..96fe888bc0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedKeywordStatement.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedKeywordStatement.stree.txt
@@ -1,43 +1,43 @@
-Statement block - Gen<None> - 55 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [while(true) { for(int i = 0; i < 10; i++) { foo(); } }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:39
-        CSharpTokenType.Keyword;[while];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[for];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.Increment;[++];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..55)::55 - [@while(true) { for(int i = 0; i < 10; i++) { foo(); } }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..55)::54 - [while(true) { for(int i = 0; i < 10; i++) { foo(); } }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[while];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Keyword;[for];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Increment;[++];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedMarkupBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedMarkupBlock.stree.txt
index 8293783918..e914c2afcb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedMarkupBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedMarkupBlock.stree.txt
@@ -1,30 +1,30 @@
-Statement block - Gen<None> - 29 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [while(true) {] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:6
-        CSharpTokenType.Keyword;[while];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 14 - (14:0,14)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 3 - (15:0,15)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Hello] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
-            HtmlTokenType.Text;[Hello];
-        Tag block - Gen<None> - 4 - (23:0,23)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:None - (28:0,28) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..29)::29 - [@while(true) { <p>Hello</p> }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..14)::13 - [while(true) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[while];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+    MarkupBlock - [14..28)::14
+        MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagBlock - [15..18)::3 - [<p>]
+            MarkupTextLiteral - [15..18)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [18..23)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Hello];
+        MarkupTagBlock - [23..27)::4 - [</p>]
+            MarkupTextLiteral - [23..27)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+    CSharpStatementLiteral - [28..29)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedSimpleStatement.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedSimpleStatement.stree.txt
index 5a2eb3d2e3..b80423d15c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedSimpleStatement.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedSimpleStatement.stree.txt
@@ -1,17 +1,17 @@
-Statement block - Gen<None> - 23 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [while(true) { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:13
-        CSharpTokenType.Keyword;[while];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..23)::23 - [@while(true) { foo(); }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..23)::22 - [while(true) { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[while];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.stree.txt
index 23850e4407..4ffe83985c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.stree.txt
@@ -1,16 +1,12 @@
-Markup block - Gen<None> - 4 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Comment block - Gen<RazorComment> - 4 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-            HtmlTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..4)::4 - [@**@]
+    MarkupBlock - [0..4)::4
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        RazorComment - [0..4)::4
+            RazorCommentTransition;[@];
+            RazorCommentStar;[*];
+            RazorCommentLiteral;[<Missing>];
+            RazorCommentStar;[*];
+            RazorCommentTransition;[@];
+        MarkupTextLiteral - [4..4)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.stree.txt
index 7c36168330..b5d71e6e7d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.stree.txt
@@ -1,43 +1,34 @@
-Markup block - Gen<None> - 25 - (0:0,0)
-    Tag block - Gen<None> - 3 - (0:0,0)
-        Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Markup span - Gen<None> - [  ] - SpanEditHandler;Accepts:Any - (5:1,0) - Tokens:1
-        HtmlTokenType.WhiteSpace;[  ];
-    Comment block - Gen<RazorComment> - 4 - (7:1,2)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (7:1,2) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (8:1,3) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (9:1,4) - Tokens:1
-            HtmlTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (9:1,4) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:1,5) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-    Markup span - Gen<None> - [  LF] - SpanEditHandler;Accepts:Any - (11:1,6) - Tokens:2
-        HtmlTokenType.WhiteSpace;[  ];
-        HtmlTokenType.NewLine;[LF];
-    Comment block - Gen<RazorComment> - 4 - (15:2,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (15:2,0) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (16:2,1) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (17:2,2) - Tokens:1
-            HtmlTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (17:2,2) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (18:2,3) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (19:2,4) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 4 - (21:3,0)
-        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (21:3,0) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..25)::25 - [<p>LF  @**@  LF@**@LF</p>]
+    MarkupBlock - [0..25)::25
+        MarkupTagBlock - [0..3)::3 - [<p>]
+            MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [3..5)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupEphemeralTextLiteral - [5..7)::2 - [  ] - Gen<None> - SpanEditHandler;Accepts:Any
+            Whitespace;[  ];
+        RazorComment - [7..11)::4
+            RazorCommentTransition;[@];
+            RazorCommentStar;[*];
+            RazorCommentLiteral;[<Missing>];
+            RazorCommentStar;[*];
+            RazorCommentTransition;[@];
+        MarkupEphemeralTextLiteral - [11..15)::4 - [  LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            Whitespace;[  ];
+            NewLine;[LF];
+        RazorComment - [15..19)::4
+            RazorCommentTransition;[@];
+            RazorCommentStar;[*];
+            RazorCommentLiteral;[<Missing>];
+            RazorCommentStar;[*];
+            RazorCommentTransition;[@];
+        MarkupEphemeralTextLiteral - [19..21)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTagBlock - [21..25)::4 - [</p>]
+            MarkupTextLiteral - [21..25)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.stree.txt
index 89fc73cdc8..6c431b2348 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.stree.txt
@@ -1,42 +1,33 @@
-Markup block - Gen<None> - 21 - (0:0,0)
-    Tag block - Gen<None> - 3 - (0:0,0)
-        Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Comment block - Gen<RazorComment> - 4 - (5:1,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (5:1,0) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (6:1,1) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (7:1,2) - Tokens:1
-            HtmlTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (7:1,2) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (8:1,3) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (9:1,4) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Markup span - Gen<None> - [  ] - SpanEditHandler;Accepts:Any - (9:1,4) - Tokens:1
-        HtmlTokenType.WhiteSpace;[  ];
-    Comment block - Gen<RazorComment> - 4 - (11:1,6)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (11:1,6) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (12:1,7) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (13:1,8) - Tokens:1
-            HtmlTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (13:1,8) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (14:1,9) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (15:1,10) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 4 - (17:2,0)
-        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (17:2,0) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..21)::21 - [<p>LF@**@  @**@LF</p>]
+    MarkupBlock - [0..21)::21
+        MarkupTagBlock - [0..3)::3 - [<p>]
+            MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [3..5)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        RazorComment - [5..9)::4
+            RazorCommentTransition;[@];
+            RazorCommentStar;[*];
+            RazorCommentLiteral;[<Missing>];
+            RazorCommentStar;[*];
+            RazorCommentTransition;[@];
+        MarkupTextLiteral - [9..9)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        MarkupEphemeralTextLiteral - [9..11)::2 - [  ] - Gen<None> - SpanEditHandler;Accepts:Any
+            Whitespace;[  ];
+        RazorComment - [11..15)::4
+            RazorCommentTransition;[@];
+            RazorCommentStar;[*];
+            RazorCommentLiteral;[<Missing>];
+            RazorCommentStar;[*];
+            RazorCommentTransition;[@];
+        MarkupEphemeralTextLiteral - [15..17)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTagBlock - [17..21)::4 - [</p>]
+            MarkupTextLiteral - [17..21)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInClosingTagBlock.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInClosingTagBlock.cspans.txt
new file mode 100644
index 0000000000..af3dd82d31
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInClosingTagBlock.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [6] )
+Markup span at (6:0,6 [7] ) (Accepts:Any) - Parent: Tag block at (6:0,6 [7] )
+Transition span at (13:0,13 [1] ) (Accepts:None) - Parent: Comment block at (13:0,13 [19] )
+MetaCode span at (14:0,14 [1] ) (Accepts:None) - Parent: Comment block at (13:0,13 [19] )
+Comment span at (15:0,15 [15] ) (Accepts:Any) - Parent: Comment block at (13:0,13 [19] )
+MetaCode span at (30:0,30 [1] ) (Accepts:None) - Parent: Comment block at (13:0,13 [19] )
+Transition span at (31:0,31 [1] ) (Accepts:None) - Parent: Comment block at (13:0,13 [19] )
+Markup span at (32:0,32 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInClosingTagBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInClosingTagBlock.stree.txt
new file mode 100644
index 0000000000..b92e989308
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInClosingTagBlock.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..33)::33 - [<text></text @* razor comment *@>]
+    MarkupBlock - [0..33)::33
+        MarkupTagBlock - [0..6)::6 - [<text>]
+            MarkupTextLiteral - [0..6)::6 - [<text>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[text];
+                CloseAngle;[>];
+        MarkupTagBlock - [6..13)::7 - [</text ]
+            MarkupTextLiteral - [6..13)::7 - [</text ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[text];
+                Whitespace;[ ];
+        RazorComment - [13..32)::19
+            RazorCommentTransition;[@];
+            RazorCommentStar;[*];
+            RazorCommentLiteral;[ razor comment ];
+            RazorCommentStar;[*];
+            RazorCommentTransition;[@];
+        MarkupTextLiteral - [32..33)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.stree.txt
index a720123ae4..59217177a6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.stree.txt
@@ -1,23 +1,22 @@
-Markup block - Gen<None> - 13 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Expression block - Gen<Expr> - 13 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [foo(LF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3
-            CSharpTokenType.Identifier;[foo];
-            CSharpTokenType.LeftParenthesis;[(];
-            CSharpTokenType.NewLine;[LF];
-        Comment block - Gen<RazorComment> - 4 - (7:1,0)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (7:1,0) - Tokens:1
-                CSharpTokenType.RazorCommentTransition;[@];
-            MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (8:1,1) - Tokens:1
-                CSharpTokenType.RazorCommentStar;[*];
-            Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (9:1,2) - Tokens:1
-                CSharpTokenType.Unknown;[];
-            MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (9:1,2) - Tokens:1
-                CSharpTokenType.RazorCommentStar;[*];
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:1,3) - Tokens:1
-                CSharpTokenType.RazorCommentTransition;[@];
-        Code span - Gen<Expr> - [LF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (11:1,4) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
+RazorDocument - [0..13)::13 - [@foo(LF@**@LF]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..13)::13
+            CSharpImplicitExpression - [0..13)::13
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..13)::12
+                    CSharpCodeBlock - [1..13)::12
+                        CSharpExpressionLiteral - [1..7)::6 - [foo(LF] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+                            LeftParenthesis;[(];
+                            NewLine;[LF];
+                        RazorComment - [7..11)::4
+                            RazorCommentTransition;[@];
+                            RazorCommentStar;[*];
+                            RazorCommentLiteral;[<Missing>];
+                            RazorCommentStar;[*];
+                            RazorCommentTransition;[@];
+                        CSharpExpressionLiteral - [11..13)::2 - [LF] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.stree.txt
index d220dd0bc1..365ba65dba 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.stree.txt
@@ -1,27 +1,23 @@
-Markup block - Gen<None> - 15 - (0:0,0)
-    Tag block - Gen<None> - 3 - (0:0,0)
-        Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Comment block - Gen<RazorComment> - 4 - (5:1,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (5:1,0) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (6:1,1) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (7:1,2) - Tokens:1
-            HtmlTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (7:1,2) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (8:1,3) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (9:1,4) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 4 - (11:2,0)
-        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (11:2,0) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..15)::15 - [<p>LF@**@LF</p>]
+    MarkupBlock - [0..15)::15
+        MarkupTagBlock - [0..3)::3 - [<p>]
+            MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [3..5)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        RazorComment - [5..9)::4
+            RazorCommentTransition;[@];
+            RazorCommentStar;[*];
+            RazorCommentLiteral;[<Missing>];
+            RazorCommentStar;[*];
+            RazorCommentTransition;[@];
+        MarkupEphemeralTextLiteral - [9..11)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTagBlock - [11..15)::4 - [</p>]
+            MarkupTextLiteral - [11..15)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInOpeningTagBlock.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInOpeningTagBlock.cspans.txt
new file mode 100644
index 0000000000..be8102eb0a
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInOpeningTagBlock.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [26] )
+Transition span at (6:0,6 [1] ) (Accepts:None) - Parent: Comment block at (6:0,6 [19] )
+MetaCode span at (7:0,7 [1] ) (Accepts:None) - Parent: Comment block at (6:0,6 [19] )
+Comment span at (8:0,8 [15] ) (Accepts:Any) - Parent: Comment block at (6:0,6 [19] )
+MetaCode span at (23:0,23 [1] ) (Accepts:None) - Parent: Comment block at (6:0,6 [19] )
+Transition span at (24:0,24 [1] ) (Accepts:None) - Parent: Comment block at (6:0,6 [19] )
+Markup span at (25:0,25 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [26] )
+Markup span at (26:0,26 [7] ) (Accepts:Any) - Parent: Tag block at (26:0,26 [7] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInOpeningTagBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInOpeningTagBlock.stree.txt
new file mode 100644
index 0000000000..85ccccc8ad
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInOpeningTagBlock.stree.txt
@@ -0,0 +1,21 @@
+RazorDocument - [0..33)::33 - [<text @* razor comment *@></text>]
+    MarkupBlock - [0..33)::33
+        MarkupTagBlock - [0..26)::26 - [<text @* razor comment *@>]
+            MarkupTextLiteral - [0..6)::6 - [<text ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[text];
+                Whitespace;[ ];
+            RazorComment - [6..25)::19
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[ razor comment ];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            MarkupTextLiteral - [25..26)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+        MarkupTagBlock - [26..33)::7 - [</text>]
+            MarkupTextLiteral - [26..33)::7 - [</text>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[text];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.stree.txt
index c83ed3402f..45402df012 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.stree.txt
@@ -1,35 +1,36 @@
-Markup block - Gen<None> - 26 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 26 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF    ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (2:0,2) - Tokens:2
-            CSharpTokenType.NewLine;[LF];
-            CSharpTokenType.WhiteSpace;[    ];
-        Markup block - Gen<None> - 18 - (8:1,4)
-            Tag block - Gen<None> - 5 - (8:1,4)
-                Transition span - Gen<None> - [<text] - SpanEditHandler;Accepts:Any - (8:1,4) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[text];
-            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (13:1,9) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
-            Markup span - Gen<None> - [    ] - SpanEditHandler;Accepts:Any - (15:2,0) - Tokens:1
-                HtmlTokenType.WhiteSpace;[    ];
-            Comment block - Gen<RazorComment> - 4 - (19:2,4)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (19:2,4) - Tokens:1
-                    HtmlTokenType.RazorCommentTransition;[@];
-                MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (20:2,5) - Tokens:1
-                    HtmlTokenType.RazorCommentStar;[*];
-                Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (21:2,6) - Tokens:1
-                    HtmlTokenType.Unknown;[];
-                MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (21:2,6) - Tokens:1
-                    HtmlTokenType.RazorCommentStar;[*];
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (22:2,7) - Tokens:1
-                    HtmlTokenType.RazorCommentTransition;[@];
-            Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (23:2,8) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
-            Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (25:3,0) - Tokens:1
-                HtmlTokenType.Text;[}];
+RazorDocument - [0..26)::26 - [@{LF    <textLF    @**@LF}]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            CSharpStatement - [0..26)::26
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..26)::25
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..26)::24
+                        CSharpStatementLiteral - [2..8)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        MarkupBlock - [8..26)::18
+                            MarkupTagBlock - [8..13)::5 - [<text]
+                                MarkupTransition - [8..13)::5 - Gen<None> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[text];
+                            MarkupTextLiteral - [13..15)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                            MarkupEphemeralTextLiteral - [15..19)::4 - [    ] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Whitespace;[    ];
+                            RazorComment - [19..23)::4
+                                RazorCommentTransition;[@];
+                                RazorCommentStar;[*];
+                                RazorCommentLiteral;[<Missing>];
+                                RazorCommentStar;[*];
+                                RazorCommentTransition;[@];
+                            MarkupEphemeralTextLiteral - [23..25)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                            MarkupTextLiteral - [25..26)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[}];
+                    RazorMetaCode - [26..26)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.stree.txt
index f1c4b4d734..606807056b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.stree.txt
@@ -1,43 +1,34 @@
-Markup block - Gen<None> - 45 - (0:0,0)
-    Tag block - Gen<None> - 3 - (0:0,0)
-        Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [LFLF] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:2
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.NewLine;[LF];
-    Comment block - Gen<RazorComment> - 13 - (7:2,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (7:2,0) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (8:2,1) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [ content ] - SpanEditHandler;Accepts:Any - (9:2,2) - Tokens:1
-            HtmlTokenType.RazorComment;[ content ];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (18:2,11) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (19:2,12) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (20:2,13) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Comment block - Gen<RazorComment> - 15 - (22:3,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (22:3,0) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (23:3,1) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [LFcontentLF] - SpanEditHandler;Accepts:Any - (24:3,2) - Tokens:1
-            HtmlTokenType.RazorComment;[LFcontentLF];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (35:5,0) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (36:5,1) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (37:5,2) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (39:6,0) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 4 - (41:7,0)
-        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (41:7,0) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..45)::45 - [<p>LFLF@* content *@LF@*LFcontentLF*@LFLF</p>]
+    MarkupBlock - [0..45)::45
+        MarkupTagBlock - [0..3)::3 - [<p>]
+            MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [3..7)::4 - [LFLF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+            NewLine;[LF];
+        RazorComment - [7..20)::13
+            RazorCommentTransition;[@];
+            RazorCommentStar;[*];
+            RazorCommentLiteral;[ content ];
+            RazorCommentStar;[*];
+            RazorCommentTransition;[@];
+        MarkupEphemeralTextLiteral - [20..22)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        RazorComment - [22..37)::15
+            RazorCommentTransition;[@];
+            RazorCommentStar;[*];
+            RazorCommentLiteral;[LFcontentLF];
+            RazorCommentStar;[*];
+            RazorCommentTransition;[@];
+        MarkupEphemeralTextLiteral - [37..39)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTextLiteral - [39..41)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTagBlock - [41..45)::4 - [</p>]
+            MarkupTextLiteral - [41..45)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.stree.txt
index b4d122ddd1..9a928afc4f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.stree.txt
@@ -1,42 +1,33 @@
-Markup block - Gen<None> - 42 - (0:0,0)
-    Tag block - Gen<None> - 3 - (0:0,0)
-        Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Comment block - Gen<RazorComment> - 11 - (5:1,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (5:1,0) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (6:1,1) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [ hello ] - SpanEditHandler;Accepts:Any - (7:1,2) - Tokens:1
-            HtmlTokenType.RazorComment;[ hello ];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (14:1,9) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (15:1,10) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-    Markup span - Gen<Markup> - [ content ] - SpanEditHandler;Accepts:Any - (16:1,11) - Tokens:3
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[content];
-        HtmlTokenType.WhiteSpace;[ ];
-    Comment block - Gen<RazorComment> - 11 - (25:1,20)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (25:1,20) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (26:1,21) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [ world ] - SpanEditHandler;Accepts:Any - (27:1,22) - Tokens:1
-            HtmlTokenType.RazorComment;[ world ];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (34:1,29) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (35:1,30) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (36:1,31) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 4 - (38:2,0)
-        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (38:2,0) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..42)::42 - [<p>LF@* hello *@ content @* world *@LF</p>]
+    MarkupBlock - [0..42)::42
+        MarkupTagBlock - [0..3)::3 - [<p>]
+            MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [3..5)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        RazorComment - [5..16)::11
+            RazorCommentTransition;[@];
+            RazorCommentStar;[*];
+            RazorCommentLiteral;[ hello ];
+            RazorCommentStar;[*];
+            RazorCommentTransition;[@];
+        MarkupTextLiteral - [16..25)::9 - [ content ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[content];
+            Whitespace;[ ];
+        RazorComment - [25..36)::11
+            RazorCommentTransition;[@];
+            RazorCommentStar;[*];
+            RazorCommentLiteral;[ world ];
+            RazorCommentStar;[*];
+            RazorCommentTransition;[@];
+        MarkupTextLiteral - [36..38)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTagBlock - [38..42)::4 - [</p>]
+            MarkupTextLiteral - [38..42)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorMultilineCommentInBlock.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorMultilineCommentInBlock.cspans.txt
new file mode 100644
index 0000000000..7f93c44b8f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorMultilineCommentInBlock.cspans.txt
@@ -0,0 +1,12 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [44] )
+Transition span at (2:1,0 [1] ) (Accepts:None) - Parent: Statement block at (2:1,0 [40] )
+MetaCode span at (3:1,1 [1] ) (Accepts:None) - Parent: Statement block at (2:1,0 [40] )
+Code span at (4:1,2 [6] ) (Accepts:Any) - Parent: Statement block at (2:1,0 [40] )
+Transition span at (10:2,4 [1] ) (Accepts:None) - Parent: Comment block at (10:2,4 [29] )
+MetaCode span at (11:2,5 [1] ) (Accepts:None) - Parent: Comment block at (10:2,4 [29] )
+Comment span at (12:2,6 [25] ) (Accepts:Any) - Parent: Comment block at (10:2,4 [29] )
+MetaCode span at (37:4,4 [1] ) (Accepts:None) - Parent: Comment block at (10:2,4 [29] )
+Transition span at (38:4,5 [1] ) (Accepts:None) - Parent: Comment block at (10:2,4 [29] )
+Code span at (39:4,6 [2] ) (Accepts:Any) - Parent: Statement block at (2:1,0 [40] )
+MetaCode span at (41:5,0 [1] ) (Accepts:None) - Parent: Statement block at (2:1,0 [40] )
+Markup span at (42:5,1 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [44] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorMultilineCommentInBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorMultilineCommentInBlock.stree.txt
new file mode 100644
index 0000000000..fa32dc202e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorMultilineCommentInBlock.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..44)::44 - [LF@{LF    @*LFThis is a commentLF    *@LF}LF]
+    MarkupBlock - [0..44)::44
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..42)::40
+            CSharpStatement - [2..42)::40
+                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [3..42)::39
+                    RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [4..41)::37
+                        CSharpStatementLiteral - [4..10)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        RazorComment - [10..39)::29
+                            RazorCommentTransition;[@];
+                            RazorCommentStar;[*];
+                            RazorCommentLiteral;[LFThis is a commentLF    ];
+                            RazorCommentStar;[*];
+                            RazorCommentTransition;[@];
+                        CSharpStatementLiteral - [39..41)::2 - [LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                    RazorMetaCode - [41..42)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [42..44)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.stree.txt
index a42813eed7..60adcc438a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.stree.txt
@@ -1,10 +1,10 @@
-Markup block - Gen<None> - 2 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Comment block - Gen<RazorComment> - 2 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            HtmlTokenType.RazorCommentTransition;[@];
-        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.RazorCommentStar;[*];
-        Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-            HtmlTokenType.Unknown;[];
+RazorDocument - [0..2)::2 - [@*]
+    MarkupBlock - [0..2)::2
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        RazorComment - [0..2)::2
+            RazorCommentTransition;[@];
+            RazorCommentStar;[*];
+            RazorCommentLiteral;[<Missing>];
+            RazorCommentStar;[<Missing>];RZ1028(0:0,0 [2] )
+            RazorCommentTransition;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.stree.txt
index 9e50cab6a4..dc61b63396 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.stree.txt
@@ -1,16 +1,19 @@
-Markup block - Gen<None> - 7 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Expression block - Gen<Expr> - 7 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [foo(] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:2
-            CSharpTokenType.Identifier;[foo];
-            CSharpTokenType.LeftParenthesis;[(];
-        Comment block - Gen<RazorComment> - 2 - (5:0,5)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:1
-                CSharpTokenType.RazorCommentTransition;[@];
-            MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:1
-                CSharpTokenType.RazorCommentStar;[*];
-            Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:1
-                CSharpTokenType.Unknown;[];
+RazorDocument - [0..7)::7 - [@foo(@*]
+    MarkupBlock - [0..7)::7
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..7)::7
+            CSharpImplicitExpression - [0..7)::7
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..7)::6
+                    CSharpCodeBlock - [1..7)::6
+                        CSharpExpressionLiteral - [1..5)::4 - [foo(] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+                            LeftParenthesis;[(];
+                        RazorComment - [5..7)::2
+                            RazorCommentTransition;[@];
+                            RazorCommentStar;[*];
+                            RazorCommentLiteral;[<Missing>];
+                            RazorCommentStar;[<Missing>];RZ1028(5:0,5 [2] )
+                            RazorCommentTransition;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.stree.txt
index cd383fd925..6e7b2b4057 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.stree.txt
@@ -1,17 +1,22 @@
-Markup block - Gen<None> - 4 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 4 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (2:0,2) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        Comment block - Gen<RazorComment> - 2 - (2:0,2)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:1
-                CSharpTokenType.RazorCommentTransition;[@];
-            MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                CSharpTokenType.RazorCommentStar;[*];
-            Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                CSharpTokenType.Unknown;[];
+RazorDocument - [0..4)::4 - [@{@*]
+    MarkupBlock - [0..4)::4
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpStatement - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..4)::3
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..4)::2
+                        CSharpStatementLiteral - [2..2)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                            Marker;[];
+                        RazorComment - [2..4)::2
+                            RazorCommentTransition;[@];
+                            RazorCommentStar;[*];
+                            RazorCommentLiteral;[<Missing>];
+                            RazorCommentStar;[<Missing>];RZ1028(2:0,2 [2] )
+                            RazorCommentTransition;[<Missing>];
+                    RazorMetaCode - [4..4)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.stree.txt
index 65ed4440a2..3baba18c53 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.stree.txt
@@ -1,3 +1,7 @@
-Directive block - Gen<None> - 9 - (0:0,0)
-    MetaCode span - Gen<None> - [namespace] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Keyword;[namespace];
+CSharpCodeBlock - [0..9)::9 - [namespace]
+    RazorDirective - [0..9)::9
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        RazorDirectiveBody - [0..9)::9
+            RazorMetaCode - [0..9)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                Keyword;[namespace];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.cspans.txt
index 546baea6fe..12bdcf7cd1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.cspans.txt
@@ -1 +1 @@
-Code span at (0:0,0 [9] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [9] )
+Code span at (0:0,0 [9] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [9] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.stree.txt
index 3c97840031..d87e2a2d23 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.stree.txt
@@ -1,3 +1,8 @@
-Expression block - Gen<Expr> - 9 - (0:0,0)
-    Code span - Gen<Expr> - [NameSpace] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (0:0,0) - Tokens:1
-        CSharpTokenType.Identifier;[NameSpace];
+CSharpCodeBlock - [0..9)::9 - [NameSpace]
+    CSharpImplicitExpression - [0..9)::9
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpImplicitExpressionBody - [0..9)::9
+            CSharpCodeBlock - [0..9)::9
+                CSharpExpressionLiteral - [0..9)::9 - [NameSpace] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Identifier;[NameSpace];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/AcceptsOpenBraceMultipleLinesBelowSectionName.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/AcceptsOpenBraceMultipleLinesBelowSectionName.cspans.txt
index 56ba50f6db..5ab9ddbb98 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/AcceptsOpenBraceMultipleLinesBelowSectionName.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/AcceptsOpenBraceMultipleLinesBelowSectionName.cspans.txt
@@ -1,9 +1,9 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [46] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [46] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [46] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [46] )
-Markup span at (12:0,12 [18] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [46] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [46] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [46] )
+Markup span at (12:0,12 [18] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [46] )
 MetaCode span at (30:6,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [46] )
 Markup span at (31:6,1 [2] ) (Accepts:Any) - Parent: Markup block at (31:6,1 [14] )
 Markup span at (33:7,0 [3] ) (Accepts:Any) - Parent: Tag block at (33:7,0 [3] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/AcceptsOpenBraceMultipleLinesBelowSectionName.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/AcceptsOpenBraceMultipleLinesBelowSectionName.stree.txt
index c601f9eed9..1f9ceb88ea 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/AcceptsOpenBraceMultipleLinesBelowSectionName.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/AcceptsOpenBraceMultipleLinesBelowSectionName.stree.txt
@@ -1,44 +1,48 @@
-Markup block - Gen<None> - 46 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 46 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<None> - [      LFLFLFLFLFLF] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:7
-            CSharpTokenType.WhiteSpace;[      ];
-            CSharpTokenType.NewLine;[LF];
-            CSharpTokenType.NewLine;[LF];
-            CSharpTokenType.NewLine;[LF];
-            CSharpTokenType.NewLine;[LF];
-            CSharpTokenType.NewLine;[LF];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (30:6,0) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 14 - (31:6,1)
-            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (31:6,1) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
-            Tag block - Gen<None> - 3 - (33:7,0)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (33:7,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (36:7,3) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Tag block - Gen<None> - 4 - (39:7,6)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (39:7,6) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (43:7,10) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (45:8,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (46:8,1) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..46)::46 - [@section foo      LFLFLFLFLFLF{LF<p>Foo</p>LF}]
+    MarkupBlock - [0..46)::46
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..46)::46
+            RazorDirective - [0..46)::46 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..46)::45
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..46)::38
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        MarkupTextLiteral - [12..30)::18 - [      LFLFLFLFLFLF] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[      ];
+                            NewLine;[LF];
+                            NewLine;[LF];
+                            NewLine;[LF];
+                            NewLine;[LF];
+                            NewLine;[LF];
+                            NewLine;[LF];
+                        RazorMetaCode - [30..31)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [31..45)::14
+                            MarkupTextLiteral - [31..33)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                            MarkupTagBlock - [33..36)::3 - [<p>]
+                                MarkupTextLiteral - [33..36)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [36..39)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[Foo];
+                            MarkupTagBlock - [39..43)::4 - [</p>]
+                                MarkupTextLiteral - [39..43)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [43..45)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                        RazorMetaCode - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [46..46)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/AllowsBracesInCSharpExpression.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/AllowsBracesInCSharpExpression.cspans.txt
index 20913b3efd..1e03949cfe 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/AllowsBracesInCSharpExpression.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/AllowsBracesInCSharpExpression.cspans.txt
@@ -1,9 +1,9 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [76] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [76] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [76] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [76] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [76] )
-Markup span at (12:0,12 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [76] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [76] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [76] )
+Markup span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [76] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [76] )
 Markup span at (14:0,14 [54] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [61] )
 Transition span at (68:0,68 [1] ) (Accepts:None) - Parent: Expression block at (68:0,68 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/AllowsBracesInCSharpExpression.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/AllowsBracesInCSharpExpression.stree.txt
index f0c43e199a..d46f43c9a5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/AllowsBracesInCSharpExpression.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/AllowsBracesInCSharpExpression.stree.txt
@@ -1,58 +1,65 @@
-Markup block - Gen<None> - 76 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 76 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (13:0,13) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 61 - (14:0,14)
-            Markup span - Gen<Markup> - [ I really want to render a close brace, so here I go: ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:25
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[I];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[really];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[want];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[to];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[render];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[a];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[close];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[brace,];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[so];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[here];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[I];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[go:];
-                HtmlTokenType.WhiteSpace;[ ];
-            Expression block - Gen<Expr> - 6 - (68:0,68)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (68:0,68) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (69:0,69) - Tokens:1
-                    CSharpTokenType.LeftParenthesis;[(];
-                Code span - Gen<Expr> - ["}"] - SpanEditHandler;Accepts:Any - (70:0,70) - Tokens:1
-                    CSharpTokenType.StringLiteral;["}"];
-                MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (73:0,73) - Tokens:1
-                    CSharpTokenType.RightParenthesis;[)];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (74:0,74) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (75:0,75) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (76:0,76) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..76)::76 - [@section foo { I really want to render a close brace, so here I go: @("}") }]
+    MarkupBlock - [0..76)::76
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..76)::76
+            RazorDirective - [0..76)::76 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..76)::75
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..76)::68
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..75)::61
+                            MarkupTextLiteral - [14..68)::54 - [ I really want to render a close brace, so here I go: ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                                Text;[I];
+                                Whitespace;[ ];
+                                Text;[really];
+                                Whitespace;[ ];
+                                Text;[want];
+                                Whitespace;[ ];
+                                Text;[to];
+                                Whitespace;[ ];
+                                Text;[render];
+                                Whitespace;[ ];
+                                Text;[a];
+                                Whitespace;[ ];
+                                Text;[close];
+                                Whitespace;[ ];
+                                Text;[brace,];
+                                Whitespace;[ ];
+                                Text;[so];
+                                Whitespace;[ ];
+                                Text;[here];
+                                Whitespace;[ ];
+                                Text;[I];
+                                Whitespace;[ ];
+                                Text;[go:];
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [68..74)::6
+                                CSharpExplicitExpression - [68..74)::6
+                                    CSharpTransition - [68..69)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpExplicitExpressionBody - [69..74)::5
+                                        RazorMetaCode - [69..70)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            LeftParenthesis;[(];
+                                        CSharpCodeBlock - [70..73)::3
+                                            CSharpExpressionLiteral - [70..73)::3 - ["}"] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                                                StringLiteral;["}"];
+                                        RazorMetaCode - [73..74)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            RightParenthesis;[)];
+                            MarkupTextLiteral - [74..75)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [75..76)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [76..76)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/BalancesBraces.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/BalancesBraces.cspans.txt
index 227fa11335..fd7de8d057 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/BalancesBraces.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/BalancesBraces.cspans.txt
@@ -1,9 +1,9 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [67] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [67] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [67] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [67] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [67] )
-Markup span at (12:0,12 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [67] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [67] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [67] )
+Markup span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [67] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [67] )
 Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [52] )
 Markup span at (15:0,15 [8] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/BalancesBraces.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/BalancesBraces.stree.txt
index 60d6671298..65d0a45276 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/BalancesBraces.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/BalancesBraces.stree.txt
@@ -1,48 +1,52 @@
-Markup block - Gen<None> - 67 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 67 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (13:0,13) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 52 - (14:0,14)
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 8 - (15:0,15)
-                Markup span - Gen<Markup> - [<script>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[script];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [(function foo() { return 1; })();] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:11
-                HtmlTokenType.Text;[(function];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[foo()];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[{];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[return];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[1;];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[})();];
-            Tag block - Gen<None> - 9 - (56:0,56)
-                Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (56:0,56) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[script];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (65:0,65) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (66:0,66) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (67:0,67) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..67)::67 - [@section foo { <script>(function foo() { return 1; })();</script> }]
+    MarkupBlock - [0..67)::67
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..67)::67
+            RazorDirective - [0..67)::67 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..67)::66
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..67)::59
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..66)::52
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [15..23)::8 - [<script>]
+                                MarkupTextLiteral - [15..23)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[script];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [23..56)::33 - [(function foo() { return 1; })();] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[(function];
+                                Whitespace;[ ];
+                                Text;[foo()];
+                                Whitespace;[ ];
+                                Text;[{];
+                                Whitespace;[ ];
+                                Text;[return];
+                                Whitespace;[ ];
+                                Text;[1;];
+                                Whitespace;[ ];
+                                Text;[})();];
+                            MarkupTagBlock - [56..65)::9 - [</script>]
+                                MarkupTextLiteral - [56..65)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[script];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [65..66)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [66..67)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [67..67)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.cspans.txt
index 438f3272c6..c10c843521 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.cspans.txt
@@ -1,5 +1,5 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
-Code span at (8:0,8 [0] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [8] )
+Code span at (8:0,8 [0] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [8] )
 Markup span at (8:0,8 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.stree.txt
index 689b12e4aa..d336694b97 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesNewlineImmediatelyFollowing.stree.txt
@@ -1,12 +1,16 @@
-Markup block - Gen<None> - 10 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted} [RZ1015(8:0,8 [2] )]> - 8 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.Unknown;[];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
+RazorDocument - [0..10)::10 - [@sectionLF]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{section;RazorBlock;Unrestricted} [RZ1015(8:0,8 [2] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..8)::0
+                        CSharpStatementLiteral - [8..8)::0 - [] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Marker;[];
+        MarkupTextLiteral - [8..10)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.cspans.txt
index 28235f8416..74bcdf61d7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
-Code span at (8:0,8 [9] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [17] )
-Code span at (17:0,17 [0] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [17] )
+Code span at (8:0,8 [9] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [17] )
+Code span at (17:0,17 [0] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [17] )
 Markup span at (17:0,17 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.stree.txt
index 0fde9614d9..7f547e8173 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingName.stree.txt
@@ -1,15 +1,19 @@
-Markup block - Gen<None> - 23 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted} [RZ1015(17:0,17 [2] )]> - 17 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [         ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[         ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (17:0,17) - Tokens:1
-            CSharpTokenType.Unknown;[];
-    Markup span - Gen<Markup> - [LF    ] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:2
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.WhiteSpace;[    ];
+RazorDocument - [0..23)::23 - [@section         LF    ]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            RazorDirective - [0..17)::17 - Directive:{section;RazorBlock;Unrestricted} [RZ1015(17:0,17 [2] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..17)::16
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..17)::9
+                        CSharpStatementLiteral - [8..17)::9 - [         ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[         ];
+                        CSharpStatementLiteral - [17..17)::0 - [] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Marker;[];
+        MarkupTextLiteral - [17..23)::6 - [LF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+            Whitespace;[    ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.cspans.txt
index bff6dfd779..aec2814d1d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.cspans.txt
@@ -1,7 +1,7 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [27] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [27] )
-Markup span at (12:0,12 [15] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [27] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [27] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [27] )
+Markup span at (12:0,12 [15] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [27] )
 Markup span at (27:1,4 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.stree.txt
index 3a2c1106da..4a016b636d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.stree.txt
@@ -1,18 +1,22 @@
-Markup block - Gen<None> - 27 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted} [RZ1012(27:1,4 [1] )]> - 27 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [Foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[Foo];
-        Markup span - Gen<None> - [         LF    ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:3
-            CSharpTokenType.WhiteSpace;[         ];
-            CSharpTokenType.NewLine;[LF];
-            CSharpTokenType.WhiteSpace;[    ];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (27:1,4) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..27)::27 - [@section Foo         LF    ]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            RazorDirective - [0..27)::27 - Directive:{section;RazorBlock;Unrestricted} [RZ1012(27:1,4 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..27)::26
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..27)::19
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [Foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Foo];
+                        MarkupTextLiteral - [12..27)::15 - [         LF    ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[         ];
+                            NewLine;[LF];
+                            Whitespace;[    ];
+        MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CommentRecoversFromUnclosedTag.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CommentRecoversFromUnclosedTag.cspans.txt
index 975ab15e40..0649d567b7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CommentRecoversFromUnclosedTag.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CommentRecoversFromUnclosedTag.cspans.txt
@@ -1,14 +1,14 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [33] )
-Code span at (9:0,9 [1] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [33] )
-Markup span at (10:0,10 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [33] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [33] )
+Code span at (9:0,9 [1] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [33] )
+Markup span at (10:0,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [33] )
 MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
 Markup span at (12:0,12 [2] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [20] )
 Markup span at (14:1,0 [4] ) (Accepts:Any) - Parent: Tag block at (14:1,0 [4] )
 Markup span at (18:2,0 [4] ) (Accepts:None) - Parent: HtmlComment block at (18:2,0 [14] )
-Markup span at (22:2,4 [7] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (18:2,0 [14] )
+Markup span at (22:2,4 [7] ) (Accepts:Whitespace) - Parent: HtmlComment block at (18:2,0 [14] )
 Markup span at (29:2,11 [3] ) (Accepts:None) - Parent: HtmlComment block at (18:2,0 [14] )
 Markup span at (32:2,14 [0] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [20] )
 MetaCode span at (32:2,14 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CommentRecoversFromUnclosedTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CommentRecoversFromUnclosedTag.stree.txt
index e764c527f3..d0c86639d6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CommentRecoversFromUnclosedTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CommentRecoversFromUnclosedTag.stree.txt
@@ -1,45 +1,49 @@
-Markup block - Gen<None> - 33 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 33 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [s] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[s];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (11:0,11) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 20 - (12:0,12)
-            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
-            Tag block - Gen<None> - 4 - (14:1,0)
-                Markup span - Gen<Markup> - [<aLF] - SpanEditHandler;Accepts:Any - (14:1,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[a];
-                    HtmlTokenType.NewLine;[LF];
-            HtmlComment block - Gen<None> - 14 - (18:2,0)
-                Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (18:2,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Bang;[!];
-                    HtmlTokenType.DoubleHyphen;[--];
-                Markup span - Gen<Markup> - [  > " '] - SpanEditHandler;Accepts:WhiteSpace - (22:2,4) - Tokens:6
-                    HtmlTokenType.WhiteSpace;[  ];
-                    HtmlTokenType.CloseAngle;[>];
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.DoubleQuote;["];
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.SingleQuote;['];
-                Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (29:2,11) - Tokens:2
-                    HtmlTokenType.DoubleHyphen;[--];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (32:2,14) - Tokens:1
-                HtmlTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (32:2,14) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (33:2,15) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..33)::33 - [@section s {LF<aLF<!--  > " '-->}]
+    MarkupBlock - [0..33)::33
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..33)::33
+            RazorDirective - [0..33)::33 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..33)::32
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..33)::25
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..10)::1 - [s] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[s];
+                        MarkupTextLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [12..32)::20
+                            MarkupTextLiteral - [12..14)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                            MarkupTagBlock - [14..18)::4 - [<aLF]
+                                MarkupTextLiteral - [14..18)::4 - [<aLF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[a];
+                                    NewLine;[LF];
+                            MarkupCommentBlock - [18..32)::14
+                                MarkupTextLiteral - [18..22)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    DoubleHyphen;[--];
+                                MarkupTextLiteral - [22..29)::7 - [  > " '] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                                    Whitespace;[  ];
+                                    CloseAngle;[>];
+                                    Whitespace;[ ];
+                                    DoubleQuote;["];
+                                    Whitespace;[ ];
+                                    SingleQuote;['];
+                                MarkupTextLiteral - [29..32)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    DoubleHyphen;[--];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Marker;[];
+                        RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [33..33)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.cspans.txt
index 8df309466c..dddd0ceecc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.cspans.txt
@@ -1,9 +1,9 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [24] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [24] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [24] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [24] )
-Markup span at (12:0,12 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [24] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [24] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [24] )
+Markup span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [24] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [24] )
 Markup span at (14:0,14 [9] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [9] )
 MetaCode span at (23:0,23 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [24] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.stree.txt
index 6bc6ea89b2..3a0384fa91 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.stree.txt
@@ -1,23 +1,27 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 24 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (13:0,13) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 9 - (14:0,14)
-            Markup span - Gen<Markup> - [something] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.Text;[something];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..24)::24 - [@section foo {something}]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..24)::24
+            RazorDirective - [0..24)::24 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..24)::23
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..24)::16
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..23)::9
+                            MarkupTextLiteral - [14..23)::9 - [something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[something];
+                        RazorMetaCode - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [24..24)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/DoesNotRequireSpaceBetweenSectionNameAndOpenBrace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/DoesNotRequireSpaceBetweenSectionNameAndOpenBrace.cspans.txt
index bd03ebf705..ecf1378f32 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/DoesNotRequireSpaceBetweenSectionNameAndOpenBrace.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/DoesNotRequireSpaceBetweenSectionNameAndOpenBrace.cspans.txt
@@ -1,8 +1,8 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [26] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [26] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [26] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [26] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [26] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [26] )
 MetaCode span at (12:0,12 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [26] )
 Markup span at (13:0,13 [1] ) (Accepts:Any) - Parent: Markup block at (13:0,13 [12] )
 Markup span at (14:0,14 [3] ) (Accepts:Any) - Parent: Tag block at (14:0,14 [3] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/DoesNotRequireSpaceBetweenSectionNameAndOpenBrace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/DoesNotRequireSpaceBetweenSectionNameAndOpenBrace.stree.txt
index 55381a524f..3e03131001 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/DoesNotRequireSpaceBetweenSectionNameAndOpenBrace.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/DoesNotRequireSpaceBetweenSectionNameAndOpenBrace.stree.txt
@@ -1,36 +1,40 @@
-Markup block - Gen<None> - 26 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 26 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (12:0,12) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 12 - (13:0,13)
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 3 - (14:0,14)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Tag block - Gen<None> - 4 - (20:0,20)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..26)::26 - [@section foo{ <p>Foo</p> }]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            RazorDirective - [0..26)::26 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..26)::25
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..26)::18
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        RazorMetaCode - [12..13)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [13..25)::12
+                            MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [14..17)::3 - [<p>]
+                                MarkupTextLiteral - [14..17)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [17..20)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[Foo];
+                            MarkupTagBlock - [20..24)::4 - [</p>]
+                                MarkupTextLiteral - [20..24)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [26..26)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.cspans.txt
index 2ae2e13090..786a39e696 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.cspans.txt
@@ -1,8 +1,8 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [14] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [14] )
-Markup span at (12:0,12 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [14] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [14] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [14] )
+Markup span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [14] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
 Markup span at (14:0,14 [0] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [0] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.stree.txt
index 19018c5dbe..70844ba973 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenBrace.stree.txt
@@ -1,19 +1,25 @@
-Markup block - Gen<None> - 14 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted} [RZ1006(13:0,13 [1] )]> - 14 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (13:0,13) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 0 - (14:0,14)
-            Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.Unknown;[];
+RazorDocument - [0..14)::14 - [@section foo {]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..14)::14
+            RazorDirective - [0..14)::14 - Directive:{section;RazorBlock;Unrestricted} [RZ1006(13:0,13 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..14)::13
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..14)::6
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..14)::0
+                            MarkupTextLiteral - [14..14)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Marker;[];
+                        RazorMetaCode - [14..14)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.cspans.txt
index 92cb61d49b..922bb729ba 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.cspans.txt
@@ -1,8 +1,8 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [15] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [15] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [15] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [15] )
-Markup span at (12:0,12 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [15] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [15] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [15] )
+Markup span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [15] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [15] )
 Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.stree.txt
index 134177d6a6..d31d5a6031 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent1.stree.txt
@@ -1,19 +1,25 @@
-Markup block - Gen<None> - 15 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted} [RZ1006(13:0,13 [1] )]> - 15 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (13:0,13) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 1 - (14:0,14)
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
+RazorDocument - [0..15)::15 - [@section foo { ]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..15)::15
+            RazorDirective - [0..15)::15 - Directive:{section;RazorBlock;Unrestricted} [RZ1006(13:0,13 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..15)::14
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..15)::7
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..15)::1
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [15..15)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.cspans.txt
index b485a40f1e..38c344ffc3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.cspans.txt
@@ -1,8 +1,8 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [16] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [16] )
-Markup span at (12:0,12 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [16] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [16] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [16] )
+Markup span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [16] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
 Markup span at (14:0,14 [2] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [2] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.stree.txt
index 0a934073ea..26a8855010 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent2.stree.txt
@@ -1,19 +1,25 @@
-Markup block - Gen<None> - 16 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted} [RZ1006(13:0,13 [1] )]> - 16 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (13:0,13) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 2 - (14:0,14)
-            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
+RazorDocument - [0..16)::16 - [@section foo {LF]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            RazorDirective - [0..16)::16 - Directive:{section;RazorBlock;Unrestricted} [RZ1006(13:0,13 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..16)::15
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..16)::8
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..16)::2
+                            MarkupTextLiteral - [14..16)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                        RazorMetaCode - [16..16)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.cspans.txt
index 81962d91a4..677fcd6e40 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.cspans.txt
@@ -1,8 +1,8 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [17] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [17] )
-Markup span at (12:0,12 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [17] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [17] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [17] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
 Markup span at (14:0,14 [3] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [3] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.stree.txt
index d828a581f0..9167042d58 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.stree.txt
@@ -1,19 +1,25 @@
-Markup block - Gen<None> - 17 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted} [RZ1006(13:0,13 [1] )]> - 17 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (13:0,13) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 3 - (14:0,14)
-            Markup span - Gen<Markup> - [abc] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.Text;[abc];
+RazorDocument - [0..17)::17 - [@section foo {abc]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            RazorDirective - [0..17)::17 - Directive:{section;RazorBlock;Unrestricted} [RZ1006(13:0,13 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..17)::16
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..17)::9
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..17)::3
+                            MarkupTextLiteral - [14..17)::3 - [abc] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[abc];
+                        RazorMetaCode - [17..17)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.cspans.txt
index f180faa3a8..19ee80ede4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.cspans.txt
@@ -1,8 +1,8 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [20] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [20] )
-Markup span at (12:0,12 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [20] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [20] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [20] )
+Markup span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [20] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
 Markup span at (14:0,14 [6] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.stree.txt
index dfd8d9e423..61a6401771 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.stree.txt
@@ -1,21 +1,27 @@
-Markup block - Gen<None> - 20 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted} [RZ1006(13:0,13 [1] )]> - 20 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (13:0,13) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 6 - (14:0,14)
-            Markup span - Gen<Markup> - [LF abc] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:3
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[abc];
+RazorDocument - [0..20)::20 - [@section foo {LF abc]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            RazorDirective - [0..20)::20 - Directive:{section;RazorBlock;Unrestricted} [RZ1006(13:0,13 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..20)::19
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..20)::12
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..20)::6
+                            MarkupTextLiteral - [14..20)::6 - [LF abc] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                                Whitespace;[ ];
+                                Text;[abc];
+                        RazorMetaCode - [20..20)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.cspans.txt
index 83b4408923..6d2cdedc5b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.cspans.txt
@@ -1,9 +1,9 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [27] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [27] )
-Markup span at (12:0,12 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [27] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [27] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [27] )
+Markup span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [27] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
 Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [13] )
 Markup span at (15:0,15 [3] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [3] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.stree.txt
index bc5eedd22b..e24841e4e9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.stree.txt
@@ -1,34 +1,40 @@
-Markup block - Gen<None> - 27 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted} [RZ1006(13:0,13 [1] )]> - 27 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (13:0,13) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 13 - (14:0,14)
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 3 - (15:0,15)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo{}] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:3
-                HtmlTokenType.Text;[Foo];
-                HtmlTokenType.Text;[{];
-                HtmlTokenType.Text;[}];
-            Tag block - Gen<None> - 4 - (23:0,23)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..27)::27 - [@section foo { <p>Foo{}</p>]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            RazorDirective - [0..27)::27 - Directive:{section;RazorBlock;Unrestricted} [RZ1006(13:0,13 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..27)::26
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..27)::19
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..27)::13
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [15..18)::3 - [<p>]
+                                MarkupTextLiteral - [15..18)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [18..23)::5 - [Foo{}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[Foo];
+                                Text;[{];
+                                Text;[}];
+                            MarkupTagBlock - [23..27)::4 - [</p>]
+                                MarkupTextLiteral - [23..27)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        RazorMetaCode - [27..27)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.cspans.txt
index ee6a1dfb85..4131a0dbcc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.cspans.txt
@@ -1,9 +1,9 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [73] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [73] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [73] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [73] )
-Code span at (9:0,9 [4] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [73] )
-Markup span at (13:0,13 [2] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [73] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [73] )
+Code span at (9:0,9 [4] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [73] )
+Markup span at (13:0,13 [2] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [73] )
 MetaCode span at (15:1,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [73] )
 Markup span at (16:1,1 [2] ) (Accepts:Any) - Parent: Markup block at (16:1,1 [57] )
 Code span at (18:2,0 [4] ) (Accepts:Any) - Parent: Statement block at (18:2,0 [55] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.stree.txt
index 4090ca154c..2b09571d9c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.stree.txt
@@ -1,56 +1,62 @@
-Markup block - Gen<None> - 73 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted} [RZ1006(15:1,0 [1] )]> - 73 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [Test] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[Test];
-        Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:AllWhiteSpace - (13:0,13) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (15:1,0) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 57 - (16:1,1)
-            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (16:1,1) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
-            Statement block - Gen<None> - 55 - (18:2,0)
-                Code span - Gen<Stmt> - [    ] - SpanEditHandler;Accepts:Any - (18:2,0) - Tokens:1
-                    CSharpTokenType.WhiteSpace;[    ];
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (22:2,4) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Stmt> - [if(true)LF    {LF] - SpanEditHandler;Accepts:Any - (23:2,5) - Tokens:8
-                    CSharpTokenType.Keyword;[if];
-                    CSharpTokenType.LeftParenthesis;[(];
-                    CSharpTokenType.Keyword;[true];
-                    CSharpTokenType.RightParenthesis;[)];
-                    CSharpTokenType.NewLine;[LF];
-                    CSharpTokenType.WhiteSpace;[    ];
-                    CSharpTokenType.LeftBrace;[{];
-                    CSharpTokenType.NewLine;[LF];
-                Markup block - Gen<None> - 28 - (40:4,0)
-                    Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (40:4,0) - Tokens:1
-                        HtmlTokenType.WhiteSpace;[        ];
-                    Tag block - Gen<None> - 3 - (48:4,8)
-                        Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (48:4,8) - Tokens:3
-                            HtmlTokenType.OpenAngle;[<];
-                            HtmlTokenType.Text;[p];
-                            HtmlTokenType.CloseAngle;[>];
-                    Markup span - Gen<Markup> - [Hello World] - SpanEditHandler;Accepts:Any - (51:4,11) - Tokens:3
-                        HtmlTokenType.Text;[Hello];
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[World];
-                    Tag block - Gen<None> - 4 - (62:4,22)
-                        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (62:4,22) - Tokens:4
-                            HtmlTokenType.OpenAngle;[<];
-                            HtmlTokenType.ForwardSlash;[/];
-                            HtmlTokenType.Text;[p];
-                            HtmlTokenType.CloseAngle;[>];
-                    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (66:4,26) - Tokens:1
-                        HtmlTokenType.NewLine;[LF];
-                Code span - Gen<Stmt> - [    }] - SpanEditHandler;Accepts:Any - (68:5,0) - Tokens:2
-                    CSharpTokenType.WhiteSpace;[    ];
-                    CSharpTokenType.RightBrace;[}];
+RazorDocument - [0..73)::73 - [@section TestLF{LF    @if(true)LF    {LF        <p>Hello World</p>LF    }]
+    MarkupBlock - [0..73)::73
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..73)::73
+            RazorDirective - [0..73)::73 - Directive:{section;RazorBlock;Unrestricted} [RZ1006(15:1,0 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..73)::72
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..73)::65
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..13)::4 - [Test] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Test];
+                        MarkupTextLiteral - [13..15)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            NewLine;[LF];
+                        RazorMetaCode - [15..16)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [16..73)::57
+                            MarkupTextLiteral - [16..18)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                            CSharpCodeBlock - [18..73)::55
+                                CSharpStatementLiteral - [18..22)::4 - [    ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[    ];
+                                CSharpTransition - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpStatementLiteral - [23..40)::17 - [if(true)LF    {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                    Keyword;[if];
+                                    LeftParenthesis;[(];
+                                    Keyword;[true];
+                                    RightParenthesis;[)];
+                                    NewLine;[LF];
+                                    Whitespace;[    ];
+                                    LeftBrace;[{];
+                                    NewLine;[LF];
+                                MarkupBlock - [40..68)::28
+                                    MarkupTextLiteral - [40..48)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[        ];
+                                    MarkupTagBlock - [48..51)::3 - [<p>]
+                                        MarkupTextLiteral - [48..51)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            Text;[p];
+                                            CloseAngle;[>];
+                                    MarkupTextLiteral - [51..62)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Hello];
+                                        Whitespace;[ ];
+                                        Text;[World];
+                                    MarkupTagBlock - [62..66)::4 - [</p>]
+                                        MarkupTextLiteral - [62..66)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            ForwardSlash;[/];
+                                            Text;[p];
+                                            CloseAngle;[>];
+                                    MarkupTextLiteral - [66..68)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        NewLine;[LF];
+                                CSharpStatementLiteral - [68..73)::5 - [    }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[    ];
+                                    RightBrace;[}];
+                        RazorMetaCode - [73..73)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/IgnoresSectionUnlessAllLowerCase.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/IgnoresSectionUnlessAllLowerCase.cspans.txt
index cd444657cd..500fddb951 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/IgnoresSectionUnlessAllLowerCase.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/IgnoresSectionUnlessAllLowerCase.cspans.txt
@@ -1,4 +1,4 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [8] )
-Code span at (1:0,1 [7] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [8] )
+Code span at (1:0,1 [7] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [8] )
 Markup span at (8:0,8 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/IgnoresSectionUnlessAllLowerCase.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/IgnoresSectionUnlessAllLowerCase.stree.txt
index 59d3f3e25a..8f8cb089b8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/IgnoresSectionUnlessAllLowerCase.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/IgnoresSectionUnlessAllLowerCase.stree.txt
@@ -1,11 +1,15 @@
-Markup block - Gen<None> - 12 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Expression block - Gen<Expr> - 8 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [Section] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K15 - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[Section];
-    Markup span - Gen<Markup> - [ foo] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:2
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[foo];
+RazorDocument - [0..12)::12 - [@Section foo]
+    MarkupBlock - [0..12)::12
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            CSharpImplicitExpression - [0..8)::8
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..8)::7
+                    CSharpCodeBlock - [1..8)::7
+                        CSharpExpressionLiteral - [1..8)::7 - [Section] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15
+                            Identifier;[Section];
+        MarkupTextLiteral - [8..12)::4 - [ foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[foo];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.cspans.txt
index 3e998dd114..c36b52c0d7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.cspans.txt
@@ -1,16 +1,16 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [44] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [44] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [44] )
-Markup span at (12:0,12 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [44] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [44] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [44] )
+Markup span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [44] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
 Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [29] )
 Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Directive block at (15:0,15 [27] )
 MetaCode span at (16:0,16 [7] ) (Accepts:None) - Parent: Directive block at (15:0,15 [27] )
-Code span at (23:0,23 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (15:0,15 [27] )
-Code span at (24:0,24 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (15:0,15 [27] )
-Markup span at (27:0,27 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (15:0,15 [27] )
+Code span at (23:0,23 [1] ) (Accepts:Whitespace) - Parent: Directive block at (15:0,15 [27] )
+Code span at (24:0,24 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (15:0,15 [27] )
+Markup span at (27:0,27 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (15:0,15 [27] )
 MetaCode span at (28:0,28 [1] ) (Accepts:None) - Parent: Directive block at (15:0,15 [27] )
 Markup span at (29:0,29 [1] ) (Accepts:Any) - Parent: Markup block at (29:0,29 [12] )
 Markup span at (30:0,30 [3] ) (Accepts:Any) - Parent: Tag block at (30:0,30 [3] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.stree.txt
index b8abb7fa56..56f2e92671 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.stree.txt
@@ -1,58 +1,65 @@
-Markup block - Gen<None> - 44 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 44 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (13:0,13) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 29 - (14:0,14)
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Directive block - Gen<Directive:{section;RazorBlock;Unrestricted} [RZ2005(16:0,16 [7] ), RZ2002(15:0,15 [8] )]> - 27 - (15:0,15)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-                    CSharpTokenType.Identifier;[section];
-                Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (23:0,23) - Tokens:1
-                    CSharpTokenType.WhiteSpace;[ ];
-                Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [bar] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (24:0,24) - Tokens:1
-                    CSharpTokenType.Identifier;[bar];
-                Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (27:0,27) - Tokens:1
-                    CSharpTokenType.WhiteSpace;[ ];
-                MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (28:0,28) - Tokens:1
-                    CSharpTokenType.LeftBrace;[{];
-                Markup block - Gen<None> - 12 - (29:0,29)
-                    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:1
-                        HtmlTokenType.WhiteSpace;[ ];
-                    Tag block - Gen<None> - 3 - (30:0,30)
-                        Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:3
-                            HtmlTokenType.OpenAngle;[<];
-                            HtmlTokenType.Text;[p];
-                            HtmlTokenType.CloseAngle;[>];
-                    Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1
-                        HtmlTokenType.Text;[Foo];
-                    Tag block - Gen<None> - 4 - (36:0,36)
-                        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:4
-                            HtmlTokenType.OpenAngle;[<];
-                            HtmlTokenType.ForwardSlash;[/];
-                            HtmlTokenType.Text;[p];
-                            HtmlTokenType.CloseAngle;[>];
-                    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:1
-                        HtmlTokenType.WhiteSpace;[ ];
-                MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (41:0,41) - Tokens:1
-                    CSharpTokenType.RightBrace;[}];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (42:0,42) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (43:0,43) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (44:0,44) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..44)::44 - [@section foo { @section bar { <p>Foo</p> } }]
+    MarkupBlock - [0..44)::44
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..44)::44
+            RazorDirective - [0..44)::44 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..44)::43
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..44)::36
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..43)::29
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [15..42)::27
+                                RazorDirective - [15..42)::27 - Directive:{section;RazorBlock;Unrestricted} [RZ2005(16:0,16 [7] ), RZ2002(15:0,15 [8] )]
+                                    CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    RazorDirectiveBody - [16..42)::26
+                                        RazorMetaCode - [16..23)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Identifier;[section];
+                                        CSharpCodeBlock - [23..42)::19
+                                            CSharpStatementLiteral - [23..24)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                                                Whitespace;[ ];
+                                            CSharpStatementLiteral - [24..27)::3 - [bar] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                                                Identifier;[bar];
+                                            MarkupTextLiteral - [27..28)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                                                Whitespace;[ ];
+                                            RazorMetaCode - [28..29)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                                                LeftBrace;[{];
+                                            MarkupBlock - [29..41)::12
+                                                MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTagBlock - [30..33)::3 - [<p>]
+                                                    MarkupTextLiteral - [30..33)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        OpenAngle;[<];
+                                                        Text;[p];
+                                                        CloseAngle;[>];
+                                                MarkupTextLiteral - [33..36)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[Foo];
+                                                MarkupTagBlock - [36..40)::4 - [</p>]
+                                                    MarkupTextLiteral - [36..40)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                        OpenAngle;[<];
+                                                        ForwardSlash;[/];
+                                                        Text;[p];
+                                                        CloseAngle;[>];
+                                                MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                            RazorMetaCode - [41..42)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                RightBrace;[}];
+                            MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [43..44)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [44..44)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesComment.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesComment.cspans.txt
index d48a285438..9e9f49db1d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesComment.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesComment.cspans.txt
@@ -1,12 +1,12 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [21] )
-Code span at (9:0,9 [1] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [21] )
-Markup span at (10:0,10 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [21] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [21] )
+Code span at (9:0,9 [1] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [21] )
+Markup span at (10:0,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [21] )
 MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
 Markup span at (12:0,12 [4] ) (Accepts:None) - Parent: HtmlComment block at (12:0,12 [8] )
-Markup span at (16:0,16 [1] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (12:0,12 [8] )
+Markup span at (16:0,16 [1] ) (Accepts:Whitespace) - Parent: HtmlComment block at (12:0,12 [8] )
 Markup span at (17:0,17 [3] ) (Accepts:None) - Parent: HtmlComment block at (12:0,12 [8] )
 Markup span at (20:0,20 [0] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [8] )
 MetaCode span at (20:0,20 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesComment.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesComment.stree.txt
index 4bdbe3877f..ff9823b96d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesComment.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesComment.stree.txt
@@ -1,33 +1,37 @@
-Markup block - Gen<None> - 21 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 21 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [s] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[s];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (11:0,11) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 8 - (12:0,12)
-            HtmlComment block - Gen<None> - 8 - (12:0,12)
-                Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Bang;[!];
-                    HtmlTokenType.DoubleHyphen;[--];
-                Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (16:0,16) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-                Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:2
-                    HtmlTokenType.DoubleHyphen;[--];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-                HtmlTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..21)::21 - [@section s {<!-- -->}]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            RazorDirective - [0..21)::21 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..21)::20
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..21)::13
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..10)::1 - [s] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[s];
+                        MarkupTextLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [12..20)::8
+                            MarkupCommentBlock - [12..20)::8
+                                MarkupTextLiteral - [12..16)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    DoubleHyphen;[--];
+                                MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                                    Whitespace;[ ];
+                                MarkupTextLiteral - [17..20)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    DoubleHyphen;[--];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [20..20)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Marker;[];
+                        RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesCommentWithDelimiters.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesCommentWithDelimiters.cspans.txt
index dc6a5cfa46..aa83e0cc99 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesCommentWithDelimiters.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesCommentWithDelimiters.cspans.txt
@@ -1,12 +1,12 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [26] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [26] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [26] )
-Code span at (9:0,9 [1] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [26] )
-Markup span at (10:0,10 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [26] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [26] )
+Code span at (9:0,9 [1] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [26] )
+Markup span at (10:0,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [26] )
 MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [26] )
 Markup span at (12:0,12 [4] ) (Accepts:None) - Parent: HtmlComment block at (12:0,12 [13] )
-Markup span at (16:0,16 [6] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (12:0,12 [13] )
+Markup span at (16:0,16 [6] ) (Accepts:Whitespace) - Parent: HtmlComment block at (12:0,12 [13] )
 Markup span at (22:0,22 [3] ) (Accepts:None) - Parent: HtmlComment block at (12:0,12 [13] )
 Markup span at (25:0,25 [0] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [13] )
 MetaCode span at (25:0,25 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [26] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesCommentWithDelimiters.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesCommentWithDelimiters.stree.txt
index 86e6444d85..414e5b3681 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesCommentWithDelimiters.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesCommentWithDelimiters.stree.txt
@@ -1,38 +1,42 @@
-Markup block - Gen<None> - 26 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 26 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [s] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[s];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (11:0,11) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 13 - (12:0,12)
-            HtmlComment block - Gen<None> - 13 - (12:0,12)
-                Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Bang;[!];
-                    HtmlTokenType.DoubleHyphen;[--];
-                Markup span - Gen<Markup> - [ > " '] - SpanEditHandler;Accepts:WhiteSpace - (16:0,16) - Tokens:6
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.CloseAngle;[>];
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.DoubleQuote;["];
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.SingleQuote;['];
-                Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:2
-                    HtmlTokenType.DoubleHyphen;[--];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
-                HtmlTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..26)::26 - [@section s {<!-- > " '-->}]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            RazorDirective - [0..26)::26 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..26)::25
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..26)::18
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..10)::1 - [s] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[s];
+                        MarkupTextLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [12..25)::13
+                            MarkupCommentBlock - [12..25)::13
+                                MarkupTextLiteral - [12..16)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    DoubleHyphen;[--];
+                                MarkupTextLiteral - [16..22)::6 - [ > " '] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                                    Whitespace;[ ];
+                                    CloseAngle;[>];
+                                    Whitespace;[ ];
+                                    DoubleQuote;["];
+                                    Whitespace;[ ];
+                                    SingleQuote;['];
+                                MarkupTextLiteral - [22..25)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    DoubleHyphen;[--];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [25..25)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Marker;[];
+                        RazorMetaCode - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [26..26)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesNamedSectionCorrectly.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesNamedSectionCorrectly.cspans.txt
index 28dd678224..ad6311499d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesNamedSectionCorrectly.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesNamedSectionCorrectly.cspans.txt
@@ -1,9 +1,9 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [27] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [27] )
-Markup span at (12:0,12 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [27] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [27] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [27] )
+Markup span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [27] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
 Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [12] )
 Markup span at (15:0,15 [3] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [3] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesNamedSectionCorrectly.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesNamedSectionCorrectly.stree.txt
index 816ec6dd7f..68d3659c30 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesNamedSectionCorrectly.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesNamedSectionCorrectly.stree.txt
@@ -1,38 +1,42 @@
-Markup block - Gen<None> - 27 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 27 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (13:0,13) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 12 - (14:0,14)
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 3 - (15:0,15)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Tag block - Gen<None> - 4 - (21:0,21)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (26:0,26) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..27)::27 - [@section foo { <p>Foo</p> }]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            RazorDirective - [0..27)::27 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..27)::26
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..27)::19
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..26)::12
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [15..18)::3 - [<p>]
+                                MarkupTextLiteral - [15..18)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [18..21)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[Foo];
+                            MarkupTagBlock - [21..25)::4 - [</p>]
+                                MarkupTextLiteral - [21..25)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesXmlProcessingInstruction.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesXmlProcessingInstruction.cspans.txt
index 58cbbb3588..a7e21f084d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesXmlProcessingInstruction.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesXmlProcessingInstruction.cspans.txt
@@ -1,9 +1,9 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [28] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [28] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [28] )
-Code span at (9:0,9 [1] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [28] )
-Markup span at (10:0,10 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [28] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [28] )
+Code span at (9:0,9 [1] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [28] )
+Markup span at (10:0,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [28] )
 MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [28] )
 Markup span at (12:0,12 [15] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [15] )
 MetaCode span at (27:0,27 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [28] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesXmlProcessingInstruction.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesXmlProcessingInstruction.stree.txt
index 92cd8e4296..69ed3ab18b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesXmlProcessingInstruction.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesXmlProcessingInstruction.stree.txt
@@ -1,32 +1,36 @@
-Markup block - Gen<None> - 28 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 28 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [s] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[s];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (11:0,11) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 15 - (12:0,12)
-            Markup span - Gen<Markup> - [ <? xml bleh ?>] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:10
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.QuestionMark;[?];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[xml];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[bleh];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.QuestionMark;[?];
-                HtmlTokenType.CloseAngle;[>];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..28)::28 - [@section s { <? xml bleh ?>}]
+    MarkupBlock - [0..28)::28
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..28)::28
+            RazorDirective - [0..28)::28 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..28)::27
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..28)::20
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..10)::1 - [s] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[s];
+                        MarkupTextLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [12..27)::15
+                            MarkupTextLiteral - [12..27)::15 - [ <? xml bleh ?>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                                OpenAngle;[<];
+                                QuestionMark;[?];
+                                Whitespace;[ ];
+                                Text;[xml];
+                                Whitespace;[ ];
+                                Text;[bleh];
+                                Whitespace;[ ];
+                                QuestionMark;[?];
+                                CloseAngle;[>];
+                        RazorMetaCode - [27..28)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [28..28)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.cspans.txt
index d1aebb95ee..39637d477b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.cspans.txt
@@ -1,7 +1,7 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [20] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [20] )
-Markup span at (12:0,12 [8] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [20] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [20] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [20] )
+Markup span at (12:0,12 [8] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [20] )
 Markup span at (20:1,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.stree.txt
index f0c5008e10..cfb10ee1ca 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndAcceptsWhitespaceToEOLIfSectionNotFollowedByOpenBrace.stree.txt
@@ -1,17 +1,21 @@
-Markup block - Gen<None> - 20 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted} [RZ1012(20:1,0 [1] )]> - 20 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<None> - [      LF] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:2
-            CSharpTokenType.WhiteSpace;[      ];
-            CSharpTokenType.NewLine;[LF];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (20:1,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..20)::20 - [@section foo      LF]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            RazorDirective - [0..20)::20 - Directive:{section;RazorBlock;Unrestricted} [RZ1012(20:1,0 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..20)::19
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..20)::12
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        MarkupTextLiteral - [12..20)::8 - [      LF] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[      ];
+                            NewLine;[LF];
+        MarkupTextLiteral - [20..20)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.cspans.txt
index 91c582c57e..1b511f83f5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.cspans.txt
@@ -1,7 +1,7 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [9] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [9] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [9] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [9] )
 Markup span at (9:0,9 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
 Markup span at (13:0,13 [3] ) (Accepts:Any) - Parent: Tag block at (13:0,13 [3] )
 Markup span at (16:0,16 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.stree.txt
index 2505742c14..194ad66d18 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.stree.txt
@@ -1,31 +1,35 @@
-Markup block - Gen<None> - 25 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted} [RZ1015(9:0,9 [1] )]> - 9 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-    Markup span - Gen<Markup> - [9 { ] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:4
-        HtmlTokenType.Text;[9];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<None> - 3 - (13:0,13)
-        Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-        HtmlTokenType.Text;[Foo];
-    Tag block - Gen<None> - 4 - (19:0,19)
-        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ }] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:2
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[}];
+RazorDocument - [0..25)::25 - [@section 9 { <p>Foo</p> }]
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..9)::9
+            RazorDirective - [0..9)::9 - Directive:{section;RazorBlock;Unrestricted} [RZ1015(9:0,9 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..9)::8
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..9)::1
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [9..13)::4 - [9 { ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[9];
+            Whitespace;[ ];
+            Text;[{];
+            Whitespace;[ ];
+        MarkupTagBlock - [13..16)::3 - [<p>]
+            MarkupTextLiteral - [13..16)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [16..19)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+        MarkupTagBlock - [19..23)::4 - [</p>]
+            MarkupTextLiteral - [19..23)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [23..25)::2 - [ }] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.cspans.txt
index b96ad7e8d4..b1564f1bc8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.cspans.txt
@@ -1,8 +1,8 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [12] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [12] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [12] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [12] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [12] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [12] )
 Markup span at (12:0,12 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
 Markup span at (19:0,19 [3] ) (Accepts:Any) - Parent: Tag block at (19:0,19 [3] )
 Markup span at (22:0,22 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.stree.txt
index f9fea55241..c844cbeeb0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.stree.txt
@@ -1,33 +1,37 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted} [RZ1017(12:0,12 [1] )]> - 12 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-    Markup span - Gen<Markup> - [-bar { ] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:4
-        HtmlTokenType.Text;[-bar];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<None> - 3 - (19:0,19)
-        Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-        HtmlTokenType.Text;[Foo];
-    Tag block - Gen<None> - 4 - (25:0,25)
-        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ }] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:2
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[}];
+RazorDocument - [0..31)::31 - [@section foo-bar { <p>Foo</p> }]
+    MarkupBlock - [0..31)::31
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..12)::12
+            RazorDirective - [0..12)::12 - Directive:{section;RazorBlock;Unrestricted} [RZ1017(12:0,12 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..12)::11
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..12)::4
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+        MarkupTextLiteral - [12..19)::7 - [-bar { ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[-bar];
+            Whitespace;[ ];
+            Text;[{];
+            Whitespace;[ ];
+        MarkupTagBlock - [19..22)::3 - [<p>]
+            MarkupTextLiteral - [19..22)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [22..25)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+        MarkupTagBlock - [25..29)::4 - [</p>]
+            MarkupTextLiteral - [25..29)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [29..31)::2 - [ }] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionCorrectlyTerminatedWhenCloseBraceFollowsCodeBlockNoWhitespace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionCorrectlyTerminatedWhenCloseBraceFollowsCodeBlockNoWhitespace.cspans.txt
index 2e5cfb7364..0361cc1a71 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionCorrectlyTerminatedWhenCloseBraceFollowsCodeBlockNoWhitespace.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionCorrectlyTerminatedWhenCloseBraceFollowsCodeBlockNoWhitespace.cspans.txt
@@ -1,9 +1,9 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [31] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [31] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [31] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [31] )
-Markup span at (12:0,12 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [31] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [31] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [31] )
+Markup span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [31] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [31] )
 Markup span at (14:0,14 [2] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [16] )
 Transition span at (16:1,0 [1] ) (Accepts:None) - Parent: Statement block at (16:1,0 [14] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionCorrectlyTerminatedWhenCloseBraceFollowsCodeBlockNoWhitespace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionCorrectlyTerminatedWhenCloseBraceFollowsCodeBlockNoWhitespace.stree.txt
index 1712aafc46..21ee945f25 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionCorrectlyTerminatedWhenCloseBraceFollowsCodeBlockNoWhitespace.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionCorrectlyTerminatedWhenCloseBraceFollowsCodeBlockNoWhitespace.stree.txt
@@ -1,35 +1,39 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 31 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [Foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[Foo];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (13:0,13) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 16 - (14:0,14)
-            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
-            Statement block - Gen<None> - 14 - (16:1,0)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (16:1,0) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Stmt> - [if(true) {LF}] - SpanEditHandler;Accepts:Any - (17:1,1) - Tokens:8
-                    CSharpTokenType.Keyword;[if];
-                    CSharpTokenType.LeftParenthesis;[(];
-                    CSharpTokenType.Keyword;[true];
-                    CSharpTokenType.RightParenthesis;[)];
-                    CSharpTokenType.WhiteSpace;[ ];
-                    CSharpTokenType.LeftBrace;[{];
-                    CSharpTokenType.NewLine;[LF];
-                    CSharpTokenType.RightBrace;[}];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (30:2,1) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (31:2,2) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..31)::31 - [@section Foo {LF@if(true) {LF}}]
+    MarkupBlock - [0..31)::31
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..31)::31
+            RazorDirective - [0..31)::31 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..31)::30
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..31)::23
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [Foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Foo];
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..30)::16
+                            MarkupTextLiteral - [14..16)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                            CSharpCodeBlock - [16..30)::14
+                                CSharpTransition - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpStatementLiteral - [17..30)::13 - [if(true) {LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                    Keyword;[if];
+                                    LeftParenthesis;[(];
+                                    Keyword;[true];
+                                    RightParenthesis;[)];
+                                    Whitespace;[ ];
+                                    LeftBrace;[{];
+                                    NewLine;[LF];
+                                    RightBrace;[}];
+                        RazorMetaCode - [30..31)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [31..31)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.cspans.txt
index 07b903f608..7ec7640bc9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.cspans.txt
@@ -1,9 +1,9 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [33] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [33] )
-Markup span at (12:0,12 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [33] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [33] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [33] )
+Markup span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [33] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
 Markup span at (14:0,14 [2] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [18] )
 Transition span at (16:1,0 [1] ) (Accepts:None) - Parent: Statement block at (16:1,0 [16] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.stree.txt
index 5b549fd8de..5ceee908d2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.stree.txt
@@ -1,36 +1,40 @@
-Markup block - Gen<None> - 33 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 33 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [Foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[Foo];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (13:0,13) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 18 - (14:0,14)
-            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
-            Statement block - Gen<None> - 16 - (16:1,0)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (16:1,0) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Stmt> - [if(true) {LF}LF] - SpanEditHandler;Accepts:Any - (17:1,1) - Tokens:9
-                    CSharpTokenType.Keyword;[if];
-                    CSharpTokenType.LeftParenthesis;[(];
-                    CSharpTokenType.Keyword;[true];
-                    CSharpTokenType.RightParenthesis;[)];
-                    CSharpTokenType.WhiteSpace;[ ];
-                    CSharpTokenType.LeftBrace;[{];
-                    CSharpTokenType.NewLine;[LF];
-                    CSharpTokenType.RightBrace;[}];
-                    CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (32:3,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (33:3,1) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..33)::33 - [@section Foo {LF@if(true) {LF}LF}]
+    MarkupBlock - [0..33)::33
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..33)::33
+            RazorDirective - [0..33)::33 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..33)::32
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..33)::25
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [Foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Foo];
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..32)::18
+                            MarkupTextLiteral - [14..16)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                            CSharpCodeBlock - [16..32)::16
+                                CSharpTransition - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpStatementLiteral - [17..32)::15 - [if(true) {LF}LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                    Keyword;[if];
+                                    LeftParenthesis;[(];
+                                    Keyword;[true];
+                                    RightParenthesis;[)];
+                                    Whitespace;[ ];
+                                    LeftBrace;[{];
+                                    NewLine;[LF];
+                                    RightBrace;[}];
+                                    NewLine;[LF];
+                        RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [33..33)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.cspans.txt
index 45000bd914..49aa650ad1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.cspans.txt
@@ -1,9 +1,9 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [30] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [30] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [30] )
-Code span at (9:0,9 [1] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [30] )
-Markup span at (10:0,10 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [30] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [30] )
+Code span at (9:0,9 [1] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [30] )
+Markup span at (10:0,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [30] )
 MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [30] )
 Markup span at (12:0,12 [5] ) (Accepts:Any) - Parent: Tag block at (12:0,12 [17] )
 Markup span at (17:0,17 [6] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [9] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.stree.txt
index 5be347d4cf..17e8f806f0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.stree.txt
@@ -1,42 +1,49 @@
-Markup block - Gen<None> - 30 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 30 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [s] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[s];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (11:0,11) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 17 - (12:0,12)
-            Tag block - Gen<None> - 17 - (12:0,12)
-                Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[span];
-                Markup block - Gen<Attr:foo, foo='@(17:0,17),'@(25:0,25)> - 9 - (17:0,17)
-                    Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[foo];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.SingleQuote;['];
-                    Markup block - Gen<None> - 2 - (23:0,23)
-                        Markup span - Gen<LitAttr:@(23:0,23)> - [@] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:1
-                            HtmlTokenType.Transition;[@];
-                        Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:1
-                            HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
-                        HtmlTokenType.SingleQuote;['];
-                Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:3
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.CloseAngle;[>];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (29:0,29) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..30)::30 - [@section s {<span foo='@@' />}]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..30)::30
+            RazorDirective - [0..30)::30 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..30)::29
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..30)::22
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..10)::1 - [s] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[s];
+                        MarkupTextLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [12..29)::17
+                            MarkupTagBlock - [12..29)::17 - [<span foo='@@' />]
+                                MarkupTextLiteral - [12..17)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[span];
+                                MarkupAttributeBlock - [17..26)::9 - [ foo='@@']
+                                    MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [18..21)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[foo];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        SingleQuote;['];
+                                    GenericBlock - [23..25)::2
+                                        MarkupBlock - [23..25)::2
+                                            MarkupTextLiteral - [23..24)::1 - [@] - Gen<LitAttr:@(23:0,23)> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            MarkupEphemeralTextLiteral - [24..25)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                    MarkupTextLiteral - [25..26)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        SingleQuote;['];
+                                MarkupTextLiteral - [26..29)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        RazorMetaCode - [29..30)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [30..30)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.cspans.txt
index 066623b119..b2bb803352 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.cspans.txt
@@ -1,14 +1,14 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [44] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [44] )
-Code span at (9:0,9 [1] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [44] )
-Markup span at (10:0,10 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [44] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [44] )
+Code span at (9:0,9 [1] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [44] )
+Markup span at (10:0,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [44] )
 MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
 Markup span at (12:0,12 [5] ) (Accepts:Any) - Parent: Tag block at (12:0,12 [31] )
 Markup span at (17:0,17 [6] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [23] )
 Transition span at (23:0,23 [1] ) (Accepts:None) - Parent: Expression block at (23:0,23 [13] )
-Code span at (24:0,24 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (23:0,23 [13] )
+Code span at (24:0,24 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (23:0,23 [13] )
 Markup span at (36:0,36 [2] ) (Accepts:None) - Parent: Markup block at (36:0,36 [3] )
 Markup span at (38:0,38 [1] ) (Accepts:None) - Parent: Markup block at (36:0,36 [3] )
 Markup span at (39:0,39 [1] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [23] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.stree.txt
index 062a860adb..da412d6aaf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.stree.txt
@@ -1,51 +1,62 @@
-Markup block - Gen<None> - 44 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 44 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [s] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[s];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (11:0,11) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 31 - (12:0,12)
-            Tag block - Gen<None> - 31 - (12:0,12)
-                Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[span];
-                Markup block - Gen<Attr:foo, foo='@(17:0,17),'@(39:0,39)> - 23 - (17:0,17)
-                    Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[foo];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.SingleQuote;['];
-                    Markup block - Gen<DynAttr:@(23:0,23)> - 13 - (23:0,23)
-                        Expression block - Gen<Expr> - 13 - (23:0,23)
-                            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:1
-                                CSharpTokenType.Transition;[@];
-                            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K15 - (24:0,24) - Tokens:3
-                                CSharpTokenType.Identifier;[DateTime];
-                                CSharpTokenType.Dot;[.];
-                                CSharpTokenType.Identifier;[Now];
-                    Markup block - Gen<None> - 3 - (36:0,36)
-                        Markup span - Gen<LitAttr: @(36:0,36)> - [ @] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:2
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Transition;[@];
-                        Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:1
-                            HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:1
-                        HtmlTokenType.SingleQuote;['];
-                Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:3
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.CloseAngle;[>];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (43:0,43) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (44:0,44) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..44)::44 - [@section s {<span foo='@DateTime.Now @@' />}]
+    MarkupBlock - [0..44)::44
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..44)::44
+            RazorDirective - [0..44)::44 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..44)::43
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..44)::36
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..10)::1 - [s] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[s];
+                        MarkupTextLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [12..43)::31
+                            MarkupTagBlock - [12..43)::31 - [<span foo='@DateTime.Now @@' />]
+                                MarkupTextLiteral - [12..17)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[span];
+                                MarkupAttributeBlock - [17..40)::23 - [ foo='@DateTime.Now @@']
+                                    MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [18..21)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[foo];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        SingleQuote;['];
+                                    GenericBlock - [23..39)::16
+                                        MarkupDynamicAttributeValue - [23..36)::13 - [@DateTime.Now]
+                                            GenericBlock - [23..36)::13
+                                                CSharpCodeBlock - [23..36)::13
+                                                    CSharpImplicitExpression - [23..36)::13
+                                                        CSharpTransition - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                            Transition;[@];
+                                                        CSharpImplicitExpressionBody - [24..36)::12
+                                                            CSharpCodeBlock - [24..36)::12
+                                                                CSharpExpressionLiteral - [24..36)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15
+                                                                    Identifier;[DateTime];
+                                                                    Dot;[.];
+                                                                    Identifier;[Now];
+                                        MarkupBlock - [36..39)::3
+                                            MarkupTextLiteral - [36..38)::2 - [ @] - Gen<LitAttr: @(36:0,36)> - SpanEditHandler;Accepts:None
+                                                Whitespace;[ ];
+                                                Transition;[@];
+                                            MarkupEphemeralTextLiteral - [38..39)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                    MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        SingleQuote;['];
+                                MarkupTextLiteral - [40..43)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                        RazorMetaCode - [43..44)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [44..44)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesBracesOutsideStringsIfFirstCharIsBraceAndReturnsSpanOfTypeCode.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesBracesOutsideStringsIfFirstCharIsBraceAndReturnsSpanOfTypeCode.stree.txt
index 19a360fd8b..78700a99c8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesBracesOutsideStringsIfFirstCharIsBraceAndReturnsSpanOfTypeCode.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesBracesOutsideStringsIfFirstCharIsBraceAndReturnsSpanOfTypeCode.stree.txt
@@ -1,26 +1,31 @@
-Statement block - Gen<None> - 52 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [foo"b}ar" if(condition) { string.Format("{0}"); } ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:20
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.StringLiteral;["b}ar"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[condition];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[string];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Format];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;["{0}"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (51:0,51) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..52)::52 - [{foo"b}ar" if(condition) { string.Format("{0}"); } }]
+    CSharpStatement - [0..52)::52
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..52)::52
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..51)::50
+                CSharpStatementLiteral - [1..51)::50 - [foo"b}ar" if(condition) { string.Format("{0}"); } ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Identifier;[foo];
+                    StringLiteral;["b}ar"];
+                    Whitespace;[ ];
+                    Keyword;[if];
+                    LeftParenthesis;[(];
+                    Identifier;[condition];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Keyword;[string];
+                    Dot;[.];
+                    Identifier;[Format];
+                    LeftParenthesis;[(];
+                    StringLiteral;["{0}"];
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Whitespace;[ ];
+            RazorMetaCode - [51..52)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesParensOutsideStringsIfFirstCharIsParenAndReturnsSpanOfTypeExpr.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesParensOutsideStringsIfFirstCharIsParenAndReturnsSpanOfTypeExpr.stree.txt
index 757004c73b..8da45d9d0b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesParensOutsideStringsIfFirstCharIsParenAndReturnsSpanOfTypeExpr.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/BalancesParensOutsideStringsIfFirstCharIsParenAndReturnsSpanOfTypeExpr.stree.txt
@@ -1,26 +1,31 @@
-Expression block - Gen<Expr> - 52 - (0:0,0)
-    MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftParenthesis;[(];
-    Code span - Gen<Expr> - [foo"b)ar" if(condition) { string.Format("{0}"); } ] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:20
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.StringLiteral;["b)ar"];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[condition];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[string];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Format];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.StringLiteral;["{0}"];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (51:0,51) - Tokens:1
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..52)::52 - [(foo"b)ar" if(condition) { string.Format("{0}"); } )]
+    CSharpExplicitExpression - [0..52)::52
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpExplicitExpressionBody - [0..52)::52
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftParenthesis;[(];
+            CSharpCodeBlock - [1..51)::50
+                CSharpExpressionLiteral - [1..51)::50 - [foo"b)ar" if(condition) { string.Format("{0}"); } ] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                    Identifier;[foo];
+                    StringLiteral;["b)ar"];
+                    Whitespace;[ ];
+                    Keyword;[if];
+                    LeftParenthesis;[(];
+                    Identifier;[condition];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Keyword;[string];
+                    Dot;[.];
+                    Identifier;[Format];
+                    LeftParenthesis;[(];
+                    StringLiteral;["{0}"];
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Whitespace;[ ];
+            RazorMetaCode - [51..52)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/NamespaceImportInsideCodeBlockCausesError.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/NamespaceImportInsideCodeBlockCausesError.stree.txt
index 41fd907da2..444e68553f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/NamespaceImportInsideCodeBlockCausesError.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/NamespaceImportInsideCodeBlockCausesError.stree.txt
@@ -1,25 +1,30 @@
-Statement block - Gen<None> - 37 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ using Foo.Bar.Baz; var foo = bar; ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:19
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Baz];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..37)::37 - [{ using Foo.Bar.Baz; var foo = bar; }]
+    CSharpStatement - [0..37)::37
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..37)::37
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..36)::35
+                CSharpStatementLiteral - [1..36)::35 - [ using Foo.Bar.Baz; var foo = bar; ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Whitespace;[ ];
+                    Keyword;[using];
+                    Whitespace;[ ];
+                    Identifier;[Foo];
+                    Dot;[.];
+                    Identifier;[Bar];
+                    Dot;[.];
+                    Identifier;[Baz];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+            RazorMetaCode - [36..37)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/NonKeywordStatementInCodeBlockIsHandledCorrectly.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/NonKeywordStatementInCodeBlockIsHandledCorrectly.stree.txt
index 25dbecb0d5..2d82057e40 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/NonKeywordStatementInCodeBlockIsHandledCorrectly.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/NonKeywordStatementInCodeBlockIsHandledCorrectly.stree.txt
@@ -1,26 +1,31 @@
-Statement block - Gen<None> - 56 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [LF    List<dynamic> photos = gallery.Photo.ToList();LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:20
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[List];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.Identifier;[dynamic];
-        CSharpTokenType.GreaterThan;[>];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[photos];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[gallery];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Photo];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[ToList];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (55:2,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..56)::56 - [{LF    List<dynamic> photos = gallery.Photo.ToList();LF}]
+    CSharpStatement - [0..56)::56
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..56)::56
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..55)::54
+                CSharpStatementLiteral - [1..55)::54 - [LF    List<dynamic> photos = gallery.Photo.ToList();LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    NewLine;[LF];
+                    Whitespace;[    ];
+                    Identifier;[List];
+                    LessThan;[<];
+                    Identifier;[dynamic];
+                    GreaterThan;[>];
+                    Whitespace;[ ];
+                    Identifier;[photos];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[gallery];
+                    Dot;[.];
+                    Identifier;[Photo];
+                    Dot;[.];
+                    Identifier;[ToList];
+                    LeftParenthesis;[(];
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+                    NewLine;[LF];
+            RazorMetaCode - [55..56)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.cspans.txt
index df81e75cc2..7d1e387fe4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [1] )
-Code span at (1:0,1 [0] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [1] )
+Code span at (1:0,1 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.stree.txt
index 8f8de632d0..ba1a0451b3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 1 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Unknown;[];
+CSharpCodeBlock - [0..1)::1 - [@]
+    CSharpImplicitExpression - [0..1)::1
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..1)::0
+            CSharpCodeBlock - [1..1)::0
+                CSharpExpressionLiteral - [1..1)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfLine.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfLine.stree.txt
index 60b8f07d27..ffb5683f61 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfLine.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfLine.stree.txt
@@ -1,38 +1,40 @@
-Statement block - Gen<None> - 48 - (0:0,0)
-    Code span - Gen<Stmt> - [if(!false) {LF    // FooLF] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:11
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Not;[!];
-        CSharpTokenType.Keyword;[false];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Comment;[// Foo];
-        CSharpTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 21 - (26:2,0)
-        Markup span - Gen<Markup> - [	] - SpanEditHandler;Accepts:Any - (26:2,0) - Tokens:1
-            HtmlTokenType.WhiteSpace;[	];
-        Tag block - Gen<None> - 3 - (27:2,1)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (27:2,1) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [A real tag!] - SpanEditHandler;Accepts:Any - (30:2,4) - Tokens:6
-            HtmlTokenType.Text;[A];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[real];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[tag];
-            HtmlTokenType.Bang;[!];
-        Tag block - Gen<None> - 4 - (41:2,15)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (41:2,15) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (45:2,19) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:Any - (47:3,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..48)::48 - [if(!false) {LF    // FooLF	<p>A real tag!</p>LF}]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..26)::26 - [if(!false) {LF    // FooLF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Not;[!];
+        Keyword;[false];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        CSharpComment;[// Foo];
+        NewLine;[LF];
+    MarkupBlock - [26..47)::21
+        MarkupTextLiteral - [26..27)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[	];
+        MarkupTagBlock - [27..30)::3 - [<p>]
+            MarkupTextLiteral - [27..30)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [30..41)::11 - [A real tag!] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[A];
+            Whitespace;[ ];
+            Text;[real];
+            Whitespace;[ ];
+            Text;[tag];
+            Bang;[!];
+        MarkupTagBlock - [41..45)::4 - [</p>]
+            MarkupTextLiteral - [41..45)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [45..47)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+            NewLine;[LF];
+    CSharpStatementLiteral - [47..48)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/TypeAliasInsideCodeBlockIsNotHandledSpecially.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/TypeAliasInsideCodeBlockIsNotHandledSpecially.stree.txt
index 5576cf671f..a4f2cecf5d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/TypeAliasInsideCodeBlockIsNotHandledSpecially.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/TypeAliasInsideCodeBlockIsNotHandledSpecially.stree.txt
@@ -1,27 +1,32 @@
-Statement block - Gen<None> - 39 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ using Foo = Bar.Baz; var foo = bar; ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:21
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Baz];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..39)::39 - [{ using Foo = Bar.Baz; var foo = bar; }]
+    CSharpStatement - [0..39)::39
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..39)::39
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..38)::37
+                CSharpStatementLiteral - [1..38)::37 - [ using Foo = Bar.Baz; var foo = bar; ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Whitespace;[ ];
+                    Keyword;[using];
+                    Whitespace;[ ];
+                    Identifier;[Foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[Bar];
+                    Dot;[.];
+                    Identifier;[Baz];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+            RazorMetaCode - [38..39)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/CatchClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/CatchClause.stree.txt
index 979f01d5ec..0083bef987 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/CatchClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/CatchClause.stree.txt
@@ -1,46 +1,46 @@
-Statement block - Gen<None> - 94 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [try { foo(); } catch(IOException ioex) { handleIO(); } catch(Exception ex) { handleOther(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:42
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[IOException];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[ioex];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[handleIO];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Exception];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[ex];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[handleOther];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..94)::94 - [@try { foo(); } catch(IOException ioex) { handleIO(); } catch(Exception ex) { handleOther(); }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..94)::93 - [try { foo(); } catch(IOException ioex) { handleIO(); } catch(Exception ex) { handleOther(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[IOException];
+        Whitespace;[ ];
+        Identifier;[ioex];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[handleIO];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Exception];
+        Whitespace;[ ];
+        Identifier;[ex];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[handleOther];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/DoStatement.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/DoStatement.stree.txt
index 3d7b1a88af..b0cc1c3e56 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/DoStatement.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/DoStatement.stree.txt
@@ -1,20 +1,20 @@
-Statement block - Gen<None> - 27 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [do { foo(); } while(true);] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:16
-        CSharpTokenType.Keyword;[do];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[while];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
+CSharpCodeBlock - [0..27)::27 - [@do { foo(); } while(true);]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..27)::26 - [do { foo(); } while(true);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[do];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[while];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Semicolon;[;];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ElseClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ElseClause.stree.txt
index 6952c9d39e..e59ccec394 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ElseClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ElseClause.stree.txt
@@ -1,28 +1,28 @@
-Statement block - Gen<None> - 36 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [if(true) { foo(); } else { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:24
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..36)::36 - [@if(true) { foo(); } else { foo(); }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..36)::35 - [if(true) { foo(); } else { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ElseIfClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ElseIfClause.stree.txt
index 3ac82af49f..ffbd6b3e2b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ElseIfClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ElseIfClause.stree.txt
@@ -1,50 +1,50 @@
-Statement block - Gen<None> - 73 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [if(true) { foo(); } else if(false) { foo(); } else if(!false) { foo(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:46
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[false];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Not;[!];
-        CSharpTokenType.Keyword;[false];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..73)::73 - [@if(true) { foo(); } else if(false) { foo(); } else if(!false) { foo(); }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..73)::72 - [if(true) { foo(); } else if(false) { foo(); } else if(!false) { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[false];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Not;[!];
+        Keyword;[false];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.stree.txt
index a65e11f6c9..0d29de909a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.stree.txt
@@ -1,27 +1,27 @@
-Statement block - Gen<None> - 53 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [try { someMethod(); } catch(Exception) when (true) {] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:23
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[someMethod];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Exception];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[when];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
+CSharpCodeBlock - [0..53)::53 - [@try { someMethod(); } catch(Exception) when (true) {]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..53)::52 - [try { someMethod(); } catch(Exception) when (true) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[someMethod];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Exception];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        Keyword;[when];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.stree.txt
index ea80c49749..04f717693f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.stree.txt
@@ -1,23 +1,23 @@
-Statement block - Gen<None> - 46 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [try { someMethod(); } catch(Exception) when (] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:19
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[someMethod];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Exception];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[when];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
+CSharpCodeBlock - [0..46)::46 - [@try { someMethod(); } catch(Exception) when (]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..46)::45 - [try { someMethod(); } catch(Exception) when (] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[someMethod];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Exception];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        Keyword;[when];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchNoBodyWhen.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchNoBodyWhen.stree.txt
index b974facb6a..1ea6c97bc3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchNoBodyWhen.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchNoBodyWhen.stree.txt
@@ -1,30 +1,30 @@
-Statement block - Gen<None> - 65 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [try { someMethod(); } catch(Exception) when { anotherMethod(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:26
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[someMethod];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Exception];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[when];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[anotherMethod];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..65)::65 - [@try { someMethod(); } catch(Exception) when { anotherMethod(); }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..65)::64 - [try { someMethod(); } catch(Exception) when { anotherMethod(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[someMethod];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Exception];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        Keyword;[when];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[anotherMethod];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhen.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhen.stree.txt
index 7672a029cd..4dbd4c9b4d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhen.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhen.stree.txt
@@ -1,21 +1,21 @@
-Statement block - Gen<None> - 44 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [try { someMethod(); } catch(Exception) when] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:17
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[someMethod];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Exception];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[when];
+CSharpCodeBlock - [0..44)::44 - [@try { someMethod(); } catch(Exception) when]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..44)::43 - [try { someMethod(); } catch(Exception) when] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[someMethod];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Exception];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        Keyword;[when];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhenNoBodies.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhenNoBodies.stree.txt
index 1d47290523..028b867868 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhenNoBodies.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhenNoBodies.stree.txt
@@ -1,25 +1,25 @@
-Statement block - Gen<None> - 51 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [try { someMethod(); } catch(Exception) when (true)] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:21
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[someMethod];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Exception];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[when];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..51)::51 - [@try { someMethod(); } catch(Exception) when (true)]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..51)::50 - [try { someMethod(); } catch(Exception) when (true)] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[someMethod];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Exception];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        Keyword;[when];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryWhen.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryWhen.stree.txt
index 1d2521b0e0..a4716915f7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryWhen.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryWhen.stree.txt
@@ -1,14 +1,14 @@
-Statement block - Gen<None> - 22 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [try { someMethod(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:10
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[someMethod];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..22)::22 - [@try { someMethod(); }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..22)::21 - [try { someMethod(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[someMethod];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_MultiLine.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_MultiLine.stree.txt
index f814178b03..47032c337d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_MultiLine.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_MultiLine.stree.txt
@@ -1,54 +1,54 @@
-Statement block - Gen<None> - 103 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [tryLF{LFA();LF}LFcatch(Exception) when (true)LF{LFB();LF}LFcatch(IOException) when (false)LF{LFC();LF}] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:50
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Identifier;[A];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Exception];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[when];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Identifier;[B];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[IOException];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[when];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[false];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.Identifier;[C];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..103)::103 - [@tryLF{LFA();LF}LFcatch(Exception) when (true)LF{LFB();LF}LFcatch(IOException) when (false)LF{LFC();LF}]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..103)::102 - [tryLF{LFA();LF}LFcatch(Exception) when (true)LF{LFB();LF}LFcatch(IOException) when (false)LF{LFC();LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        NewLine;[LF];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Identifier;[A];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
+        NewLine;[LF];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Exception];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        Keyword;[when];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        NewLine;[LF];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Identifier;[B];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
+        NewLine;[LF];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[IOException];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        Keyword;[when];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Keyword;[false];
+        RightParenthesis;[)];
+        NewLine;[LF];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Identifier;[C];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_NestedTryCatchWhen.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_NestedTryCatchWhen.stree.txt
index c7aebf715c..0f8443577f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_NestedTryCatchWhen.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_NestedTryCatchWhen.stree.txt
@@ -1,38 +1,41 @@
-Statement block - Gen<None> - 69 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [try { someMethod(); } catch(Exception) when (true) { handleIO(); }] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (2:0,2) - Tokens:30
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[someMethod];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Exception];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[when];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[handleIO];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (68:0,68) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..69)::69 - [@{try { someMethod(); } catch(Exception) when (true) { handleIO(); }}]
+    CSharpStatement - [0..69)::69
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpStatementBody - [1..69)::68
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [2..68)::66
+                CSharpStatementLiteral - [2..68)::66 - [try { someMethod(); } catch(Exception) when (true) { handleIO(); }] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Keyword;[try];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Identifier;[someMethod];
+                    LeftParenthesis;[(];
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Whitespace;[ ];
+                    Keyword;[catch];
+                    LeftParenthesis;[(];
+                    Identifier;[Exception];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    Keyword;[when];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    Keyword;[true];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Identifier;[handleIO];
+                    LeftParenthesis;[(];
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+            RazorMetaCode - [68..69)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenCatchWhenComplete_SingleLine.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenCatchWhenComplete_SingleLine.stree.txt
index 9b61a41852..05378ee5c5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenCatchWhenComplete_SingleLine.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenCatchWhenComplete_SingleLine.stree.txt
@@ -1,54 +1,54 @@
-Statement block - Gen<None> - 92 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [try { A(); } catch(Exception) when (true) { B(); } catch(IOException) when (false) { C(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:50
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[A];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Exception];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[when];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[B];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[IOException];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[when];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[false];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[C];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..92)::92 - [@try { A(); } catch(Exception) when (true) { B(); } catch(IOException) when (false) { C(); }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..92)::91 - [try { A(); } catch(Exception) when (true) { B(); } catch(IOException) when (false) { C(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[A];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Exception];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        Keyword;[when];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[B];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[IOException];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        Keyword;[when];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Keyword;[false];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[C];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenComplete_SingleLine.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenComplete_SingleLine.stree.txt
index d4abea3d20..d17ac8b9d9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenComplete_SingleLine.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenComplete_SingleLine.stree.txt
@@ -1,34 +1,34 @@
-Statement block - Gen<None> - 67 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [try { someMethod(); } catch(Exception) when (true) { handleIO(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:30
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[someMethod];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Exception];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[when];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[handleIO];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..67)::67 - [@try { someMethod(); } catch(Exception) when (true) { handleIO(); }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..67)::66 - [try { someMethod(); } catch(Exception) when (true) { handleIO(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[someMethod];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Exception];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        Keyword;[when];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[handleIO];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenFinallyComplete_SingleLine.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenFinallyComplete_SingleLine.stree.txt
index d2eb922ac6..7d1cb95bb2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenFinallyComplete_SingleLine.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenFinallyComplete_SingleLine.stree.txt
@@ -1,45 +1,45 @@
-Statement block - Gen<None> - 68 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [try { A(); } catch(Exception) when (true) { B(); } finally { C(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:41
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[A];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[catch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[Exception];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[when];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[B];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[finally];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[C];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..68)::68 - [@try { A(); } catch(Exception) when (true) { B(); } finally { C(); }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..68)::67 - [try { A(); } catch(Exception) when (true) { B(); } finally { C(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[A];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[catch];
+        LeftParenthesis;[(];
+        Identifier;[Exception];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        Keyword;[when];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[B];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[finally];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[C];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/FinallyClause.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/FinallyClause.stree.txt
index 0810f3848a..dc96158982 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/FinallyClause.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/FinallyClause.stree.txt
@@ -1,25 +1,25 @@
-Statement block - Gen<None> - 38 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [try { foo(); } finally { Dispose(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:21
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[finally];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Dispose];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..38)::38 - [@try { foo(); } finally { Dispose(); }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..38)::37 - [try { foo(); } finally { Dispose(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[finally];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Dispose];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ForEachStatement.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ForEachStatement.stree.txt
index 7d4a7b839e..ec6233e29e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ForEachStatement.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ForEachStatement.stree.txt
@@ -1,23 +1,23 @@
-Statement block - Gen<None> - 35 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [foreach(var foo in bar) { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:19
-        CSharpTokenType.Keyword;[foreach];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[in];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..35)::35 - [@foreach(var foo in bar) { foo(); }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..35)::34 - [foreach(var foo in bar) { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[foreach];
+        LeftParenthesis;[(];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Keyword;[in];
+        Whitespace;[ ];
+        Identifier;[bar];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ForStatement.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ForStatement.stree.txt
index 073af76a08..fdf8533dba 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ForStatement.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ForStatement.stree.txt
@@ -1,34 +1,34 @@
-Statement block - Gen<None> - 43 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [for(int i = 0; i++; i < length) { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:30
-        CSharpTokenType.Keyword;[for];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.Increment;[++];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[length];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..43)::43 - [@for(int i = 0; i++; i < length) { foo(); }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..43)::42 - [for(int i = 0; i++; i < length) { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[for];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Increment;[++];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        Identifier;[length];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/IfStatement.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/IfStatement.stree.txt
index d01613f66d..1e5dc0955d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/IfStatement.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/IfStatement.stree.txt
@@ -1,17 +1,17 @@
-Statement block - Gen<None> - 20 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [if(true) { foo(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:13
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..20)::20 - [@if(true) { foo(); }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..20)::19 - [if(true) { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/LockStatement.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/LockStatement.stree.txt
index 7a8dcd7965..97d8f9ff47 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/LockStatement.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/LockStatement.stree.txt
@@ -1,17 +1,17 @@
-Statement block - Gen<None> - 21 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [lock(baz) { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:13
-        CSharpTokenType.Keyword;[lock];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[baz];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..21)::21 - [@lock(baz) { foo(); }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..21)::20 - [lock(baz) { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[lock];
+        LeftParenthesis;[(];
+        Identifier;[baz];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.cspans.txt
index f18c5a7565..eb46914ed0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [3] )
-Code span at (1:0,1 [2] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [3] )
+Code span at (1:0,1 [2] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [3] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.stree.txt
index 7b1d379e7d..96e3d8c857 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.stree.txt
@@ -1,5 +1,8 @@
-Expression block - Gen<Expr> - 3 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Expr> - [is] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-        CSharpTokenType.Keyword;[is];
+CSharpCodeBlock - [0..3)::3 - [@is]
+    CSharpImplicitExpression - [0..3)::3
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpImplicitExpressionBody - [1..3)::2
+            CSharpCodeBlock - [1..3)::2
+                CSharpExpressionLiteral - [1..3)::2 - [is] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Keyword;[is];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_Complete_Spaced.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_Complete_Spaced.stree.txt
index 6e6611d1d6..d3cb56db95 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_Complete_Spaced.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_Complete_Spaced.stree.txt
@@ -1,13 +1,15 @@
-Directive block - Gen<None> - 40 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Import:   static   global::System.Console;> - [using   static   global::System.Console] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Tokens:9
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.WhiteSpace;[   ];
-        CSharpTokenType.Keyword;[static];
-        CSharpTokenType.WhiteSpace;[   ];
-        CSharpTokenType.Identifier;[global];
-        CSharpTokenType.DoubleColon;[::];
-        CSharpTokenType.Identifier;[System];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Console];
+CSharpCodeBlock - [0..40)::40 - [@using   static   global::System.Console]
+    RazorDirective - [0..40)::40
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        RazorDirectiveBody - [1..40)::39
+            CSharpStatementLiteral - [1..40)::39 - [using   static   global::System.Console] - Gen<Import:   static   global::System.Console;> - SpanEditHandler;Accepts:AnyExceptNewline
+                Keyword;[using];
+                Whitespace;[   ];
+                Keyword;[static];
+                Whitespace;[   ];
+                Identifier;[global];
+                DoubleColon;[::];
+                Identifier;[System];
+                Dot;[.];
+                Identifier;[Console];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_GlobalPrefix.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_GlobalPrefix.stree.txt
index 7211d38d71..38c128b520 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_GlobalPrefix.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_GlobalPrefix.stree.txt
@@ -1,13 +1,15 @@
-Directive block - Gen<None> - 36 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Import: static global::System.Console;> - [using static global::System.Console] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Tokens:9
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[static];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[global];
-        CSharpTokenType.DoubleColon;[::];
-        CSharpTokenType.Identifier;[System];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Console];
+CSharpCodeBlock - [0..36)::36 - [@using static global::System.Console]
+    RazorDirective - [0..36)::36
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        RazorDirectiveBody - [1..36)::35
+            CSharpStatementLiteral - [1..36)::35 - [using static global::System.Console] - Gen<Import: static global::System.Console;> - SpanEditHandler;Accepts:AnyExceptNewline
+                Keyword;[using];
+                Whitespace;[ ];
+                Keyword;[static];
+                Whitespace;[ ];
+                Identifier;[global];
+                DoubleColon;[::];
+                Identifier;[System];
+                Dot;[.];
+                Identifier;[Console];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_MultipleIdentifiers.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_MultipleIdentifiers.stree.txt
index 54278101f9..9c24375956 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_MultipleIdentifiers.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_MultipleIdentifiers.stree.txt
@@ -1,11 +1,13 @@
-Directive block - Gen<None> - 28 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Import: static System.Console;> - [using static System.Console] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Tokens:7
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[static];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[System];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Console];
+CSharpCodeBlock - [0..28)::28 - [@using static System.Console]
+    RazorDirective - [0..28)::28
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        RazorDirectiveBody - [1..28)::27
+            CSharpStatementLiteral - [1..28)::27 - [using static System.Console] - Gen<Import: static System.Console;> - SpanEditHandler;Accepts:AnyExceptNewline
+                Keyword;[using];
+                Whitespace;[ ];
+                Keyword;[static];
+                Whitespace;[ ];
+                Identifier;[System];
+                Dot;[.];
+                Identifier;[Console];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_NoUsing.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_NoUsing.stree.txt
index 7d6aaac205..1cd305cdac 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_NoUsing.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_NoUsing.stree.txt
@@ -1,7 +1,9 @@
-Directive block - Gen<None> - 13 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Import: static;> - [using static] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Tokens:3
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[static];
+CSharpCodeBlock - [0..13)::13 - [@using static]
+    RazorDirective - [0..13)::13
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        RazorDirectiveBody - [1..13)::12
+            CSharpStatementLiteral - [1..13)::12 - [using static] - Gen<Import: static;> - SpanEditHandler;Accepts:AnyExceptNewline
+                Keyword;[using];
+                Whitespace;[ ];
+                Keyword;[static];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_SingleIdentifier.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_SingleIdentifier.stree.txt
index 226b90f7bd..d3679a8276 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_SingleIdentifier.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_SingleIdentifier.stree.txt
@@ -1,9 +1,11 @@
-Directive block - Gen<None> - 20 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Import: static System;> - [using static System] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Tokens:5
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[static];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[System];
+CSharpCodeBlock - [0..20)::20 - [@using static System]
+    RazorDirective - [0..20)::20
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        RazorDirectiveBody - [1..20)::19
+            CSharpStatementLiteral - [1..20)::19 - [using static System] - Gen<Import: static System;> - SpanEditHandler;Accepts:AnyExceptNewline
+                Keyword;[using];
+                Whitespace;[ ];
+                Keyword;[static];
+                Whitespace;[ ];
+                Identifier;[System];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement.stree.txt
index dd5b38a925..6ef926a783 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement.stree.txt
@@ -1,17 +1,17 @@
-Statement block - Gen<None> - 23 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [switch(foo) { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:13
-        CSharpTokenType.Keyword;[switch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..23)::23 - [@switch(foo) { foo(); }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..23)::22 - [switch(foo) { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[switch];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/TryStatement.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/TryStatement.stree.txt
index bd13bb3059..30c1079603 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/TryStatement.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/TryStatement.stree.txt
@@ -1,14 +1,14 @@
-Statement block - Gen<None> - 15 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [try { foo(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:10
-        CSharpTokenType.Keyword;[try];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..15)::15 - [@try { foo(); }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..15)::14 - [try { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[try];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingNamespaceImport.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingNamespaceImport.stree.txt
index 4a9d2be68d..46b7c77895 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingNamespaceImport.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingNamespaceImport.stree.txt
@@ -1,13 +1,15 @@
-Directive block - Gen<None> - 41 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Import: System.Text.Encoding.ASCIIEncoding;> - [using System.Text.Encoding.ASCIIEncoding] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Tokens:9
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[System];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Text];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Encoding];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[ASCIIEncoding];
+CSharpCodeBlock - [0..41)::41 - [@using System.Text.Encoding.ASCIIEncoding]
+    RazorDirective - [0..41)::41
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        RazorDirectiveBody - [1..41)::40
+            CSharpStatementLiteral - [1..41)::40 - [using System.Text.Encoding.ASCIIEncoding] - Gen<Import: System.Text.Encoding.ASCIIEncoding;> - SpanEditHandler;Accepts:AnyExceptNewline
+                Keyword;[using];
+                Whitespace;[ ];
+                Identifier;[System];
+                Dot;[.];
+                Identifier;[Text];
+                Dot;[.];
+                Identifier;[Encoding];
+                Dot;[.];
+                Identifier;[ASCIIEncoding];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingStatement.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingStatement.stree.txt
index b8a04ea3e1..2dcb752ea3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingStatement.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingStatement.stree.txt
@@ -1,29 +1,29 @@
-Statement block - Gen<None> - 42 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [using(var foo = new Foo()) { foo.Bar(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:25
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[new];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..42)::42 - [@using(var foo = new Foo()) { foo.Bar(); }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..42)::41 - [using(var foo = new Foo()) { foo.Bar(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[using];
+        LeftParenthesis;[(];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Keyword;[new];
+        Whitespace;[ ];
+        Identifier;[Foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Dot;[.];
+        Identifier;[Bar];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingTypeAlias.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingTypeAlias.stree.txt
index df25b12077..09a8926056 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingTypeAlias.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingTypeAlias.stree.txt
@@ -1,23 +1,25 @@
-Directive block - Gen<None> - 79 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Import: StringDictionary = System.Collections.Generic.Dictionary<string, string>;> - [using StringDictionary = System.Collections.Generic.Dictionary<string, string>] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Tokens:19
-        CSharpTokenType.Keyword;[using];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[StringDictionary];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[System];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Collections];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Generic];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Dictionary];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.Keyword;[string];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[string];
-        CSharpTokenType.GreaterThan;[>];
+CSharpCodeBlock - [0..79)::79 - [@using StringDictionary = System.Collections.Generic.Dictionary<string, string>]
+    RazorDirective - [0..79)::79
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        RazorDirectiveBody - [1..79)::78
+            CSharpStatementLiteral - [1..79)::78 - [using StringDictionary = System.Collections.Generic.Dictionary<string, string>] - Gen<Import: StringDictionary = System.Collections.Generic.Dictionary<string, string>;> - SpanEditHandler;Accepts:AnyExceptNewline
+                Keyword;[using];
+                Whitespace;[ ];
+                Identifier;[StringDictionary];
+                Whitespace;[ ];
+                Assign;[=];
+                Whitespace;[ ];
+                Identifier;[System];
+                Dot;[.];
+                Identifier;[Collections];
+                Dot;[.];
+                Identifier;[Generic];
+                Dot;[.];
+                Identifier;[Dictionary];
+                LessThan;[<];
+                Keyword;[string];
+                Comma;[,];
+                Whitespace;[ ];
+                Keyword;[string];
+                GreaterThan;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/WhileStatement.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/WhileStatement.stree.txt
index 5a2eb3d2e3..b80423d15c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/WhileStatement.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/WhileStatement.stree.txt
@@ -1,17 +1,17 @@
-Statement block - Gen<None> - 23 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    Code span - Gen<Stmt> - [while(true) { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:13
-        CSharpTokenType.Keyword;[while];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..23)::23 - [@while(true) { foo(); }]
+    CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    CSharpStatementLiteral - [1..23)::22 - [while(true) { foo(); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        Keyword;[while];
+        LeftParenthesis;[(];
+        Keyword;[true];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[foo];
+        LeftParenthesis;[(];
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInExplicitExpressionParens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInExplicitExpressionParens.cspans.txt
index 0684f9302c..2406d696ff 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInExplicitExpressionParens.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInExplicitExpressionParens.cspans.txt
@@ -4,7 +4,7 @@ Transition span at (17:0,17 [1] ) (Accepts:None) - Parent: Markup block at (17:0
 Markup span at (18:0,18 [3] ) (Accepts:None) - Parent: Tag block at (18:0,18 [3] )
 Markup span at (21:0,21 [5] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [18] )
 Transition span at (26:0,26 [1] ) (Accepts:None) - Parent: Expression block at (26:0,26 [5] )
-Code span at (27:0,27 [4] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (26:0,26 [5] )
+Code span at (27:0,27 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (26:0,26 [5] )
 Markup span at (31:0,31 [4] ) (Accepts:None) - Parent: Tag block at (31:0,31 [4] )
 Code span at (35:0,35 [1] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [37] )
 MetaCode span at (36:0,36 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [37] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInExplicitExpressionParens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInExplicitExpressionParens.stree.txt
index bdcccbd8c2..bf9bec131c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInExplicitExpressionParens.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInExplicitExpressionParens.stree.txt
@@ -1,39 +1,47 @@
-Expression block - Gen<Expr> - 37 - (0:0,0)
-    MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftParenthesis;[(];
-    Code span - Gen<Expr> - [Html.Repeat(10, ] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:7
-        CSharpTokenType.Identifier;[Html];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Repeat];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-    Template block - Gen<Template> - 18 - (17:0,17)
-        Markup block - Gen<None> - 18 - (17:0,17)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Tag block - Gen<None> - 3 - (18:0,18)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:3
-                HtmlTokenType.Text;[Foo];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[#];
-            Expression block - Gen<Expr> - 5 - (26:0,26)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (26:0,26) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [item] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (27:0,27) - Tokens:1
-                    CSharpTokenType.Identifier;[item];
-            Tag block - Gen<None> - 4 - (31:0,31)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Expr> - [)] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1
-        CSharpTokenType.RightParenthesis;[)];
-    MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:1
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..37)::37 - [(Html.Repeat(10, @<p>Foo #@item</p>))]
+    CSharpExplicitExpression - [0..37)::37
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpExplicitExpressionBody - [0..37)::37
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftParenthesis;[(];
+            CSharpCodeBlock - [1..36)::35
+                CSharpExpressionLiteral - [1..17)::16 - [Html.Repeat(10, ] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                    Identifier;[Html];
+                    Dot;[.];
+                    Identifier;[Repeat];
+                    LeftParenthesis;[(];
+                    IntegerLiteral;[10];
+                    Comma;[,];
+                    Whitespace;[ ];
+                CSharpTemplateBlock - [17..35)::18
+                    MarkupBlock - [17..35)::18
+                        MarkupTransition - [17..18)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupTagBlock - [18..21)::3 - [<p>]
+                            MarkupTextLiteral - [18..21)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                        MarkupTextLiteral - [21..26)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                            Whitespace;[ ];
+                            Text;[#];
+                        CSharpCodeBlock - [26..31)::5
+                            CSharpImplicitExpression - [26..31)::5
+                                CSharpTransition - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [27..31)::4
+                                    CSharpCodeBlock - [27..31)::4
+                                        CSharpExpressionLiteral - [27..31)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[item];
+                        MarkupTagBlock - [31..35)::4 - [</p>]
+                            MarkupTextLiteral - [31..35)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                CSharpExpressionLiteral - [35..36)::1 - [)] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                    RightParenthesis;[)];
+            RazorMetaCode - [36..37)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInImplicitExpressionParens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInImplicitExpressionParens.cspans.txt
index 79b07dee63..8f579958a9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInImplicitExpressionParens.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInImplicitExpressionParens.cspans.txt
@@ -3,6 +3,6 @@ Transition span at (16:0,16 [1] ) (Accepts:None) - Parent: Markup block at (16:0
 Markup span at (17:0,17 [3] ) (Accepts:None) - Parent: Tag block at (17:0,17 [3] )
 Markup span at (20:0,20 [5] ) (Accepts:Any) - Parent: Markup block at (16:0,16 [18] )
 Transition span at (25:0,25 [1] ) (Accepts:None) - Parent: Expression block at (25:0,25 [5] )
-Code span at (26:0,26 [4] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (25:0,25 [5] )
+Code span at (26:0,26 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (25:0,25 [5] )
 Markup span at (30:0,30 [4] ) (Accepts:None) - Parent: Tag block at (30:0,30 [4] )
-Code span at (34:0,34 [1] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [35] )
+Code span at (34:0,34 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [35] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInImplicitExpressionParens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInImplicitExpressionParens.stree.txt
index 19bec65efd..9109bad89c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInImplicitExpressionParens.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInImplicitExpressionParens.stree.txt
@@ -1,35 +1,43 @@
-Expression block - Gen<Expr> - 35 - (0:0,0)
-    Code span - Gen<Expr> - [Html.Repeat(10, ] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Tokens:7
-        CSharpTokenType.Identifier;[Html];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Repeat];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-    Template block - Gen<Template> - 18 - (16:0,16)
-        Markup block - Gen<None> - 18 - (16:0,16)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Tag block - Gen<None> - 3 - (17:0,17)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:3
-                HtmlTokenType.Text;[Foo];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[#];
-            Expression block - Gen<Expr> - 5 - (25:0,25)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [item] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (26:0,26) - Tokens:1
-                    CSharpTokenType.Identifier;[item];
-            Tag block - Gen<None> - 4 - (30:0,30)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (30:0,30) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Expr> - [)] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (34:0,34) - Tokens:1
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..35)::35 - [Html.Repeat(10, @<p>Foo #@item</p>)]
+    CSharpImplicitExpression - [0..35)::35
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpImplicitExpressionBody - [0..35)::35
+            CSharpCodeBlock - [0..35)::35
+                CSharpExpressionLiteral - [0..16)::16 - [Html.Repeat(10, ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Identifier;[Html];
+                    Dot;[.];
+                    Identifier;[Repeat];
+                    LeftParenthesis;[(];
+                    IntegerLiteral;[10];
+                    Comma;[,];
+                    Whitespace;[ ];
+                CSharpTemplateBlock - [16..34)::18
+                    MarkupBlock - [16..34)::18
+                        MarkupTransition - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupTagBlock - [17..20)::3 - [<p>]
+                            MarkupTextLiteral - [17..20)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                        MarkupTextLiteral - [20..25)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                            Whitespace;[ ];
+                            Text;[#];
+                        CSharpCodeBlock - [25..30)::5
+                            CSharpImplicitExpression - [25..30)::5
+                                CSharpTransition - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [26..30)::4
+                                    CSharpCodeBlock - [26..30)::4
+                                        CSharpExpressionLiteral - [26..30)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[item];
+                        MarkupTagBlock - [30..34)::4 - [</p>]
+                            MarkupTextLiteral - [30..34)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                CSharpExpressionLiteral - [34..35)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinCodeBlock.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinCodeBlock.cspans.txt
index 830b93bc98..dcc8be1946 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinCodeBlock.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinCodeBlock.cspans.txt
@@ -3,6 +3,6 @@ Transition span at (48:0,48 [1] ) (Accepts:None) - Parent: Markup block at (48:0
 Markup span at (49:0,49 [3] ) (Accepts:None) - Parent: Tag block at (49:0,49 [3] )
 Markup span at (52:0,52 [5] ) (Accepts:Any) - Parent: Markup block at (48:0,48 [18] )
 Transition span at (57:0,57 [1] ) (Accepts:None) - Parent: Expression block at (57:0,57 [5] )
-Code span at (58:0,58 [4] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (57:0,57 [5] )
+Code span at (58:0,58 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (57:0,57 [5] )
 Markup span at (62:0,62 [4] ) (Accepts:None) - Parent: Tag block at (62:0,62 [4] )
 Code span at (66:0,66 [4] ) (Accepts:None) - Parent: Statement block at (0:0,0 [70] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinCodeBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinCodeBlock.stree.txt
index 85b55a2638..4c3c794e1e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinCodeBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinCodeBlock.stree.txt
@@ -1,49 +1,54 @@
-Statement block - Gen<None> - 70 - (0:0,0)
-    Code span - Gen<Stmt> - [foreach(foo in Bar) { Html.ExecuteTemplate(foo, ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:18
-        CSharpTokenType.Keyword;[foreach];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[in];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Html];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[ExecuteTemplate];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-    Template block - Gen<Template> - 18 - (48:0,48)
-        Markup block - Gen<None> - 18 - (48:0,48)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (48:0,48) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Tag block - Gen<None> - 3 - (49:0,49)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (49:0,49) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (52:0,52) - Tokens:3
-                HtmlTokenType.Text;[Foo];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[#];
-            Expression block - Gen<Expr> - 5 - (57:0,57)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (57:0,57) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [item] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (58:0,58) - Tokens:1
-                    CSharpTokenType.Identifier;[item];
-            Tag block - Gen<None> - 4 - (62:0,62)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (62:0,62) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [); }] - SpanEditHandler;Accepts:None - (66:0,66) - Tokens:4
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..70)::70 - [foreach(foo in Bar) { Html.ExecuteTemplate(foo, @<p>Foo #@item</p>); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..48)::48 - [foreach(foo in Bar) { Html.ExecuteTemplate(foo, ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[foreach];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Keyword;[in];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Html];
+        Dot;[.];
+        Identifier;[ExecuteTemplate];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Comma;[,];
+        Whitespace;[ ];
+    CSharpTemplateBlock - [48..66)::18
+        MarkupBlock - [48..66)::18
+            MarkupTransition - [48..49)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            MarkupTagBlock - [49..52)::3 - [<p>]
+                MarkupTextLiteral - [49..52)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [52..57)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Foo];
+                Whitespace;[ ];
+                Text;[#];
+            CSharpCodeBlock - [57..62)::5
+                CSharpImplicitExpression - [57..62)::5
+                    CSharpTransition - [57..58)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [58..62)::4
+                        CSharpCodeBlock - [58..62)::4
+                            CSharpExpressionLiteral - [58..62)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[item];
+            MarkupTagBlock - [62..66)::4 - [</p>]
+                MarkupTextLiteral - [62..66)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+    CSharpStatementLiteral - [66..70)::4 - [); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinStatementBlock.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinStatementBlock.cspans.txt
index d9813b531c..b5fe75234f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinStatementBlock.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinStatementBlock.cspans.txt
@@ -4,7 +4,7 @@ Transition span at (43:0,43 [1] ) (Accepts:None) - Parent: Markup block at (43:0
 Markup span at (44:0,44 [3] ) (Accepts:None) - Parent: Tag block at (44:0,44 [3] )
 Markup span at (47:0,47 [5] ) (Accepts:Any) - Parent: Markup block at (43:0,43 [18] )
 Transition span at (52:0,52 [1] ) (Accepts:None) - Parent: Expression block at (52:0,52 [5] )
-Code span at (53:0,53 [4] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (52:0,52 [5] )
+Code span at (53:0,53 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (52:0,52 [5] )
 Markup span at (57:0,57 [4] ) (Accepts:None) - Parent: Tag block at (57:0,57 [4] )
 Code span at (61:0,61 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [65] )
 MetaCode span at (64:0,64 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [65] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinStatementBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinStatementBlock.stree.txt
index e3386a23df..01cbdb5b02 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinStatementBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinStatementBlock.stree.txt
@@ -1,51 +1,59 @@
-Statement block - Gen<None> - 65 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ var foo = bar; Html.ExecuteTemplate(foo, ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:17
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Html];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[ExecuteTemplate];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-    Template block - Gen<Template> - 18 - (43:0,43)
-        Markup block - Gen<None> - 18 - (43:0,43)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (43:0,43) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Tag block - Gen<None> - 3 - (44:0,44)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (44:0,44) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:3
-                HtmlTokenType.Text;[Foo];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[#];
-            Expression block - Gen<Expr> - 5 - (52:0,52)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (52:0,52) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [item] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (53:0,53) - Tokens:1
-                    CSharpTokenType.Identifier;[item];
-            Tag block - Gen<None> - 4 - (57:0,57)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (57:0,57) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [); ] - SpanEditHandler;Accepts:Any - (61:0,61) - Tokens:3
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (64:0,64) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..65)::65 - [{ var foo = bar; Html.ExecuteTemplate(foo, @<p>Foo #@item</p>); }]
+    CSharpStatement - [0..65)::65
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..65)::65
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..64)::63
+                CSharpStatementLiteral - [1..43)::42 - [ var foo = bar; Html.ExecuteTemplate(foo, ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    Identifier;[Html];
+                    Dot;[.];
+                    Identifier;[ExecuteTemplate];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    Comma;[,];
+                    Whitespace;[ ];
+                CSharpTemplateBlock - [43..61)::18
+                    MarkupBlock - [43..61)::18
+                        MarkupTransition - [43..44)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupTagBlock - [44..47)::3 - [<p>]
+                            MarkupTextLiteral - [44..47)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                        MarkupTextLiteral - [47..52)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                            Whitespace;[ ];
+                            Text;[#];
+                        CSharpCodeBlock - [52..57)::5
+                            CSharpImplicitExpression - [52..57)::5
+                                CSharpTransition - [52..53)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [53..57)::4
+                                    CSharpCodeBlock - [53..57)::4
+                                        CSharpExpressionLiteral - [53..57)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[item];
+                        MarkupTagBlock - [57..61)::4 - [</p>]
+                            MarkupTextLiteral - [57..61)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                CSharpStatementLiteral - [61..64)::3 - [); ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+            RazorMetaCode - [64..65)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineImmediatelyFollowingStatementChar.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineImmediatelyFollowingStatementChar.stree.txt
index 0cb352df4c..5ef76fe389 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineImmediatelyFollowingStatementChar.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineImmediatelyFollowingStatementChar.stree.txt
@@ -1,19 +1,24 @@
-Statement block - Gen<None> - 11 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [i] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:1
-        CSharpTokenType.Identifier;[i];
-    Template block - Gen<Template> - 8 - (2:0,2)
-        Markup block - Gen<None> - 8 - (2:0,2)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
-                HtmlTokenType.Colon;[:];
-            Markup span - Gen<Markup> - [ barLF] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[bar];
-                HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (10:1,0) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (10:1,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..11)::11 - [{i@: barLF}]
+    CSharpStatement - [0..11)::11
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..11)::11
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..10)::9
+                CSharpStatementLiteral - [1..2)::1 - [i] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Identifier;[i];
+                CSharpTemplateBlock - [2..10)::8
+                    MarkupBlock - [2..10)::8
+                        MarkupTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                            Colon;[:];
+                        MarkupTextLiteral - [4..10)::6 - [ barLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                            Text;[bar];
+                            NewLine;[LF];
+                CSharpStatementLiteral - [10..10)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Marker;[];
+            RazorMetaCode - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineTemplate.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineTemplate.stree.txt
index 7613dd7168..f9657adc19 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineTemplate.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineTemplate.stree.txt
@@ -1,26 +1,31 @@
-Statement block - Gen<None> - 23 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ var foo = ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:7
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-    Template block - Gen<Template> - 8 - (12:0,12)
-        Markup block - Gen<None> - 8 - (12:0,12)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                HtmlTokenType.Colon;[:];
-            Markup span - Gen<Markup> - [ barLF] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[bar];
-                HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [; ] - SpanEditHandler;Accepts:Any - (20:1,0) - Tokens:2
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (22:1,2) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..23)::23 - [{ var foo = @: barLF; }]
+    CSharpStatement - [0..23)::23
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..23)::23
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..22)::21
+                CSharpStatementLiteral - [1..12)::11 - [ var foo = ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                CSharpTemplateBlock - [12..20)::8
+                    MarkupBlock - [12..20)::8
+                        MarkupTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                            Colon;[:];
+                        MarkupTextLiteral - [14..20)::6 - [ barLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                            Text;[bar];
+                            NewLine;[LF];
+                CSharpStatementLiteral - [20..22)::2 - [; ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Semicolon;[;];
+                    Whitespace;[ ];
+            RazorMetaCode - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInImplicitExpressionParens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInImplicitExpressionParens.cspans.txt
index 2d42610e9c..6474b8e2e3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInImplicitExpressionParens.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInImplicitExpressionParens.cspans.txt
@@ -3,13 +3,13 @@ Transition span at (16:0,16 [1] ) (Accepts:None) - Parent: Markup block at (16:0
 Markup span at (17:0,17 [3] ) (Accepts:None) - Parent: Tag block at (17:0,17 [3] )
 Markup span at (20:0,20 [5] ) (Accepts:Any) - Parent: Markup block at (16:0,16 [18] )
 Transition span at (25:0,25 [1] ) (Accepts:None) - Parent: Expression block at (25:0,25 [5] )
-Code span at (26:0,26 [4] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (25:0,25 [5] )
+Code span at (26:0,26 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (25:0,25 [5] )
 Markup span at (30:0,30 [4] ) (Accepts:None) - Parent: Tag block at (30:0,30 [4] )
 Code span at (34:0,34 [2] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [55] )
 Transition span at (36:0,36 [1] ) (Accepts:None) - Parent: Markup block at (36:0,36 [18] )
 Markup span at (37:0,37 [3] ) (Accepts:None) - Parent: Tag block at (37:0,37 [3] )
 Markup span at (40:0,40 [5] ) (Accepts:Any) - Parent: Markup block at (36:0,36 [18] )
 Transition span at (45:0,45 [1] ) (Accepts:None) - Parent: Expression block at (45:0,45 [5] )
-Code span at (46:0,46 [4] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (45:0,45 [5] )
+Code span at (46:0,46 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (45:0,45 [5] )
 Markup span at (50:0,50 [4] ) (Accepts:None) - Parent: Tag block at (50:0,50 [4] )
-Code span at (54:0,54 [1] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [55] )
+Code span at (54:0,54 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [55] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInImplicitExpressionParens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInImplicitExpressionParens.stree.txt
index 6c652ff65e..1ce1f3ebea 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInImplicitExpressionParens.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInImplicitExpressionParens.stree.txt
@@ -1,62 +1,73 @@
-Expression block - Gen<Expr> - 55 - (0:0,0)
-    Code span - Gen<Expr> - [Html.Repeat(10, ] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Tokens:7
-        CSharpTokenType.Identifier;[Html];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Repeat];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-    Template block - Gen<Template> - 18 - (16:0,16)
-        Markup block - Gen<None> - 18 - (16:0,16)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Tag block - Gen<None> - 3 - (17:0,17)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:3
-                HtmlTokenType.Text;[Foo];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[#];
-            Expression block - Gen<Expr> - 5 - (25:0,25)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [item] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (26:0,26) - Tokens:1
-                    CSharpTokenType.Identifier;[item];
-            Tag block - Gen<None> - 4 - (30:0,30)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (30:0,30) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Expr> - [, ] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (34:0,34) - Tokens:2
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-    Template block - Gen<Template> - 18 - (36:0,36)
-        Markup block - Gen<None> - 18 - (36:0,36)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Tag block - Gen<None> - 3 - (37:0,37)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (37:0,37) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:3
-                HtmlTokenType.Text;[Foo];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[#];
-            Expression block - Gen<Expr> - 5 - (45:0,45)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (45:0,45) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [item] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (46:0,46) - Tokens:1
-                    CSharpTokenType.Identifier;[item];
-            Tag block - Gen<None> - 4 - (50:0,50)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (50:0,50) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Expr> - [)] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (54:0,54) - Tokens:1
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..55)::55 - [Html.Repeat(10, @<p>Foo #@item</p>, @<p>Foo #@item</p>)]
+    CSharpImplicitExpression - [0..55)::55
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpImplicitExpressionBody - [0..55)::55
+            CSharpCodeBlock - [0..55)::55
+                CSharpExpressionLiteral - [0..16)::16 - [Html.Repeat(10, ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Identifier;[Html];
+                    Dot;[.];
+                    Identifier;[Repeat];
+                    LeftParenthesis;[(];
+                    IntegerLiteral;[10];
+                    Comma;[,];
+                    Whitespace;[ ];
+                CSharpTemplateBlock - [16..34)::18
+                    MarkupBlock - [16..34)::18
+                        MarkupTransition - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupTagBlock - [17..20)::3 - [<p>]
+                            MarkupTextLiteral - [17..20)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                        MarkupTextLiteral - [20..25)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                            Whitespace;[ ];
+                            Text;[#];
+                        CSharpCodeBlock - [25..30)::5
+                            CSharpImplicitExpression - [25..30)::5
+                                CSharpTransition - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [26..30)::4
+                                    CSharpCodeBlock - [26..30)::4
+                                        CSharpExpressionLiteral - [26..30)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[item];
+                        MarkupTagBlock - [30..34)::4 - [</p>]
+                            MarkupTextLiteral - [30..34)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                CSharpExpressionLiteral - [34..36)::2 - [, ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Comma;[,];
+                    Whitespace;[ ];
+                CSharpTemplateBlock - [36..54)::18
+                    MarkupBlock - [36..54)::18
+                        MarkupTransition - [36..37)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupTagBlock - [37..40)::3 - [<p>]
+                            MarkupTextLiteral - [37..40)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                        MarkupTextLiteral - [40..45)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                            Whitespace;[ ];
+                            Text;[#];
+                        CSharpCodeBlock - [45..50)::5
+                            CSharpImplicitExpression - [45..50)::5
+                                CSharpTransition - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [46..50)::4
+                                    CSharpCodeBlock - [46..50)::4
+                                        CSharpExpressionLiteral - [46..50)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[item];
+                        MarkupTagBlock - [50..54)::4 - [</p>]
+                            MarkupTextLiteral - [50..54)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                CSharpExpressionLiteral - [54..55)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInStatementWithinCodeBlock.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInStatementWithinCodeBlock.cspans.txt
index 88d85bdcd6..c79d7c0969 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInStatementWithinCodeBlock.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInStatementWithinCodeBlock.cspans.txt
@@ -3,13 +3,13 @@ Transition span at (48:0,48 [1] ) (Accepts:None) - Parent: Markup block at (48:0
 Markup span at (49:0,49 [3] ) (Accepts:None) - Parent: Tag block at (49:0,49 [3] )
 Markup span at (52:0,52 [5] ) (Accepts:Any) - Parent: Markup block at (48:0,48 [18] )
 Transition span at (57:0,57 [1] ) (Accepts:None) - Parent: Expression block at (57:0,57 [5] )
-Code span at (58:0,58 [4] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (57:0,57 [5] )
+Code span at (58:0,58 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (57:0,57 [5] )
 Markup span at (62:0,62 [4] ) (Accepts:None) - Parent: Tag block at (62:0,62 [4] )
 Code span at (66:0,66 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [90] )
 Transition span at (68:0,68 [1] ) (Accepts:None) - Parent: Markup block at (68:0,68 [18] )
 Markup span at (69:0,69 [3] ) (Accepts:None) - Parent: Tag block at (69:0,69 [3] )
 Markup span at (72:0,72 [5] ) (Accepts:Any) - Parent: Markup block at (68:0,68 [18] )
 Transition span at (77:0,77 [1] ) (Accepts:None) - Parent: Expression block at (77:0,77 [5] )
-Code span at (78:0,78 [4] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (77:0,77 [5] )
+Code span at (78:0,78 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (77:0,77 [5] )
 Markup span at (82:0,82 [4] ) (Accepts:None) - Parent: Tag block at (82:0,82 [4] )
 Code span at (86:0,86 [4] ) (Accepts:None) - Parent: Statement block at (0:0,0 [90] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInStatementWithinCodeBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInStatementWithinCodeBlock.stree.txt
index ec7a3c6042..24d9f69fb7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInStatementWithinCodeBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInStatementWithinCodeBlock.stree.txt
@@ -1,76 +1,84 @@
-Statement block - Gen<None> - 90 - (0:0,0)
-    Code span - Gen<Stmt> - [foreach(foo in Bar) { Html.ExecuteTemplate(foo, ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:18
-        CSharpTokenType.Keyword;[foreach];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[in];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Html];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[ExecuteTemplate];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-    Template block - Gen<Template> - 18 - (48:0,48)
-        Markup block - Gen<None> - 18 - (48:0,48)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (48:0,48) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Tag block - Gen<None> - 3 - (49:0,49)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (49:0,49) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (52:0,52) - Tokens:3
-                HtmlTokenType.Text;[Foo];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[#];
-            Expression block - Gen<Expr> - 5 - (57:0,57)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (57:0,57) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [item] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (58:0,58) - Tokens:1
-                    CSharpTokenType.Identifier;[item];
-            Tag block - Gen<None> - 4 - (62:0,62)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (62:0,62) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [, ] - SpanEditHandler;Accepts:Any - (66:0,66) - Tokens:2
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-    Template block - Gen<Template> - 18 - (68:0,68)
-        Markup block - Gen<None> - 18 - (68:0,68)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (68:0,68) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Tag block - Gen<None> - 3 - (69:0,69)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (69:0,69) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (72:0,72) - Tokens:3
-                HtmlTokenType.Text;[Foo];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[#];
-            Expression block - Gen<Expr> - 5 - (77:0,77)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (77:0,77) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [item] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (78:0,78) - Tokens:1
-                    CSharpTokenType.Identifier;[item];
-            Tag block - Gen<None> - 4 - (82:0,82)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (82:0,82) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [); }] - SpanEditHandler;Accepts:None - (86:0,86) - Tokens:4
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..90)::90 - [foreach(foo in Bar) { Html.ExecuteTemplate(foo, @<p>Foo #@item</p>, @<p>Foo #@item</p>); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..48)::48 - [foreach(foo in Bar) { Html.ExecuteTemplate(foo, ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[foreach];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Keyword;[in];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Html];
+        Dot;[.];
+        Identifier;[ExecuteTemplate];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Comma;[,];
+        Whitespace;[ ];
+    CSharpTemplateBlock - [48..66)::18
+        MarkupBlock - [48..66)::18
+            MarkupTransition - [48..49)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            MarkupTagBlock - [49..52)::3 - [<p>]
+                MarkupTextLiteral - [49..52)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [52..57)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Foo];
+                Whitespace;[ ];
+                Text;[#];
+            CSharpCodeBlock - [57..62)::5
+                CSharpImplicitExpression - [57..62)::5
+                    CSharpTransition - [57..58)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [58..62)::4
+                        CSharpCodeBlock - [58..62)::4
+                            CSharpExpressionLiteral - [58..62)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[item];
+            MarkupTagBlock - [62..66)::4 - [</p>]
+                MarkupTextLiteral - [62..66)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+    CSharpStatementLiteral - [66..68)::2 - [, ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Comma;[,];
+        Whitespace;[ ];
+    CSharpTemplateBlock - [68..86)::18
+        MarkupBlock - [68..86)::18
+            MarkupTransition - [68..69)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            MarkupTagBlock - [69..72)::3 - [<p>]
+                MarkupTextLiteral - [69..72)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [72..77)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Foo];
+                Whitespace;[ ];
+                Text;[#];
+            CSharpCodeBlock - [77..82)::5
+                CSharpImplicitExpression - [77..82)::5
+                    CSharpTransition - [77..78)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [78..82)::4
+                        CSharpCodeBlock - [78..82)::4
+                            CSharpExpressionLiteral - [78..82)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[item];
+            MarkupTagBlock - [82..86)::4 - [</p>]
+                MarkupTextLiteral - [82..86)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+    CSharpStatementLiteral - [86..90)::4 - [); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlessTwoTemplatesInStatementWithinStatementBlock.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlessTwoTemplatesInStatementWithinStatementBlock.cspans.txt
index 01aceae860..fc2ed31832 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlessTwoTemplatesInStatementWithinStatementBlock.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlessTwoTemplatesInStatementWithinStatementBlock.cspans.txt
@@ -4,14 +4,14 @@ Transition span at (43:0,43 [1] ) (Accepts:None) - Parent: Markup block at (43:0
 Markup span at (44:0,44 [3] ) (Accepts:None) - Parent: Tag block at (44:0,44 [3] )
 Markup span at (47:0,47 [5] ) (Accepts:Any) - Parent: Markup block at (43:0,43 [18] )
 Transition span at (52:0,52 [1] ) (Accepts:None) - Parent: Expression block at (52:0,52 [5] )
-Code span at (53:0,53 [4] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (52:0,52 [5] )
+Code span at (53:0,53 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (52:0,52 [5] )
 Markup span at (57:0,57 [4] ) (Accepts:None) - Parent: Tag block at (57:0,57 [4] )
 Code span at (61:0,61 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [85] )
 Transition span at (63:0,63 [1] ) (Accepts:None) - Parent: Markup block at (63:0,63 [18] )
 Markup span at (64:0,64 [3] ) (Accepts:None) - Parent: Tag block at (64:0,64 [3] )
 Markup span at (67:0,67 [5] ) (Accepts:Any) - Parent: Markup block at (63:0,63 [18] )
 Transition span at (72:0,72 [1] ) (Accepts:None) - Parent: Expression block at (72:0,72 [5] )
-Code span at (73:0,73 [4] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (72:0,72 [5] )
+Code span at (73:0,73 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (72:0,72 [5] )
 Markup span at (77:0,77 [4] ) (Accepts:None) - Parent: Tag block at (77:0,77 [4] )
 Code span at (81:0,81 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [85] )
 MetaCode span at (84:0,84 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [85] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlessTwoTemplatesInStatementWithinStatementBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlessTwoTemplatesInStatementWithinStatementBlock.stree.txt
index 29b252ec93..80066eeca6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlessTwoTemplatesInStatementWithinStatementBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlessTwoTemplatesInStatementWithinStatementBlock.stree.txt
@@ -1,78 +1,89 @@
-Statement block - Gen<None> - 85 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ var foo = bar; Html.ExecuteTemplate(foo, ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:17
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Html];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[ExecuteTemplate];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-    Template block - Gen<Template> - 18 - (43:0,43)
-        Markup block - Gen<None> - 18 - (43:0,43)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (43:0,43) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Tag block - Gen<None> - 3 - (44:0,44)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (44:0,44) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:3
-                HtmlTokenType.Text;[Foo];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[#];
-            Expression block - Gen<Expr> - 5 - (52:0,52)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (52:0,52) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [item] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (53:0,53) - Tokens:1
-                    CSharpTokenType.Identifier;[item];
-            Tag block - Gen<None> - 4 - (57:0,57)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (57:0,57) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [, ] - SpanEditHandler;Accepts:Any - (61:0,61) - Tokens:2
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-    Template block - Gen<Template> - 18 - (63:0,63)
-        Markup block - Gen<None> - 18 - (63:0,63)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (63:0,63) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Tag block - Gen<None> - 3 - (64:0,64)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (64:0,64) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (67:0,67) - Tokens:3
-                HtmlTokenType.Text;[Foo];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[#];
-            Expression block - Gen<Expr> - 5 - (72:0,72)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (72:0,72) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [item] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (73:0,73) - Tokens:1
-                    CSharpTokenType.Identifier;[item];
-            Tag block - Gen<None> - 4 - (77:0,77)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (77:0,77) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [); ] - SpanEditHandler;Accepts:Any - (81:0,81) - Tokens:3
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (84:0,84) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..85)::85 - [{ var foo = bar; Html.ExecuteTemplate(foo, @<p>Foo #@item</p>, @<p>Foo #@item</p>); }]
+    CSharpStatement - [0..85)::85
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..85)::85
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..84)::83
+                CSharpStatementLiteral - [1..43)::42 - [ var foo = bar; Html.ExecuteTemplate(foo, ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    Identifier;[Html];
+                    Dot;[.];
+                    Identifier;[ExecuteTemplate];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    Comma;[,];
+                    Whitespace;[ ];
+                CSharpTemplateBlock - [43..61)::18
+                    MarkupBlock - [43..61)::18
+                        MarkupTransition - [43..44)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupTagBlock - [44..47)::3 - [<p>]
+                            MarkupTextLiteral - [44..47)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                        MarkupTextLiteral - [47..52)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                            Whitespace;[ ];
+                            Text;[#];
+                        CSharpCodeBlock - [52..57)::5
+                            CSharpImplicitExpression - [52..57)::5
+                                CSharpTransition - [52..53)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [53..57)::4
+                                    CSharpCodeBlock - [53..57)::4
+                                        CSharpExpressionLiteral - [53..57)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[item];
+                        MarkupTagBlock - [57..61)::4 - [</p>]
+                            MarkupTextLiteral - [57..61)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                CSharpStatementLiteral - [61..63)::2 - [, ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Comma;[,];
+                    Whitespace;[ ];
+                CSharpTemplateBlock - [63..81)::18
+                    MarkupBlock - [63..81)::18
+                        MarkupTransition - [63..64)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupTagBlock - [64..67)::3 - [<p>]
+                            MarkupTextLiteral - [64..67)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                        MarkupTextLiteral - [67..72)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                            Whitespace;[ ];
+                            Text;[#];
+                        CSharpCodeBlock - [72..77)::5
+                            CSharpImplicitExpression - [72..77)::5
+                                CSharpTransition - [72..73)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [73..77)::4
+                                    CSharpCodeBlock - [73..77)::4
+                                        CSharpExpressionLiteral - [73..77)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[item];
+                        MarkupTagBlock - [77..81)::4 - [</p>]
+                            MarkupTextLiteral - [77..81)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                CSharpStatementLiteral - [81..84)::3 - [); ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+            RazorMetaCode - [84..85)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.cspans.txt
index 97d0d57547..c8b5b7be4e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.cspans.txt
@@ -8,8 +8,8 @@ Transition span at (42:0,42 [1] ) (Accepts:None) - Parent: Markup block at (42:0
 Markup span at (43:0,43 [3] ) (Accepts:None) - Parent: Tag block at (43:0,43 [3] )
 Markup span at (46:0,46 [0] ) (Accepts:Any) - Parent: Markup block at (42:0,42 [13] )
 Transition span at (46:0,46 [1] ) (Accepts:None) - Parent: Expression block at (46:0,46 [5] )
-Code span at (47:0,47 [4] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (46:0,46 [5] )
+Code span at (47:0,47 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (46:0,46 [5] )
 Markup span at (51:0,51 [4] ) (Accepts:None) - Parent: Tag block at (51:0,51 [4] )
-Code span at (55:0,55 [1] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (25:0,25 [31] )
+Code span at (55:0,55 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (25:0,25 [31] )
 Markup span at (56:0,56 [4] ) (Accepts:None) - Parent: Tag block at (56:0,56 [4] )
-Code span at (60:0,60 [1] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [61] )
+Code span at (60:0,60 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [61] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.stree.txt
index f7e631f49f..1b38b90203 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.stree.txt
@@ -1,65 +1,76 @@
-Expression block - Gen<Expr> - 61 - (0:0,0)
-    Code span - Gen<Expr> - [Html.Repeat(10, ] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Tokens:7
-        CSharpTokenType.Identifier;[Html];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Repeat];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-    Template block - Gen<Template> - 44 - (16:0,16)
-        Markup block - Gen<None> - 44 - (16:0,16)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Tag block - Gen<None> - 3 - (17:0,17)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:3
-                HtmlTokenType.Text;[Foo];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[#];
-            Expression block - Gen<Expr> - 31 - (25:0,25)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [Html.Repeat(10, ] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (26:0,26) - Tokens:7
-                    CSharpTokenType.Identifier;[Html];
-                    CSharpTokenType.Dot;[.];
-                    CSharpTokenType.Identifier;[Repeat];
-                    CSharpTokenType.LeftParenthesis;[(];
-                    CSharpTokenType.IntegerLiteral;[10];
-                    CSharpTokenType.Comma;[,];
-                    CSharpTokenType.WhiteSpace;[ ];
-                Template block - Gen<Template> - 13 - (42:0,42)
-                    Markup block - Gen<None> - 13 - (42:0,42)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (42:0,42) - Tokens:1
-                            HtmlTokenType.Transition;[@];
-                        Tag block - Gen<None> - 3 - (43:0,43)
-                            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (43:0,43) - Tokens:3
-                                HtmlTokenType.OpenAngle;[<];
-                                HtmlTokenType.Text;[p];
-                                HtmlTokenType.CloseAngle;[>];
-                        Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:1
-                            HtmlTokenType.Unknown;[];
-                        Expression block - Gen<Expr> - 5 - (46:0,46)
-                            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (46:0,46) - Tokens:1
-                                CSharpTokenType.Transition;[@];
-                            Code span - Gen<Expr> - [item] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (47:0,47) - Tokens:1
-                                CSharpTokenType.Identifier;[item];
-                        Tag block - Gen<None> - 4 - (51:0,51)
-                            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (51:0,51) - Tokens:4
-                                HtmlTokenType.OpenAngle;[<];
-                                HtmlTokenType.ForwardSlash;[/];
-                                HtmlTokenType.Text;[p];
-                                HtmlTokenType.CloseAngle;[>];
-                Code span - Gen<Expr> - [)] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (55:0,55) - Tokens:1
-                    CSharpTokenType.RightParenthesis;[)];
-            Tag block - Gen<None> - 4 - (56:0,56)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (56:0,56) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Expr> - [)] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (60:0,60) - Tokens:1
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..61)::61 - [Html.Repeat(10, @<p>Foo #@Html.Repeat(10, @<p>@item</p>)</p>)]
+    CSharpImplicitExpression - [0..61)::61
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpImplicitExpressionBody - [0..61)::61
+            CSharpCodeBlock - [0..61)::61
+                CSharpExpressionLiteral - [0..16)::16 - [Html.Repeat(10, ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Identifier;[Html];
+                    Dot;[.];
+                    Identifier;[Repeat];
+                    LeftParenthesis;[(];
+                    IntegerLiteral;[10];
+                    Comma;[,];
+                    Whitespace;[ ];
+                CSharpTemplateBlock - [16..60)::44
+                    MarkupBlock - [16..60)::44
+                        MarkupTransition - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupTagBlock - [17..20)::3 - [<p>]
+                            MarkupTextLiteral - [17..20)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                        MarkupTextLiteral - [20..25)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                            Whitespace;[ ];
+                            Text;[#];
+                        CSharpCodeBlock - [25..56)::31
+                            CSharpImplicitExpression - [25..56)::31
+                                CSharpTransition - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [26..56)::30
+                                    CSharpCodeBlock - [26..56)::30
+                                        CSharpExpressionLiteral - [26..42)::16 - [Html.Repeat(10, ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                                            Identifier;[Html];
+                                            Dot;[.];
+                                            Identifier;[Repeat];
+                                            LeftParenthesis;[(];
+                                            IntegerLiteral;[10];
+                                            Comma;[,];
+                                            Whitespace;[ ];
+                                        CSharpTemplateBlock - [42..55)::13
+                                            MarkupBlock - [42..55)::13
+                                                MarkupTransition - [42..43)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                MarkupTagBlock - [43..46)::3 - [<p>]
+                                                    MarkupTextLiteral - [43..46)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                        OpenAngle;[<];
+                                                        Text;[p];
+                                                        CloseAngle;[>];
+                                                MarkupTextLiteral - [46..46)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Marker;[];
+                                                CSharpCodeBlock - [46..51)::5
+                                                    CSharpImplicitExpression - [46..51)::5
+                                                        CSharpTransition - [46..47)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                            Transition;[@];
+                                                        CSharpImplicitExpressionBody - [47..51)::4
+                                                            CSharpCodeBlock - [47..51)::4
+                                                                CSharpExpressionLiteral - [47..51)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                    Identifier;[item];
+                                                MarkupTagBlock - [51..55)::4 - [</p>]
+                                                    MarkupTextLiteral - [51..55)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                        OpenAngle;[<];
+                                                        ForwardSlash;[/];
+                                                        Text;[p];
+                                                        CloseAngle;[>];
+                                        CSharpExpressionLiteral - [55..56)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            RightParenthesis;[)];
+                        MarkupTagBlock - [56..60)::4 - [</p>]
+                            MarkupTextLiteral - [56..60)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                CSharpExpressionLiteral - [60..61)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.cspans.txt
index b79365030f..5d38ad1eb8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.cspans.txt
@@ -8,8 +8,8 @@ Transition span at (74:0,74 [1] ) (Accepts:None) - Parent: Markup block at (74:0
 Markup span at (75:0,75 [3] ) (Accepts:None) - Parent: Tag block at (75:0,75 [3] )
 Markup span at (78:0,78 [0] ) (Accepts:Any) - Parent: Markup block at (74:0,74 [13] )
 Transition span at (78:0,78 [1] ) (Accepts:None) - Parent: Expression block at (78:0,78 [5] )
-Code span at (79:0,79 [4] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (78:0,78 [5] )
+Code span at (79:0,79 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (78:0,78 [5] )
 Markup span at (83:0,83 [4] ) (Accepts:None) - Parent: Tag block at (83:0,83 [4] )
-Code span at (87:0,87 [1] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (57:0,57 [31] )
+Code span at (87:0,87 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (57:0,57 [31] )
 Markup span at (88:0,88 [4] ) (Accepts:None) - Parent: Tag block at (88:0,88 [4] )
 Code span at (92:0,92 [4] ) (Accepts:None) - Parent: Statement block at (0:0,0 [96] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.stree.txt
index 3f8af96acc..96f4194268 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.stree.txt
@@ -1,79 +1,87 @@
-Statement block - Gen<None> - 96 - (0:0,0)
-    Code span - Gen<Stmt> - [foreach(foo in Bar) { Html.ExecuteTemplate(foo, ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:18
-        CSharpTokenType.Keyword;[foreach];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[in];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Html];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[ExecuteTemplate];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-    Template block - Gen<Template> - 44 - (48:0,48)
-        Markup block - Gen<None> - 44 - (48:0,48)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (48:0,48) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Tag block - Gen<None> - 3 - (49:0,49)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (49:0,49) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (52:0,52) - Tokens:3
-                HtmlTokenType.Text;[Foo];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[#];
-            Expression block - Gen<Expr> - 31 - (57:0,57)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (57:0,57) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [Html.Repeat(10, ] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (58:0,58) - Tokens:7
-                    CSharpTokenType.Identifier;[Html];
-                    CSharpTokenType.Dot;[.];
-                    CSharpTokenType.Identifier;[Repeat];
-                    CSharpTokenType.LeftParenthesis;[(];
-                    CSharpTokenType.IntegerLiteral;[10];
-                    CSharpTokenType.Comma;[,];
-                    CSharpTokenType.WhiteSpace;[ ];
-                Template block - Gen<Template> - 13 - (74:0,74)
-                    Markup block - Gen<None> - 13 - (74:0,74)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (74:0,74) - Tokens:1
-                            HtmlTokenType.Transition;[@];
-                        Tag block - Gen<None> - 3 - (75:0,75)
-                            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (75:0,75) - Tokens:3
-                                HtmlTokenType.OpenAngle;[<];
-                                HtmlTokenType.Text;[p];
-                                HtmlTokenType.CloseAngle;[>];
-                        Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (78:0,78) - Tokens:1
-                            HtmlTokenType.Unknown;[];
-                        Expression block - Gen<Expr> - 5 - (78:0,78)
-                            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (78:0,78) - Tokens:1
-                                CSharpTokenType.Transition;[@];
-                            Code span - Gen<Expr> - [item] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (79:0,79) - Tokens:1
-                                CSharpTokenType.Identifier;[item];
-                        Tag block - Gen<None> - 4 - (83:0,83)
-                            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (83:0,83) - Tokens:4
-                                HtmlTokenType.OpenAngle;[<];
-                                HtmlTokenType.ForwardSlash;[/];
-                                HtmlTokenType.Text;[p];
-                                HtmlTokenType.CloseAngle;[>];
-                Code span - Gen<Expr> - [)] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (87:0,87) - Tokens:1
-                    CSharpTokenType.RightParenthesis;[)];
-            Tag block - Gen<None> - 4 - (88:0,88)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (88:0,88) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [); }] - SpanEditHandler;Accepts:None - (92:0,92) - Tokens:4
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..96)::96 - [foreach(foo in Bar) { Html.ExecuteTemplate(foo, @<p>Foo #@Html.Repeat(10, @<p>@item</p>)</p>); }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..48)::48 - [foreach(foo in Bar) { Html.ExecuteTemplate(foo, ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[foreach];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Keyword;[in];
+        Whitespace;[ ];
+        Identifier;[Bar];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+        Identifier;[Html];
+        Dot;[.];
+        Identifier;[ExecuteTemplate];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        Comma;[,];
+        Whitespace;[ ];
+    CSharpTemplateBlock - [48..92)::44
+        MarkupBlock - [48..92)::44
+            MarkupTransition - [48..49)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            MarkupTagBlock - [49..52)::3 - [<p>]
+                MarkupTextLiteral - [49..52)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [52..57)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Foo];
+                Whitespace;[ ];
+                Text;[#];
+            CSharpCodeBlock - [57..88)::31
+                CSharpImplicitExpression - [57..88)::31
+                    CSharpTransition - [57..58)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [58..88)::30
+                        CSharpCodeBlock - [58..88)::30
+                            CSharpExpressionLiteral - [58..74)::16 - [Html.Repeat(10, ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                                Identifier;[Html];
+                                Dot;[.];
+                                Identifier;[Repeat];
+                                LeftParenthesis;[(];
+                                IntegerLiteral;[10];
+                                Comma;[,];
+                                Whitespace;[ ];
+                            CSharpTemplateBlock - [74..87)::13
+                                MarkupBlock - [74..87)::13
+                                    MarkupTransition - [74..75)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    MarkupTagBlock - [75..78)::3 - [<p>]
+                                        MarkupTextLiteral - [75..78)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            Text;[p];
+                                            CloseAngle;[>];
+                                    MarkupTextLiteral - [78..78)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Marker;[];
+                                    CSharpCodeBlock - [78..83)::5
+                                        CSharpImplicitExpression - [78..83)::5
+                                            CSharpTransition - [78..79)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [79..83)::4
+                                                CSharpCodeBlock - [79..83)::4
+                                                    CSharpExpressionLiteral - [79..83)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                        Identifier;[item];
+                                    MarkupTagBlock - [83..87)::4 - [</p>]
+                                        MarkupTextLiteral - [83..87)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            ForwardSlash;[/];
+                                            Text;[p];
+                                            CloseAngle;[>];
+                            CSharpExpressionLiteral - [87..88)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                RightParenthesis;[)];
+            MarkupTagBlock - [88..92)::4 - [</p>]
+                MarkupTextLiteral - [88..92)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+    CSharpStatementLiteral - [92..96)::4 - [); }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        RightParenthesis;[)];
+        Semicolon;[;];
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.cspans.txt
index 767361f19d..2f52dc4d7f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.cspans.txt
@@ -9,9 +9,9 @@ Transition span at (69:0,69 [1] ) (Accepts:None) - Parent: Markup block at (69:0
 Markup span at (70:0,70 [3] ) (Accepts:None) - Parent: Tag block at (70:0,70 [3] )
 Markup span at (73:0,73 [0] ) (Accepts:Any) - Parent: Markup block at (69:0,69 [13] )
 Transition span at (73:0,73 [1] ) (Accepts:None) - Parent: Expression block at (73:0,73 [5] )
-Code span at (74:0,74 [4] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (73:0,73 [5] )
+Code span at (74:0,74 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (73:0,73 [5] )
 Markup span at (78:0,78 [4] ) (Accepts:None) - Parent: Tag block at (78:0,78 [4] )
-Code span at (82:0,82 [1] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (52:0,52 [31] )
+Code span at (82:0,82 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (52:0,52 [31] )
 Markup span at (83:0,83 [4] ) (Accepts:None) - Parent: Tag block at (83:0,83 [4] )
 Code span at (87:0,87 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [91] )
 MetaCode span at (90:0,90 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [91] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.stree.txt
index c29f692a2a..c794cc5712 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.stree.txt
@@ -1,81 +1,92 @@
-Statement block - Gen<None> - 91 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ var foo = bar; Html.ExecuteTemplate(foo, ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:17
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Html];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[ExecuteTemplate];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-    Template block - Gen<Template> - 44 - (43:0,43)
-        Markup block - Gen<None> - 44 - (43:0,43)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (43:0,43) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Tag block - Gen<None> - 3 - (44:0,44)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (44:0,44) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:3
-                HtmlTokenType.Text;[Foo];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[#];
-            Expression block - Gen<Expr> - 31 - (52:0,52)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (52:0,52) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [Html.Repeat(10, ] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (53:0,53) - Tokens:7
-                    CSharpTokenType.Identifier;[Html];
-                    CSharpTokenType.Dot;[.];
-                    CSharpTokenType.Identifier;[Repeat];
-                    CSharpTokenType.LeftParenthesis;[(];
-                    CSharpTokenType.IntegerLiteral;[10];
-                    CSharpTokenType.Comma;[,];
-                    CSharpTokenType.WhiteSpace;[ ];
-                Template block - Gen<Template> - 13 - (69:0,69)
-                    Markup block - Gen<None> - 13 - (69:0,69)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (69:0,69) - Tokens:1
-                            HtmlTokenType.Transition;[@];
-                        Tag block - Gen<None> - 3 - (70:0,70)
-                            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (70:0,70) - Tokens:3
-                                HtmlTokenType.OpenAngle;[<];
-                                HtmlTokenType.Text;[p];
-                                HtmlTokenType.CloseAngle;[>];
-                        Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (73:0,73) - Tokens:1
-                            HtmlTokenType.Unknown;[];
-                        Expression block - Gen<Expr> - 5 - (73:0,73)
-                            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (73:0,73) - Tokens:1
-                                CSharpTokenType.Transition;[@];
-                            Code span - Gen<Expr> - [item] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (74:0,74) - Tokens:1
-                                CSharpTokenType.Identifier;[item];
-                        Tag block - Gen<None> - 4 - (78:0,78)
-                            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (78:0,78) - Tokens:4
-                                HtmlTokenType.OpenAngle;[<];
-                                HtmlTokenType.ForwardSlash;[/];
-                                HtmlTokenType.Text;[p];
-                                HtmlTokenType.CloseAngle;[>];
-                Code span - Gen<Expr> - [)] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (82:0,82) - Tokens:1
-                    CSharpTokenType.RightParenthesis;[)];
-            Tag block - Gen<None> - 4 - (83:0,83)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (83:0,83) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [); ] - SpanEditHandler;Accepts:Any - (87:0,87) - Tokens:3
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (90:0,90) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..91)::91 - [{ var foo = bar; Html.ExecuteTemplate(foo, @<p>Foo #@Html.Repeat(10, @<p>@item</p>)</p>); }]
+    CSharpStatement - [0..91)::91
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..91)::91
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..90)::89
+                CSharpStatementLiteral - [1..43)::42 - [ var foo = bar; Html.ExecuteTemplate(foo, ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    Identifier;[Html];
+                    Dot;[.];
+                    Identifier;[ExecuteTemplate];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    Comma;[,];
+                    Whitespace;[ ];
+                CSharpTemplateBlock - [43..87)::44
+                    MarkupBlock - [43..87)::44
+                        MarkupTransition - [43..44)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupTagBlock - [44..47)::3 - [<p>]
+                            MarkupTextLiteral - [44..47)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                        MarkupTextLiteral - [47..52)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                            Whitespace;[ ];
+                            Text;[#];
+                        CSharpCodeBlock - [52..83)::31
+                            CSharpImplicitExpression - [52..83)::31
+                                CSharpTransition - [52..53)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [53..83)::30
+                                    CSharpCodeBlock - [53..83)::30
+                                        CSharpExpressionLiteral - [53..69)::16 - [Html.Repeat(10, ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                                            Identifier;[Html];
+                                            Dot;[.];
+                                            Identifier;[Repeat];
+                                            LeftParenthesis;[(];
+                                            IntegerLiteral;[10];
+                                            Comma;[,];
+                                            Whitespace;[ ];
+                                        CSharpTemplateBlock - [69..82)::13
+                                            MarkupBlock - [69..82)::13
+                                                MarkupTransition - [69..70)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                    Transition;[@];
+                                                MarkupTagBlock - [70..73)::3 - [<p>]
+                                                    MarkupTextLiteral - [70..73)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                        OpenAngle;[<];
+                                                        Text;[p];
+                                                        CloseAngle;[>];
+                                                MarkupTextLiteral - [73..73)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Marker;[];
+                                                CSharpCodeBlock - [73..78)::5
+                                                    CSharpImplicitExpression - [73..78)::5
+                                                        CSharpTransition - [73..74)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                            Transition;[@];
+                                                        CSharpImplicitExpressionBody - [74..78)::4
+                                                            CSharpCodeBlock - [74..78)::4
+                                                                CSharpExpressionLiteral - [74..78)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                    Identifier;[item];
+                                                MarkupTagBlock - [78..82)::4 - [</p>]
+                                                    MarkupTextLiteral - [78..82)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                                        OpenAngle;[<];
+                                                        ForwardSlash;[/];
+                                                        Text;[p];
+                                                        CloseAngle;[>];
+                                        CSharpExpressionLiteral - [82..83)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            RightParenthesis;[)];
+                        MarkupTagBlock - [83..87)::4 - [</p>]
+                            MarkupTextLiteral - [83..87)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                CSharpStatementLiteral - [87..90)::3 - [); ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+            RazorMetaCode - [90..91)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.cspans.txt
index c8ba7ca3be..cd859a63c2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.cspans.txt
@@ -9,7 +9,7 @@ Markup span at (54:0,54 [1] ) (Accepts:Any) - Parent: Markup block at (46:0,46 [
 Markup span at (55:0,55 [1] ) (Accepts:None) - Parent: Tag block at (44:0,44 [12] )
 Markup span at (56:0,56 [5] ) (Accepts:Any) - Parent: Markup block at (43:0,43 [27] )
 Transition span at (61:0,61 [1] ) (Accepts:None) - Parent: Expression block at (61:0,61 [5] )
-Code span at (62:0,62 [4] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (61:0,61 [5] )
+Code span at (62:0,62 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (61:0,61 [5] )
 Markup span at (66:0,66 [4] ) (Accepts:None) - Parent: Tag block at (66:0,66 [4] )
 Code span at (70:0,70 [3] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [74] )
 MetaCode span at (73:0,73 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [74] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.stree.txt
index f80249f0fa..5959baab4f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.stree.txt
@@ -1,65 +1,76 @@
-Statement block - Gen<None> - 74 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ var foo = bar; Html.ExecuteTemplate(foo, ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:17
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Html];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[ExecuteTemplate];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-    Template block - Gen<Template> - 27 - (43:0,43)
-        Markup block - Gen<None> - 27 - (43:0,43)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (43:0,43) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Tag block - Gen<None> - 12 - (44:0,44)
-                Markup span - Gen<Markup> - [<p] - SpanEditHandler;Accepts:Any - (44:0,44) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                Markup block - Gen<Attr:foo, foo='@(46:0,46),'@(54:0,54)> - 9 - (46:0,46)
-                    Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[foo];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.SingleQuote;['];
-                    Markup block - Gen<None> - 2 - (52:0,52)
-                        Markup span - Gen<LitAttr:@(52:0,52)> - [@] - SpanEditHandler;Accepts:None - (52:0,52) - Tokens:1
-                            HtmlTokenType.Transition;[@];
-                        Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (53:0,53) - Tokens:1
-                            HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (54:0,54) - Tokens:1
-                        HtmlTokenType.SingleQuote;['];
-                Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (55:0,55) - Tokens:1
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (56:0,56) - Tokens:3
-                HtmlTokenType.Text;[Foo];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[#];
-            Expression block - Gen<Expr> - 5 - (61:0,61)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (61:0,61) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [item] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (62:0,62) - Tokens:1
-                    CSharpTokenType.Identifier;[item];
-            Tag block - Gen<None> - 4 - (66:0,66)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (66:0,66) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [); ] - SpanEditHandler;Accepts:Any - (70:0,70) - Tokens:3
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (73:0,73) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..74)::74 - [{ var foo = bar; Html.ExecuteTemplate(foo, @<p foo='@@'>Foo #@item</p>); }]
+    CSharpStatement - [0..74)::74
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..74)::74
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..73)::72
+                CSharpStatementLiteral - [1..43)::42 - [ var foo = bar; Html.ExecuteTemplate(foo, ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    Identifier;[Html];
+                    Dot;[.];
+                    Identifier;[ExecuteTemplate];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    Comma;[,];
+                    Whitespace;[ ];
+                CSharpTemplateBlock - [43..70)::27
+                    MarkupBlock - [43..70)::27
+                        MarkupTransition - [43..44)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupTagBlock - [44..56)::12 - [<p foo='@@'>]
+                            MarkupTextLiteral - [44..46)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                OpenAngle;[<];
+                                Text;[p];
+                            MarkupAttributeBlock - [46..55)::9 - [ foo='@@']
+                                MarkupTextLiteral - [46..47)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                MarkupTextLiteral - [47..50)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[foo];
+                                Equals;[=];
+                                MarkupTextLiteral - [51..52)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                    SingleQuote;['];
+                                GenericBlock - [52..54)::2
+                                    MarkupBlock - [52..54)::2
+                                        MarkupTextLiteral - [52..53)::1 - [@] - Gen<LitAttr:@(52:0,52)> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        MarkupEphemeralTextLiteral - [53..54)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                MarkupTextLiteral - [54..55)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                    SingleQuote;['];
+                            MarkupTextLiteral - [55..56)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                CloseAngle;[>];
+                        MarkupTextLiteral - [56..61)::5 - [Foo #] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                            Whitespace;[ ];
+                            Text;[#];
+                        CSharpCodeBlock - [61..66)::5
+                            CSharpImplicitExpression - [61..66)::5
+                                CSharpTransition - [61..62)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [62..66)::4
+                                    CSharpCodeBlock - [62..66)::4
+                                        CSharpExpressionLiteral - [62..66)::4 - [item] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[item];
+                        MarkupTagBlock - [66..70)::4 - [</p>]
+                            MarkupTextLiteral - [66..70)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                CSharpStatementLiteral - [70..73)::3 - [); ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+            RazorMetaCode - [73..74)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBraces.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBraces.stree.txt
index c8425c5971..5fb2f311b6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBraces.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBraces.stree.txt
@@ -1,81 +1,83 @@
-Statement block - Gen<None> - 70 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) {] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:6
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 12 - (9:0,9)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 3 - (10:0,10)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Bar] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-            HtmlTokenType.Text;[Bar];
-        Tag block - Gen<None> - 4 - (16:0,16)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Code span - Gen<Stmt> - [} else if(bar) {] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:10
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 12 - (37:0,37)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (37:0,37) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 3 - (38:0,38)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Baz] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:1
-            HtmlTokenType.Text;[Baz];
-        Tag block - Gen<None> - 4 - (44:0,44)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (44:0,44) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (48:0,48) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Code span - Gen<Stmt> - [} else {] - SpanEditHandler;Accepts:Any - (49:0,49) - Tokens:5
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 12 - (57:0,57)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (57:0,57) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 3 - (58:0,58)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (58:0,58) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Boz] - SpanEditHandler;Accepts:Any - (61:0,61) - Tokens:1
-            HtmlTokenType.Text;[Boz];
-        Tag block - Gen<None> - 4 - (64:0,64)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (64:0,64) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (68:0,68) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:None - (69:0,69) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..70)::70 - [if(foo) { <p>Bar</p> } else if(bar) { <p>Baz</p> } else { <p>Boz</p> }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..9)::9 - [if(foo) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+    MarkupBlock - [9..21)::12
+        MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagBlock - [10..13)::3 - [<p>]
+            MarkupTextLiteral - [10..13)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [13..16)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Bar];
+        MarkupTagBlock - [16..20)::4 - [</p>]
+            MarkupTextLiteral - [16..20)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+    CSharpStatementLiteral - [21..37)::16 - [} else if(bar) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[bar];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+    MarkupBlock - [37..49)::12
+        MarkupTextLiteral - [37..38)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagBlock - [38..41)::3 - [<p>]
+            MarkupTextLiteral - [38..41)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [41..44)::3 - [Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Baz];
+        MarkupTagBlock - [44..48)::4 - [</p>]
+            MarkupTextLiteral - [44..48)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [48..49)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+    CSharpStatementLiteral - [49..57)::8 - [} else {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        RightBrace;[}];
+        Whitespace;[ ];
+        Keyword;[else];
+        Whitespace;[ ];
+        LeftBrace;[{];
+    MarkupBlock - [57..69)::12
+        MarkupTextLiteral - [57..58)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagBlock - [58..61)::3 - [<p>]
+            MarkupTextLiteral - [58..61)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [61..64)::3 - [Boz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Boz];
+        MarkupTagBlock - [64..68)::4 - [</p>]
+            MarkupTextLiteral - [64..68)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [68..69)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+    CSharpStatementLiteral - [69..70)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBracesWithinCodeBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBracesWithinCodeBlock.stree.txt
index 0312d63acc..b9b0a9174f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBracesWithinCodeBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBracesWithinCodeBlock.stree.txt
@@ -1,87 +1,92 @@
-Statement block - Gen<None> - 74 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ if(foo) {] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:7
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 12 - (11:0,11)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 3 - (12:0,12)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Bar] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-            HtmlTokenType.Text;[Bar];
-        Tag block - Gen<None> - 4 - (18:0,18)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Code span - Gen<Stmt> - [} else if(bar) {] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:10
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[bar];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 12 - (39:0,39)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 3 - (40:0,40)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Baz] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:1
-            HtmlTokenType.Text;[Baz];
-        Tag block - Gen<None> - 4 - (46:0,46)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (46:0,46) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (50:0,50) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Code span - Gen<Stmt> - [} else {] - SpanEditHandler;Accepts:Any - (51:0,51) - Tokens:5
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[else];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 12 - (59:0,59)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (59:0,59) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 3 - (60:0,60)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (60:0,60) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Boz] - SpanEditHandler;Accepts:Any - (63:0,63) - Tokens:1
-            HtmlTokenType.Text;[Boz];
-        Tag block - Gen<None> - 4 - (66:0,66)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (66:0,66) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (70:0,70) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Code span - Gen<Stmt> - [} ] - SpanEditHandler;Accepts:Any - (71:0,71) - Tokens:2
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (73:0,73) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..74)::74 - [{ if(foo) { <p>Bar</p> } else if(bar) { <p>Baz</p> } else { <p>Boz</p> } }]
+    CSharpStatement - [0..74)::74
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..74)::74
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..73)::72
+                CSharpStatementLiteral - [1..11)::10 - [ if(foo) {] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Whitespace;[ ];
+                    Keyword;[if];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                MarkupBlock - [11..23)::12
+                    MarkupTextLiteral - [11..12)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTagBlock - [12..15)::3 - [<p>]
+                        MarkupTextLiteral - [12..15)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [15..18)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+                    MarkupTagBlock - [18..22)::4 - [</p>]
+                        MarkupTextLiteral - [18..22)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Whitespace;[ ];
+                CSharpStatementLiteral - [23..39)::16 - [} else if(bar) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    RightBrace;[}];
+                    Whitespace;[ ];
+                    Keyword;[else];
+                    Whitespace;[ ];
+                    Keyword;[if];
+                    LeftParenthesis;[(];
+                    Identifier;[bar];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                MarkupBlock - [39..51)::12
+                    MarkupTextLiteral - [39..40)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTagBlock - [40..43)::3 - [<p>]
+                        MarkupTextLiteral - [40..43)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [43..46)::3 - [Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Baz];
+                    MarkupTagBlock - [46..50)::4 - [</p>]
+                        MarkupTextLiteral - [46..50)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [50..51)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Whitespace;[ ];
+                CSharpStatementLiteral - [51..59)::8 - [} else {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    RightBrace;[}];
+                    Whitespace;[ ];
+                    Keyword;[else];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                MarkupBlock - [59..71)::12
+                    MarkupTextLiteral - [59..60)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTagBlock - [60..63)::3 - [<p>]
+                        MarkupTextLiteral - [60..63)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [63..66)::3 - [Boz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Boz];
+                    MarkupTagBlock - [66..70)::4 - [</p>]
+                        MarkupTextLiteral - [66..70)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [70..71)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Whitespace;[ ];
+                CSharpStatementLiteral - [71..73)::2 - [} ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    RightBrace;[}];
+                    Whitespace;[ ];
+            RazorMetaCode - [73..74)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTag.stree.txt
index 9c74783792..63d05c98c4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTag.stree.txt
@@ -1,31 +1,33 @@
-Statement block - Gen<None> - 29 - (0:0,0)
-    Code span - Gen<Stmt> - [if (i > 0) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:12
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.GreaterThan;[>];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-    Markup block - Gen<None> - 14 - (13:0,13)
-        Tag block - Gen<None> - 6 - (13:0,13)
-            Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[text];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [;] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:1
-            HtmlTokenType.Text;[;];
-        Tag block - Gen<None> - 7 - (20:0,20)
-            Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[text];
-                HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [ }] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:2
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..29)::29 - [if (i > 0) { <text>;</text> }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..13)::13 - [if (i > 0) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        Whitespace;[ ];
+        LeftParenthesis;[(];
+        Identifier;[i];
+        Whitespace;[ ];
+        GreaterThan;[>];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        Whitespace;[ ];
+    MarkupBlock - [13..27)::14
+        MarkupTagBlock - [13..19)::6 - [<text>]
+            MarkupTransition - [13..19)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[text];
+                CloseAngle;[>];
+        MarkupTextLiteral - [19..20)::1 - [;] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Text;[;];
+        MarkupTagBlock - [20..27)::7 - [</text>]
+            MarkupTransition - [20..27)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[text];
+                CloseAngle;[>];
+    CSharpStatementLiteral - [27..29)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock.stree.txt
index e0d8037f59..db9961a488 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock.stree.txt
@@ -1,37 +1,42 @@
-Statement block - Gen<None> - 33 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ if (i > 0) { ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:13
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.GreaterThan;[>];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.WhiteSpace;[ ];
-    Markup block - Gen<None> - 14 - (15:0,15)
-        Tag block - Gen<None> - 6 - (15:0,15)
-            Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[text];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [;] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-            HtmlTokenType.Text;[;];
-        Tag block - Gen<None> - 7 - (22:0,22)
-            Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[text];
-                HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [ } ] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:3
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..33)::33 - [{ if (i > 0) { <text>;</text> } }]
+    CSharpStatement - [0..33)::33
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..33)::33
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..32)::31
+                CSharpStatementLiteral - [1..15)::14 - [ if (i > 0) { ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Whitespace;[ ];
+                    Keyword;[if];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    Identifier;[i];
+                    Whitespace;[ ];
+                    GreaterThan;[>];
+                    Whitespace;[ ];
+                    IntegerLiteral;[0];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                MarkupBlock - [15..29)::14
+                    MarkupTagBlock - [15..21)::6 - [<text>]
+                        MarkupTransition - [15..21)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[text];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [21..22)::1 - [;] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Text;[;];
+                    MarkupTagBlock - [22..29)::7 - [</text>]
+                        MarkupTransition - [22..29)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[text];
+                            CloseAngle;[>];
+                CSharpStatementLiteral - [29..32)::3 - [ } ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Whitespace;[ ];
+            RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline.cspans.txt
index 7b5c959e48..aa7044c6d1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline.cspans.txt
@@ -2,9 +2,9 @@ Code span at (0:0,0 [80] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [16
 Markup span at (80:2,0 [4] ) (Accepts:Any) - Parent: Markup block at (80:2,0 [46] )
 Markup span at (84:2,4 [3] ) (Accepts:None) - Parent: Tag block at (84:2,4 [3] )
 Markup span at (87:2,7 [15] ) (Accepts:Any) - Parent: Markup block at (80:2,0 [46] )
-Code span at (102:4,0 [8] ) (Accepts:Any) - Parent: Expression block at (102:4,0 [12] )
-Transition span at (110:4,8 [1] ) (Accepts:None) - Parent: Expression block at (102:4,0 [12] )
-Code span at (111:4,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (102:4,0 [12] )
+Code span at (102:4,0 [8] ) (Accepts:Any) - Parent: Statement block at (102:4,0 [12] )
+Transition span at (110:4,8 [1] ) (Accepts:None) - Parent: Expression block at (110:4,8 [4] )
+Code span at (111:4,9 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (110:4,8 [4] )
 Markup span at (114:4,12 [6] ) (Accepts:Any) - Parent: Markup block at (80:2,0 [46] )
 Markup span at (120:5,4 [4] ) (Accepts:None) - Parent: Tag block at (120:5,4 [4] )
 Markup span at (124:5,8 [2] ) (Accepts:None) - Parent: Markup block at (80:2,0 [46] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline.stree.txt
index 5acbe843c7..2579466a4a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline.stree.txt
@@ -1,74 +1,79 @@
-Statement block - Gen<None> - 161 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) {LF    var foo = "After this statement there are 10 spaces";          LF] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:18
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.StringLiteral;["After this statement there are 10 spaces"];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[          ];
-        CSharpTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 46 - (80:2,0)
-        Markup span - Gen<Markup> - [    ] - SpanEditHandler;Accepts:Any - (80:2,0) - Tokens:1
-            HtmlTokenType.WhiteSpace;[    ];
-        Tag block - Gen<None> - 3 - (84:2,4)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (84:2,4) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF        FooLF] - SpanEditHandler;Accepts:Any - (87:2,7) - Tokens:4
-            HtmlTokenType.NewLine;[LF];
-            HtmlTokenType.WhiteSpace;[        ];
-            HtmlTokenType.Text;[Foo];
-            HtmlTokenType.NewLine;[LF];
-        Expression block - Gen<Expr> - 12 - (102:4,0)
-            Code span - Gen<Stmt> - [        ] - SpanEditHandler;Accepts:Any - (102:4,0) - Tokens:1
-                CSharpTokenType.WhiteSpace;[        ];
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (110:4,8) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Expr> - [bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (111:4,9) - Tokens:1
-                CSharpTokenType.Identifier;[bar];
-        Markup span - Gen<Markup> - [LF    ] - SpanEditHandler;Accepts:Any - (114:4,12) - Tokens:2
-            HtmlTokenType.NewLine;[LF];
-            HtmlTokenType.WhiteSpace;[    ];
-        Tag block - Gen<None> - 4 - (120:5,4)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (120:5,4) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (124:5,8) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 14 - (126:6,0)
-        Markup span - Gen<Markup> - [    ] - SpanEditHandler;Accepts:Any - (126:6,0) - Tokens:1
-            HtmlTokenType.WhiteSpace;[    ];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (130:6,4) - Tokens:1
-            HtmlTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (131:6,5) - Tokens:1
-            HtmlTokenType.Colon;[:];
-        Markup span - Gen<Markup> - [Hello!LF] - SpanEditHandler;Accepts:None - (132:6,6) - Tokens:3
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.Bang;[!];
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [    var biz = boz;LF}] - SpanEditHandler;Accepts:Any - (140:7,0) - Tokens:11
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[biz];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[boz];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..161)::161 - [if(foo) {LF    var foo = "After this statement there are 10 spaces";          LF    <p>LF        FooLF        @barLF    </p>LF    @:Hello!LF    var biz = boz;LF}]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..80)::80 - [if(foo) {LF    var foo = "After this statement there are 10 spaces";          LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[foo];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        StringLiteral;["After this statement there are 10 spaces"];
+        Semicolon;[;];
+        Whitespace;[          ];
+        NewLine;[LF];
+    MarkupBlock - [80..126)::46
+        MarkupTextLiteral - [80..84)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[    ];
+        MarkupTagBlock - [84..87)::3 - [<p>]
+            MarkupTextLiteral - [84..87)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [87..102)::15 - [LF        FooLF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+            Whitespace;[        ];
+            Text;[Foo];
+            NewLine;[LF];
+        CSharpCodeBlock - [102..114)::12
+            CSharpStatementLiteral - [102..110)::8 - [        ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[        ];
+            CSharpImplicitExpression - [110..114)::4
+                CSharpTransition - [110..111)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [111..114)::3
+                    CSharpCodeBlock - [111..114)::3
+                        CSharpExpressionLiteral - [111..114)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[bar];
+        MarkupTextLiteral - [114..120)::6 - [LF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+            Whitespace;[    ];
+        MarkupTagBlock - [120..124)::4 - [</p>]
+            MarkupTextLiteral - [120..124)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [124..126)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+            NewLine;[LF];
+    MarkupBlock - [126..140)::14
+        MarkupTextLiteral - [126..130)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[    ];
+        MarkupTransition - [130..131)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        RazorMetaCode - [131..132)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+            Colon;[:];
+        MarkupTextLiteral - [132..140)::8 - [Hello!LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Text;[Hello];
+            Bang;[!];
+            NewLine;[LF];
+    CSharpStatementLiteral - [140..161)::21 - [    var biz = boz;LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[    ];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[biz];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        Identifier;[boz];
+        Semicolon;[;];
+        NewLine;[LF];
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.cspans.txt
index d3feff923d..62b8bb799f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.cspans.txt
@@ -2,4 +2,4 @@ Code span at (0:0,0 [10] ) (Accepts:Any) - Parent: Expression block at (0:0,0 [2
 Transition span at (10:1,0 [1] ) (Accepts:None) - Parent: Markup block at (10:1,0 [18] )
 MetaCode span at (11:1,1 [1] ) (Accepts:Any) - Parent: Markup block at (10:1,0 [18] )
 Markup span at (12:1,2 [16] ) (Accepts:None) - Parent: Markup block at (10:1,0 [18] )
-Code span at (28:2,0 [1] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [29] )
+Code span at (28:2,0 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [29] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.stree.txt
index e4089e2453..e336a480f8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.stree.txt
@@ -1,25 +1,30 @@
-Expression block - Gen<Expr> - 29 - (0:0,0)
-    Code span - Gen<Expr> - [Foo(    LF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Tokens:4
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.NewLine;[LF];
-    Template block - Gen<Template> - 18 - (10:1,0)
-        Markup block - Gen<None> - 18 - (10:1,0)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:1,0) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (11:1,1) - Tokens:1
-                HtmlTokenType.Colon;[:];
-            Markup span - Gen<Markup> - [<p>Foo</p>    LF] - SpanEditHandler;Accepts:None - (12:1,2) - Tokens:10
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-                HtmlTokenType.Text;[Foo];
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-                HtmlTokenType.WhiteSpace;[    ];
-                HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Expr> - [)] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (28:2,0) - Tokens:1
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..29)::29 - [Foo(    LF@:<p>Foo</p>    LF)]
+    CSharpImplicitExpression - [0..29)::29
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpImplicitExpressionBody - [0..29)::29
+            CSharpCodeBlock - [0..29)::29
+                CSharpExpressionLiteral - [0..10)::10 - [Foo(    LF] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Identifier;[Foo];
+                    LeftParenthesis;[(];
+                    Whitespace;[    ];
+                    NewLine;[LF];
+                CSharpTemplateBlock - [10..28)::18
+                    MarkupBlock - [10..28)::18
+                        MarkupTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                            Colon;[:];
+                        MarkupTextLiteral - [12..28)::16 - [<p>Foo</p>    LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                            Text;[Foo];
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                            Whitespace;[    ];
+                            NewLine;[LF];
+                CSharpExpressionLiteral - [28..29)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTransitionInDesignTimeMode.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTransitionInDesignTimeMode.stree.txt
index b0a8ad67dc..c3f77cd91d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTransitionInDesignTimeMode.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTransitionInDesignTimeMode.stree.txt
@@ -1,26 +1,31 @@
-Statement block - Gen<None> - 26 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [LF    ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:2
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-    Markup block - Gen<None> - 18 - (7:1,4)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (7:1,4) - Tokens:1
-            HtmlTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (8:1,5) - Tokens:1
-            HtmlTokenType.Colon;[:];
-        Markup span - Gen<Markup> - [<p>Foo</p>    LF] - SpanEditHandler;Accepts:None - (9:1,6) - Tokens:10
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-            HtmlTokenType.Text;[Foo];
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-            HtmlTokenType.WhiteSpace;[    ];
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (25:2,0) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (25:2,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..26)::26 - [{LF    @:<p>Foo</p>    LF}]
+    CSharpStatement - [0..26)::26
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..26)::26
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..25)::24
+                CSharpStatementLiteral - [1..7)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    NewLine;[LF];
+                    Whitespace;[    ];
+                MarkupBlock - [7..25)::18
+                    MarkupTransition - [7..8)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    RazorMetaCode - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                        Colon;[:];
+                    MarkupTextLiteral - [9..25)::16 - [<p>Foo</p>    LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                        Text;[Foo];
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                        Whitespace;[    ];
+                        NewLine;[LF];
+                CSharpStatementLiteral - [25..25)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Marker;[];
+            RazorMetaCode - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.cspans.txt
index 1caae0cf04..57217b68fd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.cspans.txt
@@ -3,4 +3,4 @@ Transition span at (8:0,8 [1] ) (Accepts:None) - Parent: Markup block at (8:0,8
 Markup span at (9:0,9 [3] ) (Accepts:None) - Parent: Tag block at (9:0,9 [3] )
 Markup span at (12:0,12 [3] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [11] )
 Markup span at (15:0,15 [4] ) (Accepts:None) - Parent: Tag block at (15:0,15 [4] )
-Code span at (19:0,19 [5] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [24] )
+Code span at (19:0,19 [5] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [24] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.stree.txt
index c054ae94ad..654f6fa14e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.stree.txt
@@ -1,25 +1,30 @@
-Expression block - Gen<Expr> - 24 - (0:0,0)
-    Code span - Gen<Expr> - [Foo(    ] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Tokens:3
-        CSharpTokenType.Identifier;[Foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.WhiteSpace;[    ];
-    Template block - Gen<Template> - 11 - (8:0,8)
-        Markup block - Gen<None> - 11 - (8:0,8)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Tag block - Gen<None> - 3 - (9:0,9)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Tag block - Gen<None> - 4 - (15:0,15)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Expr> - [    )] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (19:0,19) - Tokens:2
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..24)::24 - [Foo(    @<p>Foo</p>    )]
+    CSharpImplicitExpression - [0..24)::24
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpImplicitExpressionBody - [0..24)::24
+            CSharpCodeBlock - [0..24)::24
+                CSharpExpressionLiteral - [0..8)::8 - [Foo(    ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Identifier;[Foo];
+                    LeftParenthesis;[(];
+                    Whitespace;[    ];
+                CSharpTemplateBlock - [8..19)::11
+                    MarkupBlock - [8..19)::11
+                        MarkupTransition - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupTagBlock - [9..12)::3 - [<p>]
+                            MarkupTextLiteral - [9..12)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                        MarkupTextLiteral - [12..15)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                        MarkupTagBlock - [15..19)::4 - [</p>]
+                            MarkupTextLiteral - [15..19)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                CSharpExpressionLiteral - [19..24)::5 - [    )] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    Whitespace;[    ];
+                    RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.stree.txt
index 651c3dc641..105ba18f27 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.stree.txt
@@ -1,27 +1,32 @@
-Statement block - Gen<None> - 25 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [LF    ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:2
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-    Markup block - Gen<None> - 11 - (7:1,4)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (7:1,4) - Tokens:1
-            HtmlTokenType.Transition;[@];
-        Tag block - Gen<None> - 3 - (8:1,5)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (8:1,5) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (11:1,8) - Tokens:1
-            HtmlTokenType.Text;[Foo];
-        Tag block - Gen<None> - 4 - (14:1,11)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (14:1,11) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [    LF] - SpanEditHandler;Accepts:Any - (18:1,15) - Tokens:2
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.NewLine;[LF];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (24:2,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..25)::25 - [{LF    @<p>Foo</p>    LF}]
+    CSharpStatement - [0..25)::25
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..25)::25
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..24)::23
+                CSharpStatementLiteral - [1..7)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    NewLine;[LF];
+                    Whitespace;[    ];
+                MarkupBlock - [7..18)::11
+                    MarkupTransition - [7..8)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    MarkupTagBlock - [8..11)::3 - [<p>]
+                        MarkupTextLiteral - [8..11)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [11..14)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+                    MarkupTagBlock - [14..18)::4 - [</p>]
+                        MarkupTextLiteral - [14..18)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                CSharpStatementLiteral - [18..24)::6 - [    LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Whitespace;[    ];
+                    NewLine;[LF];
+            RazorMetaCode - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnTagTransitionInDesignTimeMode.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnTagTransitionInDesignTimeMode.stree.txt
index b6bbdab945..8396f9205a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnTagTransitionInDesignTimeMode.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnTagTransitionInDesignTimeMode.stree.txt
@@ -1,25 +1,30 @@
-Statement block - Gen<None> - 24 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [LF    ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:2
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-    Markup block - Gen<None> - 10 - (7:1,4)
-        Tag block - Gen<None> - 3 - (7:1,4)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (7:1,4) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (10:1,7) - Tokens:1
-            HtmlTokenType.Text;[Foo];
-        Tag block - Gen<None> - 4 - (13:1,10)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (13:1,10) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [    LF] - SpanEditHandler;Accepts:Any - (17:1,14) - Tokens:2
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.NewLine;[LF];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (23:2,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..24)::24 - [{LF    <p>Foo</p>    LF}]
+    CSharpStatement - [0..24)::24
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..24)::24
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..23)::22
+                CSharpStatementLiteral - [1..7)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    NewLine;[LF];
+                    Whitespace;[    ];
+                MarkupBlock - [7..17)::10
+                    MarkupTagBlock - [7..10)::3 - [<p>]
+                        MarkupTextLiteral - [7..10)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [10..13)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+                    MarkupTagBlock - [13..17)::4 - [</p>]
+                        MarkupTextLiteral - [13..17)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                CSharpStatementLiteral - [17..23)::6 - [    LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Whitespace;[    ];
+                    NewLine;[LF];
+            RazorMetaCode - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracket.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracket.stree.txt
index 211e2c699f..8c41ae9d7a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracket.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracket.stree.txt
@@ -1,45 +1,47 @@
-Statement block - Gen<None> - 42 - (0:0,0)
-    Code span - Gen<Stmt> - [for(int i = 0; i < 10; i++) {] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:23
-        CSharpTokenType.Keyword;[for];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.Increment;[++];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 12 - (29:0,29)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 3 - (30:0,30)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (30:0,30) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1
-            HtmlTokenType.Text;[Foo];
-        Tag block - Gen<None> - 4 - (36:0,36)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:None - (41:0,41) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..42)::42 - [for(int i = 0; i < 10; i++) { <p>Foo</p> }]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..29)::29 - [for(int i = 0; i < 10; i++) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[for];
+        LeftParenthesis;[(];
+        Keyword;[int];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        Assign;[=];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Whitespace;[ ];
+        LessThan;[<];
+        Whitespace;[ ];
+        IntegerLiteral;[10];
+        Semicolon;[;];
+        Whitespace;[ ];
+        Identifier;[i];
+        Increment;[++];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+    MarkupBlock - [29..41)::12
+        MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagBlock - [30..33)::3 - [<p>]
+            MarkupTextLiteral - [30..33)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [33..36)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+        MarkupTagBlock - [36..40)::4 - [</p>]
+            MarkupTextLiteral - [36..40)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+    CSharpStatementLiteral - [41..42)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracketInCodeBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracketInCodeBlock.stree.txt
index b9833bf22e..8eb1bd1e66 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracketInCodeBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracketInCodeBlock.stree.txt
@@ -1,51 +1,56 @@
-Statement block - Gen<None> - 46 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ for(int i = 0; i < 10; i++) {] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:24
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[for];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[int];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Assign;[=];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[i];
-        CSharpTokenType.Increment;[++];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 12 - (31:0,31)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 3 - (32:0,32)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1
-            HtmlTokenType.Text;[Foo];
-        Tag block - Gen<None> - 4 - (38:0,38)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (42:0,42) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Code span - Gen<Stmt> - [} ] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:2
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (45:0,45) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..46)::46 - [{ for(int i = 0; i < 10; i++) { <p>Foo</p> } }]
+    CSharpStatement - [0..46)::46
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..46)::46
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..45)::44
+                CSharpStatementLiteral - [1..31)::30 - [ for(int i = 0; i < 10; i++) {] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Whitespace;[ ];
+                    Keyword;[for];
+                    LeftParenthesis;[(];
+                    Keyword;[int];
+                    Whitespace;[ ];
+                    Identifier;[i];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    IntegerLiteral;[0];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    Identifier;[i];
+                    Whitespace;[ ];
+                    LessThan;[<];
+                    Whitespace;[ ];
+                    IntegerLiteral;[10];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    Identifier;[i];
+                    Increment;[++];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                MarkupBlock - [31..43)::12
+                    MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTagBlock - [32..35)::3 - [<p>]
+                        MarkupTextLiteral - [32..35)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [35..38)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+                    MarkupTagBlock - [38..42)::4 - [</p>]
+                        MarkupTextLiteral - [38..42)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Whitespace;[ ];
+                CSharpStatementLiteral - [43..45)::2 - [} ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    RightBrace;[}];
+                    Whitespace;[ ];
+            RazorMetaCode - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColon.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColon.stree.txt
index 38e93c6e81..117e0e35a3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColon.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColon.stree.txt
@@ -1,20 +1,22 @@
-Statement block - Gen<None> - 18 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) {] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:6
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 8 - (9:0,9)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-            HtmlTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-            HtmlTokenType.Colon;[:];
-        Markup span - Gen<Markup> - [BarLF] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:2
-            HtmlTokenType.Text;[Bar];
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:Any - (17:1,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..18)::18 - [if(foo) { @:BarLF}]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..9)::9 - [if(foo) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+    MarkupBlock - [9..17)::8
+        MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        RazorMetaCode - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+            Colon;[:];
+        MarkupTextLiteral - [12..17)::5 - [BarLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Text;[Bar];
+            NewLine;[LF];
+    CSharpStatementLiteral - [17..18)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock.stree.txt
index 6e1e61c285..8c569a2058 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock.stree.txt
@@ -1,26 +1,31 @@
-Statement block - Gen<None> - 22 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ if(foo) {] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:7
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 8 - (11:0,11)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-            HtmlTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-            HtmlTokenType.Colon;[:];
-        Markup span - Gen<Markup> - [BarLF] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:2
-            HtmlTokenType.Text;[Bar];
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [} ] - SpanEditHandler;Accepts:Any - (19:1,0) - Tokens:2
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (21:1,2) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..22)::22 - [{ if(foo) { @:BarLF} }]
+    CSharpStatement - [0..22)::22
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..22)::22
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..21)::20
+                CSharpStatementLiteral - [1..11)::10 - [ if(foo) {] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Whitespace;[ ];
+                    Keyword;[if];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                MarkupBlock - [11..19)::8
+                    MarkupTextLiteral - [11..12)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    RazorMetaCode - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                        Colon;[:];
+                    MarkupTextLiteral - [14..19)::5 - [BarLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Text;[Bar];
+                        NewLine;[LF];
+                CSharpStatementLiteral - [19..21)::2 - [} ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    RightBrace;[}];
+                    Whitespace;[ ];
+            RazorMetaCode - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon.stree.txt
index 0225c7443e..f4d93b3f94 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon.stree.txt
@@ -1,20 +1,22 @@
-Statement block - Gen<None> - 24 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) {] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:6
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 14 - (9:0,9)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-            HtmlTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-            HtmlTokenType.Colon;[:];
-        Markup span - Gen<Markup> - [:SometextLF] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:2
-            HtmlTokenType.Text;[:Sometext];
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:Any - (23:1,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..24)::24 - [if(foo) { @::SometextLF}]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..9)::9 - [if(foo) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+    MarkupBlock - [9..23)::14
+        MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        RazorMetaCode - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+            Colon;[:];
+        MarkupTextLiteral - [12..23)::11 - [:SometextLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Text;[:Sometext];
+            NewLine;[LF];
+    CSharpStatementLiteral - [23..24)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon.stree.txt
index c97d5b909b..679cc778b6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon.stree.txt
@@ -1,20 +1,22 @@
-Statement block - Gen<None> - 25 - (0:0,0)
-    Code span - Gen<Stmt> - [if(foo) {] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:6
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-    Markup block - Gen<None> - 15 - (9:0,9)
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-            HtmlTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-            HtmlTokenType.Colon;[:];
-        Markup span - Gen<Markup> - [::SometextLF] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:2
-            HtmlTokenType.Text;[::Sometext];
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:Any - (24:1,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..25)::25 - [if(foo) { @:::SometextLF}]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..9)::9 - [if(foo) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[if];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+    MarkupBlock - [9..24)::15
+        MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        RazorMetaCode - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+            Colon;[:];
+        MarkupTextLiteral - [12..24)::12 - [::SometextLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Text;[::Sometext];
+            NewLine;[LF];
+    CSharpStatementLiteral - [24..25)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportMarkupWithoutPreceedingWhitespace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportMarkupWithoutPreceedingWhitespace.stree.txt
index dc71b69ff1..06aeb9e15b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportMarkupWithoutPreceedingWhitespace.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportMarkupWithoutPreceedingWhitespace.stree.txt
@@ -1,59 +1,61 @@
-Statement block - Gen<None> - 67 - (0:0,0)
-    Code span - Gen<Stmt> - [foreach(var file in files){LFLFLF] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:14
-        CSharpTokenType.Keyword;[foreach];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[file];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[in];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[files];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 7 - (33:3,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (33:3,0) - Tokens:1
-            HtmlTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (34:3,1) - Tokens:1
-            HtmlTokenType.Colon;[:];
-        Markup span - Gen<Markup> - [BazLF] - SpanEditHandler;Accepts:None - (35:3,2) - Tokens:2
-            HtmlTokenType.Text;[Baz];
-            HtmlTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 7 - (40:4,0)
-        Tag block - Gen<None> - 5 - (40:4,0)
-            Markup span - Gen<Markup> - [<br/>] - SpanEditHandler;Accepts:None - (40:4,0) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[br];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (45:4,5) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 12 - (47:5,0)
-        Tag block - Gen<None> - 3 - (47:5,0)
-            Markup span - Gen<Markup> - [<a>] - SpanEditHandler;Accepts:None - (47:5,0) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[a];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (50:5,3) - Tokens:1
-            HtmlTokenType.Text;[Foo];
-        Tag block - Gen<None> - 4 - (53:5,6)
-            Markup span - Gen<Markup> - [</a>] - SpanEditHandler;Accepts:None - (53:5,6) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[a];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (57:5,10) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 7 - (59:6,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (59:6,0) - Tokens:1
-            HtmlTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (60:6,1) - Tokens:1
-            HtmlTokenType.Colon;[:];
-        Markup span - Gen<Markup> - [BarLF] - SpanEditHandler;Accepts:None - (61:6,2) - Tokens:2
-            HtmlTokenType.Text;[Bar];
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:None - (66:7,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..67)::67 - [foreach(var file in files){LFLFLF@:BazLF<br/>LF<a>Foo</a>LF@:BarLF}]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..33)::33 - [foreach(var file in files){LFLFLF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[foreach];
+        LeftParenthesis;[(];
+        Identifier;[var];
+        Whitespace;[ ];
+        Identifier;[file];
+        Whitespace;[ ];
+        Keyword;[in];
+        Whitespace;[ ];
+        Identifier;[files];
+        RightParenthesis;[)];
+        LeftBrace;[{];
+        NewLine;[LF];
+        NewLine;[LF];
+        NewLine;[LF];
+    MarkupBlock - [33..40)::7
+        MarkupTransition - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        RazorMetaCode - [34..35)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+            Colon;[:];
+        MarkupTextLiteral - [35..40)::5 - [BazLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Text;[Baz];
+            NewLine;[LF];
+    MarkupBlock - [40..47)::7
+        MarkupTagBlock - [40..45)::5 - [<br/>]
+            MarkupTextLiteral - [40..45)::5 - [<br/>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[br];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [45..47)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+            NewLine;[LF];
+    MarkupBlock - [47..59)::12
+        MarkupTagBlock - [47..50)::3 - [<a>]
+            MarkupTextLiteral - [47..50)::3 - [<a>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[a];
+                CloseAngle;[>];
+        MarkupTextLiteral - [50..53)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+        MarkupTagBlock - [53..57)::4 - [</a>]
+            MarkupTextLiteral - [53..57)::4 - [</a>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[a];
+                CloseAngle;[>];
+        MarkupTextLiteral - [57..59)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+            NewLine;[LF];
+    MarkupBlock - [59..66)::7
+        MarkupTransition - [59..60)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        RazorMetaCode - [60..61)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+            Colon;[:];
+        MarkupTextLiteral - [61..66)::5 - [BarLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Text;[Bar];
+            NewLine;[LF];
+    CSharpStatementLiteral - [66..67)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportSingleLineMarkupContainingStatementBlock.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportSingleLineMarkupContainingStatementBlock.cspans.txt
index bcd489b324..101dd5b9df 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportSingleLineMarkupContainingStatementBlock.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportSingleLineMarkupContainingStatementBlock.cspans.txt
@@ -7,4 +7,4 @@ MetaCode span at (20:1,8 [1] ) (Accepts:None) - Parent: Statement block at (19:1
 Code span at (21:1,9 [0] ) (Accepts:Any) - Parent: Statement block at (19:1,7 [3] )
 MetaCode span at (21:1,9 [1] ) (Accepts:None) - Parent: Statement block at (19:1,7 [3] )
 Markup span at (22:1,10 [2] ) (Accepts:None) - Parent: Markup block at (16:1,4 [8] )
-Code span at (24:2,0 [1] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [25] )
+Code span at (24:2,0 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [25] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportSingleLineMarkupContainingStatementBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportSingleLineMarkupContainingStatementBlock.stree.txt
index 58fe146953..bbe83e5e69 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportSingleLineMarkupContainingStatementBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportSingleLineMarkupContainingStatementBlock.stree.txt
@@ -1,29 +1,37 @@
-Expression block - Gen<Expr> - 25 - (0:0,0)
-    Code span - Gen<Expr> - [Repeat(10,LF    ] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Tokens:6
-        CSharpTokenType.Identifier;[Repeat];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-    Template block - Gen<Template> - 8 - (16:1,4)
-        Markup block - Gen<None> - 8 - (16:1,4)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (16:1,4) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (17:1,5) - Tokens:1
-                HtmlTokenType.Colon;[:];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (18:1,6) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Statement block - Gen<None> - 3 - (19:1,7)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (19:1,7) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (20:1,8) - Tokens:1
-                    CSharpTokenType.LeftBrace;[{];
-                Code span - Gen<Stmt> - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (21:1,9) - Tokens:1
-                    CSharpTokenType.Unknown;[];
-                MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (21:1,9) - Tokens:1
-                    CSharpTokenType.RightBrace;[}];
-            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (22:1,10) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Expr> - [)] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (24:2,0) - Tokens:1
-        CSharpTokenType.RightParenthesis;[)];
+CSharpCodeBlock - [0..25)::25 - [Repeat(10,LF    @: @{}LF)]
+    CSharpImplicitExpression - [0..25)::25
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpImplicitExpressionBody - [0..25)::25
+            CSharpCodeBlock - [0..25)::25
+                CSharpExpressionLiteral - [0..16)::16 - [Repeat(10,LF    ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14
+                    Identifier;[Repeat];
+                    LeftParenthesis;[(];
+                    IntegerLiteral;[10];
+                    Comma;[,];
+                    NewLine;[LF];
+                    Whitespace;[    ];
+                CSharpTemplateBlock - [16..24)::8
+                    MarkupBlock - [16..24)::8
+                        MarkupTransition - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        RazorMetaCode - [17..18)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                            Colon;[:];
+                        MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        CSharpCodeBlock - [19..22)::3
+                            CSharpStatement - [19..22)::3
+                                CSharpTransition - [19..20)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpStatementBody - [20..22)::2
+                                    RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        LeftBrace;[{];
+                                    CSharpCodeBlock - [21..21)::0
+                                        CSharpStatementLiteral - [21..21)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                                            Marker;[];
+                                    RazorMetaCode - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        RightBrace;[}];
+                        MarkupTextLiteral - [22..24)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            NewLine;[LF];
+                CSharpExpressionLiteral - [24..25)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                    RightParenthesis;[)];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SingleAngleBracketDoesNotCauseSwitchIfOuterBlockIsTerminated.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SingleAngleBracketDoesNotCauseSwitchIfOuterBlockIsTerminated.stree.txt
index be951871be..378950bec0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SingleAngleBracketDoesNotCauseSwitchIfOuterBlockIsTerminated.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SingleAngleBracketDoesNotCauseSwitchIfOuterBlockIsTerminated.stree.txt
@@ -1,10 +1,15 @@
-Statement block - Gen<None> - 9 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ List< ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:4
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[List];
-        CSharpTokenType.LessThan;[<];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..9)::9 - [{ List< }]
+    CSharpStatement - [0..9)::9
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..9)::9
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..8)::7
+                CSharpStatementLiteral - [1..8)::7 - [ List< ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Whitespace;[ ];
+                    Identifier;[List];
+                    LessThan;[<];
+                    Whitespace;[ ];
+            RazorMetaCode - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsAllKindsOfImplicitMarkupInCodeBlock.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsAllKindsOfImplicitMarkupInCodeBlock.cspans.txt
index be69b1a377..25bfbeb6f2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsAllKindsOfImplicitMarkupInCodeBlock.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsAllKindsOfImplicitMarkupInCodeBlock.cspans.txt
@@ -8,7 +8,7 @@ Code span at (49:3,0 [65] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [2
 Transition span at (114:5,8 [6] ) (Accepts:None) - Parent: Tag block at (114:5,8 [6] )
 Markup span at (120:5,14 [14] ) (Accepts:None) - Parent: Markup block at (114:5,8 [29] )
 Transition span at (134:5,28 [1] ) (Accepts:None) - Parent: Expression block at (134:5,28 [2] )
-Code span at (135:5,29 [1] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (134:5,28 [2] )
+Code span at (135:5,29 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (134:5,28 [2] )
 Transition span at (136:5,30 [7] ) (Accepts:None) - Parent: Tag block at (136:5,30 [7] )
 Code span at (143:5,37 [27] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [206] )
 Markup span at (170:8,0 [8] ) (Accepts:Any) - Parent: Markup block at (170:8,0 [28] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsAllKindsOfImplicitMarkupInCodeBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsAllKindsOfImplicitMarkupInCodeBlock.stree.txt
index 111b2d46f9..e6b7738e80 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsAllKindsOfImplicitMarkupInCodeBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsAllKindsOfImplicitMarkupInCodeBlock.stree.txt
@@ -1,122 +1,130 @@
-Statement block - Gen<None> - 206 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [LF    if(true) {LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:9
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Keyword;[true];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 30 - (19:2,0)
-        Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (19:2,0) - Tokens:1
-            HtmlTokenType.WhiteSpace;[        ];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (27:2,8) - Tokens:1
-            HtmlTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (28:2,9) - Tokens:1
-            HtmlTokenType.Colon;[:];
-        Markup span - Gen<Markup> - [Single Line MarkupLF] - SpanEditHandler;Accepts:None - (29:2,10) - Tokens:6
-            HtmlTokenType.Text;[Single];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[Line];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[Markup];
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [    }LF    foreach (var p in Enumerable.Range(1, 10)) {LF        ] - SpanEditHandler;Accepts:Any - (49:3,0) - Tokens:27
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Keyword;[foreach];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[var];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[p];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[in];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[Enumerable];
-        CSharpTokenType.Dot;[.];
-        CSharpTokenType.Identifier;[Range];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.IntegerLiteral;[1];
-        CSharpTokenType.Comma;[,];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[10];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[        ];
-    Markup block - Gen<None> - 29 - (114:5,8)
-        Tag block - Gen<None> - 6 - (114:5,8)
-            Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (114:5,8) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[text];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [The number is ] - SpanEditHandler;Accepts:None - (120:5,14) - Tokens:6
-            HtmlTokenType.Text;[The];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[number];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[is];
-            HtmlTokenType.WhiteSpace;[ ];
-        Expression block - Gen<Expr> - 2 - (134:5,28)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (134:5,28) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Expr> - [p] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (135:5,29) - Tokens:1
-                CSharpTokenType.Identifier;[p];
-        Tag block - Gen<None> - 7 - (136:5,30)
-            Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (136:5,30) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[text];
-                HtmlTokenType.CloseAngle;[>];
-    Code span - Gen<Stmt> - [LF    }LF    if(!false) {LF] - SpanEditHandler;Accepts:Any - (143:5,37) - Tokens:13
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Keyword;[if];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Not;[!];
-        CSharpTokenType.Keyword;[false];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 28 - (170:8,0)
-        Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (170:8,0) - Tokens:1
-            HtmlTokenType.WhiteSpace;[        ];
-        Tag block - Gen<None> - 3 - (178:8,8)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (178:8,8) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [A real tag!] - SpanEditHandler;Accepts:Any - (181:8,11) - Tokens:6
-            HtmlTokenType.Text;[A];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[real];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[tag];
-            HtmlTokenType.Bang;[!];
-        Tag block - Gen<None> - 4 - (192:8,22)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (192:8,22) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (196:8,26) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [    }LF] - SpanEditHandler;Accepts:Any - (198:9,0) - Tokens:3
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.NewLine;[LF];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (205:10,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..206)::206 - [{LF    if(true) {LF        @:Single Line MarkupLF    }LF    foreach (var p in Enumerable.Range(1, 10)) {LF        <text>The number is @p</text>LF    }LF    if(!false) {LF        <p>A real tag!</p>LF    }LF}]
+    CSharpStatement - [0..206)::206
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..206)::206
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..205)::204
+                CSharpStatementLiteral - [1..19)::18 - [LF    if(true) {LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    NewLine;[LF];
+                    Whitespace;[    ];
+                    Keyword;[if];
+                    LeftParenthesis;[(];
+                    Keyword;[true];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    NewLine;[LF];
+                MarkupBlock - [19..49)::30
+                    MarkupTextLiteral - [19..27)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[        ];
+                    MarkupTransition - [27..28)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    RazorMetaCode - [28..29)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                        Colon;[:];
+                    MarkupTextLiteral - [29..49)::20 - [Single Line MarkupLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Text;[Single];
+                        Whitespace;[ ];
+                        Text;[Line];
+                        Whitespace;[ ];
+                        Text;[Markup];
+                        NewLine;[LF];
+                CSharpStatementLiteral - [49..114)::65 - [    }LF    foreach (var p in Enumerable.Range(1, 10)) {LF        ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Whitespace;[    ];
+                    RightBrace;[}];
+                    NewLine;[LF];
+                    Whitespace;[    ];
+                    Keyword;[foreach];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[p];
+                    Whitespace;[ ];
+                    Keyword;[in];
+                    Whitespace;[ ];
+                    Identifier;[Enumerable];
+                    Dot;[.];
+                    Identifier;[Range];
+                    LeftParenthesis;[(];
+                    IntegerLiteral;[1];
+                    Comma;[,];
+                    Whitespace;[ ];
+                    IntegerLiteral;[10];
+                    RightParenthesis;[)];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    NewLine;[LF];
+                    Whitespace;[        ];
+                MarkupBlock - [114..143)::29
+                    MarkupTagBlock - [114..120)::6 - [<text>]
+                        MarkupTransition - [114..120)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[text];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [120..134)::14 - [The number is ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Text;[The];
+                        Whitespace;[ ];
+                        Text;[number];
+                        Whitespace;[ ];
+                        Text;[is];
+                        Whitespace;[ ];
+                    CSharpCodeBlock - [134..136)::2
+                        CSharpImplicitExpression - [134..136)::2
+                            CSharpTransition - [134..135)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpImplicitExpressionBody - [135..136)::1
+                                CSharpCodeBlock - [135..136)::1
+                                    CSharpExpressionLiteral - [135..136)::1 - [p] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                        Identifier;[p];
+                    MarkupTagBlock - [136..143)::7 - [</text>]
+                        MarkupTransition - [136..143)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[text];
+                            CloseAngle;[>];
+                CSharpStatementLiteral - [143..170)::27 - [LF    }LF    if(!false) {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    NewLine;[LF];
+                    Whitespace;[    ];
+                    RightBrace;[}];
+                    NewLine;[LF];
+                    Whitespace;[    ];
+                    Keyword;[if];
+                    LeftParenthesis;[(];
+                    Not;[!];
+                    Keyword;[false];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    NewLine;[LF];
+                MarkupBlock - [170..198)::28
+                    MarkupTextLiteral - [170..178)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[        ];
+                    MarkupTagBlock - [178..181)::3 - [<p>]
+                        MarkupTextLiteral - [178..181)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [181..192)::11 - [A real tag!] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[A];
+                        Whitespace;[ ];
+                        Text;[real];
+                        Whitespace;[ ];
+                        Text;[tag];
+                        Bang;[!];
+                    MarkupTagBlock - [192..196)::4 - [</p>]
+                        MarkupTextLiteral - [192..196)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [196..198)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        NewLine;[LF];
+                CSharpStatementLiteral - [198..205)::7 - [    }LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Whitespace;[    ];
+                    RightBrace;[}];
+                    NewLine;[LF];
+            RazorMetaCode - [205..206)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitch.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitch.stree.txt
index c0e7a1a8f4..90ac5da821 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitch.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitch.stree.txt
@@ -1,140 +1,142 @@
-Statement block - Gen<None> - 232 - (0:0,0)
-    Code span - Gen<Stmt> - [switch(foo) {LF    case 0:LF] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:13
-        CSharpTokenType.Keyword;[switch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Keyword;[case];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Colon;[:];
-        CSharpTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 20 - (28:2,0)
-        Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (28:2,0) - Tokens:1
-            HtmlTokenType.WhiteSpace;[        ];
-        Tag block - Gen<None> - 3 - (36:2,8)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (36:2,8) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (39:2,11) - Tokens:1
-            HtmlTokenType.Text;[Foo];
-        Tag block - Gen<None> - 4 - (42:2,14)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (42:2,14) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (46:2,18) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [        break;LF    case 1:LF] - SpanEditHandler;Accepts:Any - (48:3,0) - Tokens:10
-        CSharpTokenType.WhiteSpace;[        ];
-        CSharpTokenType.Keyword;[break];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Keyword;[case];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[1];
-        CSharpTokenType.Colon;[:];
-        CSharpTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 20 - (77:5,0)
-        Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (77:5,0) - Tokens:1
-            HtmlTokenType.WhiteSpace;[        ];
-        Tag block - Gen<None> - 3 - (85:5,8)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (85:5,8) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Bar] - SpanEditHandler;Accepts:Any - (88:5,11) - Tokens:1
-            HtmlTokenType.Text;[Bar];
-        Tag block - Gen<None> - 4 - (91:5,14)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (91:5,14) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (95:5,18) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [        return;LF    case 2:LF        {LF] - SpanEditHandler;Accepts:Any - (97:6,0) - Tokens:13
-        CSharpTokenType.WhiteSpace;[        ];
-        CSharpTokenType.Keyword;[return];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Keyword;[case];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[2];
-        CSharpTokenType.Colon;[:];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[        ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 24 - (138:9,0)
-        Markup span - Gen<Markup> - [            ] - SpanEditHandler;Accepts:Any - (138:9,0) - Tokens:1
-            HtmlTokenType.WhiteSpace;[            ];
-        Tag block - Gen<None> - 3 - (150:9,12)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (150:9,12) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Baz] - SpanEditHandler;Accepts:Any - (153:9,15) - Tokens:1
-            HtmlTokenType.Text;[Baz];
-        Tag block - Gen<None> - 4 - (156:9,18)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (156:9,18) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (160:9,22) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 24 - (162:10,0)
-        Markup span - Gen<Markup> - [            ] - SpanEditHandler;Accepts:Any - (162:10,0) - Tokens:1
-            HtmlTokenType.WhiteSpace;[            ];
-        Tag block - Gen<None> - 3 - (174:10,12)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (174:10,12) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Boz] - SpanEditHandler;Accepts:Any - (177:10,15) - Tokens:1
-            HtmlTokenType.Text;[Boz];
-        Tag block - Gen<None> - 4 - (180:10,18)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (180:10,18) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (184:10,22) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [        }LF    default:LF] - SpanEditHandler;Accepts:Any - (186:11,0) - Tokens:7
-        CSharpTokenType.WhiteSpace;[        ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Keyword;[default];
-        CSharpTokenType.Colon;[:];
-        CSharpTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 20 - (211:13,0)
-        Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (211:13,0) - Tokens:1
-            HtmlTokenType.WhiteSpace;[        ];
-        Tag block - Gen<None> - 3 - (219:13,8)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (219:13,8) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Biz] - SpanEditHandler;Accepts:Any - (222:13,11) - Tokens:1
-            HtmlTokenType.Text;[Biz];
-        Tag block - Gen<None> - 4 - (225:13,14)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (225:13,14) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (229:13,18) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:None - (231:14,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..232)::232 - [switch(foo) {LF    case 0:LF        <p>Foo</p>LF        break;LF    case 1:LF        <p>Bar</p>LF        return;LF    case 2:LF        {LF            <p>Baz</p>LF            <p>Boz</p>LF        }LF    default:LF        <p>Biz</p>LF}]
+    CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[<Missing>];
+    CSharpStatementLiteral - [0..28)::28 - [switch(foo) {LF    case 0:LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Keyword;[switch];
+        LeftParenthesis;[(];
+        Identifier;[foo];
+        RightParenthesis;[)];
+        Whitespace;[ ];
+        LeftBrace;[{];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Keyword;[case];
+        Whitespace;[ ];
+        IntegerLiteral;[0];
+        Colon;[:];
+        NewLine;[LF];
+    MarkupBlock - [28..48)::20
+        MarkupTextLiteral - [28..36)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[        ];
+        MarkupTagBlock - [36..39)::3 - [<p>]
+            MarkupTextLiteral - [36..39)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [39..42)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+        MarkupTagBlock - [42..46)::4 - [</p>]
+            MarkupTextLiteral - [42..46)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [46..48)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+            NewLine;[LF];
+    CSharpStatementLiteral - [48..77)::29 - [        break;LF    case 1:LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[        ];
+        Keyword;[break];
+        Semicolon;[;];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Keyword;[case];
+        Whitespace;[ ];
+        IntegerLiteral;[1];
+        Colon;[:];
+        NewLine;[LF];
+    MarkupBlock - [77..97)::20
+        MarkupTextLiteral - [77..85)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[        ];
+        MarkupTagBlock - [85..88)::3 - [<p>]
+            MarkupTextLiteral - [85..88)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [88..91)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Bar];
+        MarkupTagBlock - [91..95)::4 - [</p>]
+            MarkupTextLiteral - [91..95)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [95..97)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+            NewLine;[LF];
+    CSharpStatementLiteral - [97..138)::41 - [        return;LF    case 2:LF        {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[        ];
+        Keyword;[return];
+        Semicolon;[;];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Keyword;[case];
+        Whitespace;[ ];
+        IntegerLiteral;[2];
+        Colon;[:];
+        NewLine;[LF];
+        Whitespace;[        ];
+        LeftBrace;[{];
+        NewLine;[LF];
+    MarkupBlock - [138..162)::24
+        MarkupTextLiteral - [138..150)::12 - [            ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[            ];
+        MarkupTagBlock - [150..153)::3 - [<p>]
+            MarkupTextLiteral - [150..153)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [153..156)::3 - [Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Baz];
+        MarkupTagBlock - [156..160)::4 - [</p>]
+            MarkupTextLiteral - [156..160)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [160..162)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+            NewLine;[LF];
+    MarkupBlock - [162..186)::24
+        MarkupTextLiteral - [162..174)::12 - [            ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[            ];
+        MarkupTagBlock - [174..177)::3 - [<p>]
+            MarkupTextLiteral - [174..177)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [177..180)::3 - [Boz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Boz];
+        MarkupTagBlock - [180..184)::4 - [</p>]
+            MarkupTextLiteral - [180..184)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [184..186)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+            NewLine;[LF];
+    CSharpStatementLiteral - [186..211)::25 - [        }LF    default:LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+        Whitespace;[        ];
+        RightBrace;[}];
+        NewLine;[LF];
+        Whitespace;[    ];
+        Keyword;[default];
+        Colon;[:];
+        NewLine;[LF];
+    MarkupBlock - [211..231)::20
+        MarkupTextLiteral - [211..219)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[        ];
+        MarkupTagBlock - [219..222)::3 - [<p>]
+            MarkupTextLiteral - [219..222)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [222..225)::3 - [Biz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Biz];
+        MarkupTagBlock - [225..229)::4 - [</p>]
+            MarkupTextLiteral - [225..229)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [229..231)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+            NewLine;[LF];
+    CSharpStatementLiteral - [231..232)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:None
+        RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitchInCodeBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitchInCodeBlock.stree.txt
index fd501e3587..4d510b9654 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitchInCodeBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsMarkupInCaseAndDefaultBranchesOfSwitchInCodeBlock.stree.txt
@@ -1,146 +1,151 @@
-Statement block - Gen<None> - 236 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ switch(foo) {LF    case 0:LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:14
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Keyword;[switch];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Keyword;[case];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[0];
-        CSharpTokenType.Colon;[:];
-        CSharpTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 20 - (30:2,0)
-        Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (30:2,0) - Tokens:1
-            HtmlTokenType.WhiteSpace;[        ];
-        Tag block - Gen<None> - 3 - (38:2,8)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (38:2,8) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (41:2,11) - Tokens:1
-            HtmlTokenType.Text;[Foo];
-        Tag block - Gen<None> - 4 - (44:2,14)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (44:2,14) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (48:2,18) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [        break;LF    case 1:LF] - SpanEditHandler;Accepts:Any - (50:3,0) - Tokens:10
-        CSharpTokenType.WhiteSpace;[        ];
-        CSharpTokenType.Keyword;[break];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Keyword;[case];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[1];
-        CSharpTokenType.Colon;[:];
-        CSharpTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 20 - (79:5,0)
-        Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (79:5,0) - Tokens:1
-            HtmlTokenType.WhiteSpace;[        ];
-        Tag block - Gen<None> - 3 - (87:5,8)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (87:5,8) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Bar] - SpanEditHandler;Accepts:Any - (90:5,11) - Tokens:1
-            HtmlTokenType.Text;[Bar];
-        Tag block - Gen<None> - 4 - (93:5,14)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (93:5,14) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (97:5,18) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [        return;LF    case 2:LF        {LF] - SpanEditHandler;Accepts:Any - (99:6,0) - Tokens:13
-        CSharpTokenType.WhiteSpace;[        ];
-        CSharpTokenType.Keyword;[return];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Keyword;[case];
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.IntegerLiteral;[2];
-        CSharpTokenType.Colon;[:];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[        ];
-        CSharpTokenType.LeftBrace;[{];
-        CSharpTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 24 - (140:9,0)
-        Markup span - Gen<Markup> - [            ] - SpanEditHandler;Accepts:Any - (140:9,0) - Tokens:1
-            HtmlTokenType.WhiteSpace;[            ];
-        Tag block - Gen<None> - 3 - (152:9,12)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (152:9,12) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Baz] - SpanEditHandler;Accepts:Any - (155:9,15) - Tokens:1
-            HtmlTokenType.Text;[Baz];
-        Tag block - Gen<None> - 4 - (158:9,18)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (158:9,18) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (162:9,22) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 24 - (164:10,0)
-        Markup span - Gen<Markup> - [            ] - SpanEditHandler;Accepts:Any - (164:10,0) - Tokens:1
-            HtmlTokenType.WhiteSpace;[            ];
-        Tag block - Gen<None> - 3 - (176:10,12)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (176:10,12) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Boz] - SpanEditHandler;Accepts:Any - (179:10,15) - Tokens:1
-            HtmlTokenType.Text;[Boz];
-        Tag block - Gen<None> - 4 - (182:10,18)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (182:10,18) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (186:10,22) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [        }LF    default:LF] - SpanEditHandler;Accepts:Any - (188:11,0) - Tokens:7
-        CSharpTokenType.WhiteSpace;[        ];
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-        CSharpTokenType.Keyword;[default];
-        CSharpTokenType.Colon;[:];
-        CSharpTokenType.NewLine;[LF];
-    Markup block - Gen<None> - 20 - (213:13,0)
-        Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (213:13,0) - Tokens:1
-            HtmlTokenType.WhiteSpace;[        ];
-        Tag block - Gen<None> - 3 - (221:13,8)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (221:13,8) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Biz] - SpanEditHandler;Accepts:Any - (224:13,11) - Tokens:1
-            HtmlTokenType.Text;[Biz];
-        Tag block - Gen<None> - 4 - (227:13,14)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (227:13,14) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (231:13,18) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-    Code span - Gen<Stmt> - [} ] - SpanEditHandler;Accepts:Any - (233:14,0) - Tokens:2
-        CSharpTokenType.RightBrace;[}];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (235:14,2) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..236)::236 - [{ switch(foo) {LF    case 0:LF        <p>Foo</p>LF        break;LF    case 1:LF        <p>Bar</p>LF        return;LF    case 2:LF        {LF            <p>Baz</p>LF            <p>Boz</p>LF        }LF    default:LF        <p>Biz</p>LF} }]
+    CSharpStatement - [0..236)::236
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..236)::236
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..235)::234
+                CSharpStatementLiteral - [1..30)::29 - [ switch(foo) {LF    case 0:LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Whitespace;[ ];
+                    Keyword;[switch];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    NewLine;[LF];
+                    Whitespace;[    ];
+                    Keyword;[case];
+                    Whitespace;[ ];
+                    IntegerLiteral;[0];
+                    Colon;[:];
+                    NewLine;[LF];
+                MarkupBlock - [30..50)::20
+                    MarkupTextLiteral - [30..38)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[        ];
+                    MarkupTagBlock - [38..41)::3 - [<p>]
+                        MarkupTextLiteral - [38..41)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [41..44)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+                    MarkupTagBlock - [44..48)::4 - [</p>]
+                        MarkupTextLiteral - [44..48)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [48..50)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        NewLine;[LF];
+                CSharpStatementLiteral - [50..79)::29 - [        break;LF    case 1:LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Whitespace;[        ];
+                    Keyword;[break];
+                    Semicolon;[;];
+                    NewLine;[LF];
+                    Whitespace;[    ];
+                    Keyword;[case];
+                    Whitespace;[ ];
+                    IntegerLiteral;[1];
+                    Colon;[:];
+                    NewLine;[LF];
+                MarkupBlock - [79..99)::20
+                    MarkupTextLiteral - [79..87)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[        ];
+                    MarkupTagBlock - [87..90)::3 - [<p>]
+                        MarkupTextLiteral - [87..90)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [90..93)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+                    MarkupTagBlock - [93..97)::4 - [</p>]
+                        MarkupTextLiteral - [93..97)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [97..99)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        NewLine;[LF];
+                CSharpStatementLiteral - [99..140)::41 - [        return;LF    case 2:LF        {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Whitespace;[        ];
+                    Keyword;[return];
+                    Semicolon;[;];
+                    NewLine;[LF];
+                    Whitespace;[    ];
+                    Keyword;[case];
+                    Whitespace;[ ];
+                    IntegerLiteral;[2];
+                    Colon;[:];
+                    NewLine;[LF];
+                    Whitespace;[        ];
+                    LeftBrace;[{];
+                    NewLine;[LF];
+                MarkupBlock - [140..164)::24
+                    MarkupTextLiteral - [140..152)::12 - [            ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[            ];
+                    MarkupTagBlock - [152..155)::3 - [<p>]
+                        MarkupTextLiteral - [152..155)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [155..158)::3 - [Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Baz];
+                    MarkupTagBlock - [158..162)::4 - [</p>]
+                        MarkupTextLiteral - [158..162)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [162..164)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        NewLine;[LF];
+                MarkupBlock - [164..188)::24
+                    MarkupTextLiteral - [164..176)::12 - [            ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[            ];
+                    MarkupTagBlock - [176..179)::3 - [<p>]
+                        MarkupTextLiteral - [176..179)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [179..182)::3 - [Boz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Boz];
+                    MarkupTagBlock - [182..186)::4 - [</p>]
+                        MarkupTextLiteral - [182..186)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [186..188)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        NewLine;[LF];
+                CSharpStatementLiteral - [188..213)::25 - [        }LF    default:LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Whitespace;[        ];
+                    RightBrace;[}];
+                    NewLine;[LF];
+                    Whitespace;[    ];
+                    Keyword;[default];
+                    Colon;[:];
+                    NewLine;[LF];
+                MarkupBlock - [213..233)::20
+                    MarkupTextLiteral - [213..221)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[        ];
+                    MarkupTagBlock - [221..224)::3 - [<p>]
+                        MarkupTextLiteral - [221..224)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [224..227)::3 - [Biz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Biz];
+                    MarkupTagBlock - [227..231)::4 - [</p>]
+                        MarkupTextLiteral - [227..231)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[p];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [231..233)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        NewLine;[LF];
+                CSharpStatementLiteral - [233..235)::2 - [} ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    RightBrace;[}];
+                    Whitespace;[ ];
+            RazorMetaCode - [235..236)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprAcceptsTrailingNewlineInDesignTimeMode.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprAcceptsTrailingNewlineInDesignTimeMode.cspans.txt
index 33368ec776..a1e965a2fa 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprAcceptsTrailingNewlineInDesignTimeMode.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprAcceptsTrailingNewlineInDesignTimeMode.cspans.txt
@@ -1,6 +1,6 @@
 MetaCode span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [9] )
 Code span at (1:0,1 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [9] )
 Transition span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (1:0,1 [5] )
-Code span at (2:0,2 [4] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (1:0,1 [5] )
+Code span at (2:0,2 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (1:0,1 [5] )
 Code span at (6:0,6 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [9] )
 MetaCode span at (8:1,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [9] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprAcceptsTrailingNewlineInDesignTimeMode.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprAcceptsTrailingNewlineInDesignTimeMode.stree.txt
index c3654781bf..8314ab6e93 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprAcceptsTrailingNewlineInDesignTimeMode.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprAcceptsTrailingNewlineInDesignTimeMode.stree.txt
@@ -1,15 +1,23 @@
-Statement block - Gen<None> - 9 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    Expression block - Gen<Expr> - 5 - (1:0,1)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [foo.] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (2:0,2) - Tokens:2
-            CSharpTokenType.Identifier;[foo];
-            CSharpTokenType.Dot;[.];
-    Code span - Gen<Stmt> - [LF] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:1
-        CSharpTokenType.NewLine;[LF];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (8:1,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..9)::9 - [{@foo.LF}]
+    CSharpStatement - [0..9)::9
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..9)::9
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..8)::7
+                CSharpStatementLiteral - [1..1)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Marker;[];
+                CSharpCodeBlock - [1..6)::5
+                    CSharpImplicitExpression - [1..6)::5
+                        CSharpTransition - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [2..6)::4
+                            CSharpCodeBlock - [2..6)::4
+                                CSharpExpressionLiteral - [2..6)::4 - [foo.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                    Identifier;[foo];
+                                    Dot;[.];
+                CSharpStatementLiteral - [6..8)::2 - [LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    NewLine;[LF];
+            RazorMetaCode - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.cspans.txt
index 5b23d3880d..a9fbeb96ca 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.cspans.txt
@@ -1,6 +1,6 @@
 MetaCode span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [4] )
 Code span at (1:0,1 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [4] )
 Transition span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (1:0,1 [1] )
-Code span at (2:0,2 [0] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (1:0,1 [1] )
+Code span at (2:0,2 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (1:0,1 [1] )
 Code span at (2:0,2 [1] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [4] )
 MetaCode span at (3:0,3 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [4] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.stree.txt
index 586a1cbba6..3f04f4e47f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptDotAfterAt.stree.txt
@@ -1,14 +1,22 @@
-Statement block - Gen<None> - 4 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    Expression block - Gen<Expr> - 1 - (1:0,1)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (2:0,2) - Tokens:1
-            CSharpTokenType.Unknown;[];
-    Code span - Gen<Stmt> - [.] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-        CSharpTokenType.Dot;[.];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..4)::4 - [{@.}]
+    CSharpStatement - [0..4)::4
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..4)::4
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..3)::2
+                CSharpStatementLiteral - [1..1)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Marker;[];
+                CSharpCodeBlock - [1..2)::1
+                    CSharpImplicitExpression - [1..2)::1
+                        CSharpTransition - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [2..2)::0
+                            CSharpCodeBlock - [2..2)::0
+                                CSharpExpressionLiteral - [2..2)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                    Marker;[];
+                CSharpStatementLiteral - [2..3)::1 - [.] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Dot;[.];
+            RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptTrailingNewlineInRunTimeMode.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptTrailingNewlineInRunTimeMode.cspans.txt
index 33368ec776..a1e965a2fa 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptTrailingNewlineInRunTimeMode.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptTrailingNewlineInRunTimeMode.cspans.txt
@@ -1,6 +1,6 @@
 MetaCode span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [9] )
 Code span at (1:0,1 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [9] )
 Transition span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (1:0,1 [5] )
-Code span at (2:0,2 [4] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (1:0,1 [5] )
+Code span at (2:0,2 [4] ) (Accepts:NonWhitespace) - Parent: Expression block at (1:0,1 [5] )
 Code span at (6:0,6 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [9] )
 MetaCode span at (8:1,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [9] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptTrailingNewlineInRunTimeMode.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptTrailingNewlineInRunTimeMode.stree.txt
index c3654781bf..8314ab6e93 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptTrailingNewlineInRunTimeMode.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprDoesNotAcceptTrailingNewlineInRunTimeMode.stree.txt
@@ -1,15 +1,23 @@
-Statement block - Gen<None> - 9 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    Expression block - Gen<Expr> - 5 - (1:0,1)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [foo.] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (2:0,2) - Tokens:2
-            CSharpTokenType.Identifier;[foo];
-            CSharpTokenType.Dot;[.];
-    Code span - Gen<Stmt> - [LF] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:1
-        CSharpTokenType.NewLine;[LF];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (8:1,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..9)::9 - [{@foo.LF}]
+    CSharpStatement - [0..9)::9
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..9)::9
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..8)::7
+                CSharpStatementLiteral - [1..1)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Marker;[];
+                CSharpCodeBlock - [1..6)::5
+                    CSharpImplicitExpression - [1..6)::5
+                        CSharpTransition - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [2..6)::4
+                            CSharpCodeBlock - [2..6)::4
+                                CSharpExpressionLiteral - [2..6)::4 - [foo.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                    Identifier;[foo];
+                                    Dot;[.];
+                CSharpStatementLiteral - [6..8)::2 - [LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    NewLine;[LF];
+            RazorMetaCode - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.cspans.txt
index 5462b69291..71f270fab6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.cspans.txt
@@ -1,6 +1,6 @@
 MetaCode span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
 Code span at (1:0,1 [6] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [11] )
 Transition span at (7:1,4 [1] ) (Accepts:None) - Parent: Expression block at (7:1,4 [1] )
-Code span at (8:1,5 [0] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (7:1,4 [1] )
+Code span at (8:1,5 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (7:1,4 [1] )
 Code span at (8:1,5 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [11] )
 MetaCode span at (10:2,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [11] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.stree.txt
index b623384a73..3b0a6d6572 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtAcceptsSingleSpaceOrNewlineAtDesignTime.stree.txt
@@ -1,15 +1,23 @@
-Statement block - Gen<None> - 11 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [LF    ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:2
-        CSharpTokenType.NewLine;[LF];
-        CSharpTokenType.WhiteSpace;[    ];
-    Expression block - Gen<Expr> - 1 - (7:1,4)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (7:1,4) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (8:1,5) - Tokens:1
-            CSharpTokenType.Unknown;[];
-    Code span - Gen<Stmt> - [LF] - SpanEditHandler;Accepts:Any - (8:1,5) - Tokens:1
-        CSharpTokenType.NewLine;[LF];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (10:2,0) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..11)::11 - [{LF    @LF}]
+    CSharpStatement - [0..11)::11
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..11)::11
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..10)::9
+                CSharpStatementLiteral - [1..7)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    NewLine;[LF];
+                    Whitespace;[    ];
+                CSharpCodeBlock - [7..8)::1
+                    CSharpImplicitExpression - [7..8)::1
+                        CSharpTransition - [7..8)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [8..8)::0
+                            CSharpCodeBlock - [8..8)::0
+                                CSharpExpressionLiteral - [8..8)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                    Marker;[];
+                CSharpStatementLiteral - [8..10)::2 - [LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    NewLine;[LF];
+            RazorMetaCode - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.cspans.txt
index 4485b45d33..aa8db081e4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.cspans.txt
@@ -1,6 +1,6 @@
 MetaCode span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [3] )
 Code span at (1:0,1 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [3] )
 Transition span at (1:0,1 [1] ) (Accepts:None) - Parent: Expression block at (1:0,1 [1] )
-Code span at (2:0,2 [0] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (1:0,1 [1] )
+Code span at (2:0,2 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (1:0,1 [1] )
 Code span at (2:0,2 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [3] )
 MetaCode span at (2:0,2 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [3] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.stree.txt
index d479ebb8b0..a6056790af 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/InnerImplicitExprWithOnlySingleAtOutputsZeroLengthCodeSpan.stree.txt
@@ -1,14 +1,22 @@
-Statement block - Gen<None> - 3 - (0:0,0)
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    Expression block - Gen<Expr> - 1 - (1:0,1)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (2:0,2) - Tokens:1
-            CSharpTokenType.Unknown;[];
-    Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-        CSharpTokenType.Unknown;[];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..3)::3 - [{@}]
+    CSharpStatement - [0..3)::3
+        CSharpTransition - [0..0)::0 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[<Missing>];
+        CSharpStatementBody - [0..3)::3
+            RazorMetaCode - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [1..2)::1
+                CSharpStatementLiteral - [1..1)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Marker;[];
+                CSharpCodeBlock - [1..2)::1
+                    CSharpImplicitExpression - [1..2)::1
+                        CSharpTransition - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [2..2)::0
+                            CSharpCodeBlock - [2..2)::0
+                                CSharpExpressionLiteral - [2..2)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K14
+                                    Marker;[];
+                CSharpStatementLiteral - [2..2)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Marker;[];
+            RazorMetaCode - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/VerbatimBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/VerbatimBlock.stree.txt
index b531a6e7f9..b2a52501b5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/VerbatimBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpVerbatimBlockTest/VerbatimBlock.stree.txt
@@ -1,14 +1,17 @@
-Statement block - Gen<None> - 11 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        CSharpTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-        CSharpTokenType.LeftBrace;[{];
-    Code span - Gen<Stmt> - [ foo(); ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (2:0,2) - Tokens:6
-        CSharpTokenType.WhiteSpace;[ ];
-        CSharpTokenType.Identifier;[foo];
-        CSharpTokenType.LeftParenthesis;[(];
-        CSharpTokenType.RightParenthesis;[)];
-        CSharpTokenType.Semicolon;[;];
-        CSharpTokenType.WhiteSpace;[ ];
-    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-        CSharpTokenType.RightBrace;[}];
+CSharpCodeBlock - [0..11)::11 - [@{ foo(); }]
+    CSharpStatement - [0..11)::11
+        CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpStatementBody - [1..11)::10
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                LeftBrace;[{];
+            CSharpCodeBlock - [2..10)::8
+                CSharpStatementLiteral - [2..10)::8 - [ foo(); ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    LeftParenthesis;[(];
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+            RazorMetaCode - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpWhitespaceHandlingTest/StmtBlockDoesNotAcceptTrailingNewlineIfTheyAreSignificantToAncestor.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpWhitespaceHandlingTest/StmtBlockDoesNotAcceptTrailingNewlineIfTheyAreSignificantToAncestor.stree.txt
index 9364b8513a..ca5e987d02 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpWhitespaceHandlingTest/StmtBlockDoesNotAcceptTrailingNewlineIfTheyAreSignificantToAncestor.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpWhitespaceHandlingTest/StmtBlockDoesNotAcceptTrailingNewlineIfTheyAreSignificantToAncestor.stree.txt
@@ -1,22 +1,22 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        HtmlTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:1
-        HtmlTokenType.Colon;[:];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
-    Statement block - Gen<None> - 14 - (3:0,3)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Stmt> - [if (true) { }] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:9
-            CSharpTokenType.Keyword;[if];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.LeftParenthesis;[(];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.RightParenthesis;[)];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.LeftBrace;[{];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
+MarkupBlock - [0..19)::19 - [@: @if (true) { }LF]
+    MarkupTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+        Colon;[:];
+    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+    CSharpCodeBlock - [3..17)::14
+        CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpStatementLiteral - [4..17)::13 - [if (true) { }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+            Keyword;[if];
+            Whitespace;[ ];
+            LeftParenthesis;[(];
+            Keyword;[true];
+            RightParenthesis;[)];
+            Whitespace;[ ];
+            LeftBrace;[{];
+            Whitespace;[ ];
+            RightBrace;[}];
+    MarkupTextLiteral - [17..19)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+        NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributeCollapserDoesNotRewriteEscapedTransitions.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributeCollapserDoesNotRewriteEscapedTransitions.stree.txt
index 8840573500..55d98a60ea 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributeCollapserDoesNotRewriteEscapedTransitions.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributeCollapserDoesNotRewriteEscapedTransitions.stree.txt
@@ -1,22 +1,22 @@
 Markup block - Gen<None> - 17 - (0:0,0)
     Tag block - Gen<None> - 17 - (0:0,0)
         Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[span];
+            SyntaxKind.OpenAngle;[<];
+            SyntaxKind.Text;[span];
         Markup block - Gen<Attr:foo, foo='@(5:0,5),'@(13:0,13)> - 9 - (5:0,5)
             Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[foo];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
+                SyntaxKind.Whitespace;[ ];
+                SyntaxKind.Text;[foo];
+                SyntaxKind.Equals;[=];
+                SyntaxKind.SingleQuote;['];
             Markup block - Gen<None> - 2 - (11:0,11)
                 Markup span - Gen<LitAttr:@(11:0,11)> - [@] - SpanEditHandler;Accepts:None - (11:0,11) - Tokens:1
-                    HtmlTokenType.Transition;[@];
+                    SyntaxKind.Transition;[@];
                 Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-                    HtmlTokenType.Transition;[@];
+                    SyntaxKind.Transition;[@];
             Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
+                SyntaxKind.SingleQuote;['];
         Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+            SyntaxKind.Whitespace;[ ];
+            SyntaxKind.ForwardSlash;[/];
+            SyntaxKind.CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInBlock.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInBlock.cspans.txt
index bd904def0d..bb3a9bdc4a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInBlock.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInBlock.cspans.txt
@@ -1,7 +1,7 @@
 Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [22] )
 Markup span at (5:0,5 [11] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [16] )
 Transition span at (16:0,16 [1] ) (Accepts:None) - Parent: Expression block at (16:0,16 [4] )
-Code span at (17:0,17 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (16:0,16 [4] )
+Code span at (17:0,17 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (16:0,16 [4] )
 Markup span at (20:0,20 [1] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [16] )
 Markup span at (21:0,21 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [22] )
 Markup span at (22:0,22 [7] ) (Accepts:None) - Parent: Tag block at (22:0,22 [7] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInBlock.stree.txt
index ba14dc6f65..970628a5c2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInBlock.stree.txt
@@ -1,26 +1,32 @@
-Markup block - Gen<None> - 29 - (0:0,0)
-    Tag block - Gen<None> - 22 - (0:0,0)
-        Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[span];
-        Markup block - Gen<None> - 16 - (5:0,5)
-            Markup span - Gen<Markup> - [ data-foo='] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[data-foo];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Expression block - Gen<Expr> - 4 - (16:0,16)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (17:0,17) - Tokens:1
-                    CSharpTokenType.Identifier;[foo];
-            Markup span - Gen<Markup> - ['] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (22:0,22)
-        Markup span - Gen<Markup> - [</span>] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[span];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..29)::29 - [<span data-foo='@foo'></span>]
+    MarkupTagBlock - [0..22)::22 - [<span data-foo='@foo'>]
+        MarkupTextLiteral - [0..5)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[span];
+        MarkupAttributeBlock - [5..21)::16 - [ data-foo='@foo']
+            MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [6..14)::8 - [data-foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[data-foo];
+            Equals;[=];
+            MarkupTextLiteral - [15..16)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [16..20)::4
+                CSharpCodeBlock - [16..20)::4
+                    CSharpImplicitExpression - [16..20)::4
+                        CSharpTransition - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [17..20)::3
+                            CSharpCodeBlock - [17..20)::3
+                                CSharpExpressionLiteral - [17..20)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                    Identifier;[foo];
+            MarkupTextLiteral - [20..21)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [21..22)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            CloseAngle;[>];
+    MarkupTagBlock - [22..29)::7 - [</span>]
+        MarkupTextLiteral - [22..29)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[span];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInDocument.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInDocument.cspans.txt
index bc0d05d2b7..03766baedd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInDocument.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInDocument.cspans.txt
@@ -1,7 +1,7 @@
 Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [22] )
 Markup span at (5:0,5 [11] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [16] )
 Transition span at (16:0,16 [1] ) (Accepts:None) - Parent: Expression block at (16:0,16 [4] )
-Code span at (17:0,17 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (16:0,16 [4] )
+Code span at (17:0,17 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (16:0,16 [4] )
 Markup span at (20:0,20 [1] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [16] )
 Markup span at (21:0,21 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [22] )
 Markup span at (22:0,22 [7] ) (Accepts:Any) - Parent: Tag block at (22:0,22 [7] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInDocument.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInDocument.stree.txt
index 995853d6fc..34d6b8bcc6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInDocument.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreDisabledForDataAttributesInDocument.stree.txt
@@ -1,26 +1,33 @@
-Markup block - Gen<None> - 29 - (0:0,0)
-    Tag block - Gen<None> - 22 - (0:0,0)
-        Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[span];
-        Markup block - Gen<None> - 16 - (5:0,5)
-            Markup span - Gen<Markup> - [ data-foo='] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[data-foo];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Expression block - Gen<Expr> - 4 - (16:0,16)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (17:0,17) - Tokens:1
-                    CSharpTokenType.Identifier;[foo];
-            Markup span - Gen<Markup> - ['] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (22:0,22)
-        Markup span - Gen<Markup> - [</span>] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[span];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..29)::29 - [<span data-foo='@foo'></span>]
+    MarkupBlock - [0..29)::29
+        MarkupTagBlock - [0..22)::22 - [<span data-foo='@foo'>]
+            MarkupTextLiteral - [0..5)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+            MarkupAttributeBlock - [5..21)::16 - [ data-foo='@foo']
+                MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [6..14)::8 - [data-foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[data-foo];
+                Equals;[=];
+                MarkupTextLiteral - [15..16)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [16..20)::4
+                    CSharpCodeBlock - [16..20)::4
+                        CSharpImplicitExpression - [16..20)::4
+                            CSharpTransition - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpImplicitExpressionBody - [17..20)::3
+                                CSharpCodeBlock - [17..20)::3
+                                    CSharpExpressionLiteral - [17..20)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                        Identifier;[foo];
+                MarkupTextLiteral - [20..21)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupTextLiteral - [21..22)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+        MarkupTagBlock - [22..29)::7 - [</span>]
+            MarkupTextLiteral - [22..29)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[span];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.cspans.txt
index bd904def0d..bb3a9bdc4a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.cspans.txt
@@ -1,7 +1,7 @@
 Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [22] )
 Markup span at (5:0,5 [11] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [16] )
 Transition span at (16:0,16 [1] ) (Accepts:None) - Parent: Expression block at (16:0,16 [4] )
-Code span at (17:0,17 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (16:0,16 [4] )
+Code span at (17:0,17 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (16:0,16 [4] )
 Markup span at (20:0,20 [1] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [16] )
 Markup span at (21:0,21 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [22] )
 Markup span at (22:0,22 [7] ) (Accepts:None) - Parent: Tag block at (22:0,22 [7] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.stree.txt
index 9691e49844..8f1e3285d5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesAreEnabledForDataAttributesWithExperimentalFlag.stree.txt
@@ -1,27 +1,34 @@
-Markup block - Gen<None> - 29 - (0:0,0)
-    Tag block - Gen<None> - 22 - (0:0,0)
-        Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[span];
-        Markup block - Gen<Attr:data-foo, data-foo='@(5:0,5),'@(20:0,20)> - 16 - (5:0,5)
-            Markup span - Gen<None> - [ data-foo='] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[data-foo];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup block - Gen<DynAttr:@(16:0,16)> - 4 - (16:0,16)
-                Expression block - Gen<Expr> - 4 - (16:0,16)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (17:0,17) - Tokens:1
-                        CSharpTokenType.Identifier;[foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (22:0,22)
-        Markup span - Gen<Markup> - [</span>] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[span];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..29)::29 - [<span data-foo='@foo'></span>]
+    MarkupTagBlock - [0..22)::22 - [<span data-foo='@foo'>]
+        MarkupTextLiteral - [0..5)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[span];
+        MarkupAttributeBlock - [5..21)::16 - [ data-foo='@foo']
+            MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [6..14)::8 - [data-foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[data-foo];
+            Equals;[=];
+            MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [16..20)::4
+                MarkupDynamicAttributeValue - [16..20)::4 - [@foo]
+                    GenericBlock - [16..20)::4
+                        CSharpCodeBlock - [16..20)::4
+                            CSharpImplicitExpression - [16..20)::4
+                                CSharpTransition - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [17..20)::3
+                                    CSharpCodeBlock - [17..20)::3
+                                        CSharpExpressionLiteral - [17..20)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[foo];
+            MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [21..22)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            CloseAngle;[>];
+    MarkupTagBlock - [22..29)::7 - [</span>]
+        MarkupTextLiteral - [22..29)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[span];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInBlock.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInBlock.cspans.txt
index 13f5bc96d8..78256dbb2f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInBlock.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInBlock.cspans.txt
@@ -1,7 +1,7 @@
 Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [26] )
 Markup span at (5:0,5 [15] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [20] )
 Transition span at (20:0,20 [1] ) (Accepts:None) - Parent: Expression block at (20:0,20 [4] )
-Code span at (21:0,21 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (20:0,20 [4] )
+Code span at (21:0,21 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (20:0,20 [4] )
 Markup span at (24:0,24 [1] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [20] )
 Markup span at (25:0,25 [1] ) (Accepts:None) - Parent: Tag block at (0:0,0 [26] )
 Markup span at (26:0,26 [7] ) (Accepts:None) - Parent: Tag block at (26:0,26 [7] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInBlock.stree.txt
index 18d172dfad..e9b567d971 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInBlock.stree.txt
@@ -1,28 +1,35 @@
-Markup block - Gen<None> - 33 - (0:0,0)
-    Tag block - Gen<None> - 26 - (0:0,0)
-        Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[span];
-        Markup block - Gen<None> - 20 - (5:0,5)
-            Markup span - Gen<Markup> - [ data-foo  =  '] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:6
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[data-foo];
-                HtmlTokenType.WhiteSpace;[  ];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.WhiteSpace;[  ];
-                HtmlTokenType.SingleQuote;['];
-            Expression block - Gen<Expr> - 4 - (20:0,20)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (21:0,21) - Tokens:1
-                    CSharpTokenType.Identifier;[foo];
-            Markup span - Gen<Markup> - ['] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (26:0,26)
-        Markup span - Gen<Markup> - [</span>] - SpanEditHandler;Accepts:None - (26:0,26) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[span];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..33)::33 - [<span data-foo  =  '@foo'></span>]
+    MarkupTagBlock - [0..26)::26 - [<span data-foo  =  '@foo'>]
+        MarkupTextLiteral - [0..5)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[span];
+        MarkupAttributeBlock - [5..25)::20 - [ data-foo  =  '@foo']
+            MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [6..14)::8 - [data-foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[data-foo];
+            MarkupTextLiteral - [14..16)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[  ];
+            Equals;[=];
+            MarkupTextLiteral - [17..20)::3 - [  '] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[  ];
+                SingleQuote;['];
+            GenericBlock - [20..24)::4
+                CSharpCodeBlock - [20..24)::4
+                    CSharpImplicitExpression - [20..24)::4
+                        CSharpTransition - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [21..24)::3
+                            CSharpCodeBlock - [21..24)::3
+                                CSharpExpressionLiteral - [21..24)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                    Identifier;[foo];
+            MarkupTextLiteral - [24..25)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [25..26)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            CloseAngle;[>];
+    MarkupTagBlock - [26..33)::7 - [</span>]
+        MarkupTextLiteral - [26..33)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[span];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInDocument.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInDocument.cspans.txt
index 643853f062..c34151715e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInDocument.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInDocument.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [21] )
 Markup span at (5:0,5 [10] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [14] )
 Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Expression block at (15:0,15 [4] )
-Code span at (16:0,16 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (15:0,15 [4] )
+Code span at (16:0,16 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (15:0,15 [4] )
 Markup span at (19:0,19 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [21] )
 Markup span at (21:0,21 [7] ) (Accepts:Any) - Parent: Tag block at (21:0,21 [7] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInDocument.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInDocument.stree.txt
index 4c67d07cd4..50c1dc3a50 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInDocument.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInDocument.stree.txt
@@ -1,24 +1,30 @@
-Markup block - Gen<None> - 28 - (0:0,0)
-    Tag block - Gen<None> - 21 - (0:0,0)
-        Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[span];
-        Markup block - Gen<None> - 14 - (5:0,5)
-            Markup span - Gen<Markup> - [ data-foo=] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[data-foo];
-                HtmlTokenType.Equals;[=];
-            Expression block - Gen<Expr> - 4 - (15:0,15)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (16:0,16) - Tokens:1
-                    CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<Markup> - [ >] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:2
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (21:0,21)
-        Markup span - Gen<Markup> - [</span>] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[span];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..28)::28 - [<span data-foo=@foo ></span>]
+    MarkupBlock - [0..28)::28
+        MarkupTagBlock - [0..21)::21 - [<span data-foo=@foo >]
+            MarkupTextLiteral - [0..5)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+            MarkupAttributeBlock - [5..19)::14 - [ data-foo=@foo]
+                MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [6..14)::8 - [data-foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[data-foo];
+                Equals;[=];
+                GenericBlock - [15..19)::4
+                    CSharpCodeBlock - [15..19)::4
+                        CSharpImplicitExpression - [15..19)::4
+                            CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpImplicitExpressionBody - [16..19)::3
+                                CSharpCodeBlock - [16..19)::3
+                                    CSharpExpressionLiteral - [16..19)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                        Identifier;[foo];
+            MarkupTextLiteral - [19..21)::2 - [ >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                CloseAngle;[>];
+        MarkupTagBlock - [21..28)::7 - [</span>]
+            MarkupTextLiteral - [21..28)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[span];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/DoubleQuotedLiteralAttribute.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/DoubleQuotedLiteralAttribute.stree.txt
index 1e9ca4ef85..69f99cdc5d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/DoubleQuotedLiteralAttribute.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/DoubleQuotedLiteralAttribute.stree.txt
@@ -1,25 +1,33 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Tag block - Gen<None> - 24 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:href, href="@(2:0,2),"@(20:0,20)> - 19 - (2:0,2)
-            Markup span - Gen<None> - [ href="] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[href];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<LitAttr:@(9:0,9)> - [Foo] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<LitAttr: @(12:0,12)> - [ Bar] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:2
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[Bar];
-            Markup span - Gen<LitAttr: @(16:0,16)> - [ Baz] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:2
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[Baz];
-            Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-                HtmlTokenType.DoubleQuote;["];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..24)::24 - [<a href="Foo Bar Baz" />]
+    MarkupTagBlock - [0..24)::24 - [<a href="Foo Bar Baz" />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..21)::19 - [ href="Foo Bar Baz"]
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..7)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[href];
+            Equals;[=];
+            MarkupTextLiteral - [8..9)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                DoubleQuote;["];
+            GenericBlock - [9..20)::11
+                MarkupLiteralAttributeValue - [9..12)::3 - [Foo]
+                    MarkupTextLiteral - [9..12)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+                MarkupLiteralAttributeValue - [12..16)::4 - [ Bar]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..16)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+                MarkupLiteralAttributeValue - [16..20)::4 - [ Baz]
+                    MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [17..20)::3 - [Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Baz];
+            MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                DoubleQuote;["];
+        MarkupTextLiteral - [21..24)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.cspans.txt
index cfcf9e1471..a897ae9080 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [23] )
 Markup span at (2:0,2 [13] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [18] )
 Transition span at (15:2,1 [1] ) (Accepts:None) - Parent: Expression block at (15:2,1 [4] )
-Code span at (16:2,2 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (15:2,1 [4] )
+Code span at (16:2,2 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (15:2,1 [4] )
 Markup span at (19:2,5 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [18] )
 Markup span at (20:2,6 [3] ) (Accepts:None) - Parent: Tag block at (0:0,0 [23] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.stree.txt
index 2b1f3b2c01..7d07f6a07b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/DynamicAttributeWithWhitespaceSurroundingEquals.stree.txt
@@ -1,27 +1,35 @@
-Markup block - Gen<None> - 23 - (0:0,0)
-    Tag block - Gen<None> - 23 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:href, href LF= LF'@(2:0,2),'@(19:2,5)> - 18 - (2:0,2)
-            Markup span - Gen<None> - [ href LF= LF'] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:8
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[href];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.SingleQuote;['];
-            Markup block - Gen<DynAttr:@(15:2,1)> - 4 - (15:2,1)
-                Expression block - Gen<Expr> - 4 - (15:2,1)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (15:2,1) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [Foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (16:2,2) - Tokens:1
-                        CSharpTokenType.Identifier;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (19:2,5) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (20:2,6) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..23)::23 - [<a href LF= LF'@Foo' />]
+    MarkupTagBlock - [0..23)::23 - [<a href LF= LF'@Foo' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..20)::18 - [ href LF= LF'@Foo']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..7)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[href];
+            MarkupTextLiteral - [7..10)::3 - [ LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                NewLine;[LF];
+            Equals;[=];
+            MarkupTextLiteral - [11..15)::4 - [ LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                NewLine;[LF];
+                SingleQuote;['];
+            GenericBlock - [15..19)::4
+                MarkupDynamicAttributeValue - [15..19)::4 - [@Foo]
+                    GenericBlock - [15..19)::4
+                        CSharpCodeBlock - [15..19)::4
+                            CSharpImplicitExpression - [15..19)::4
+                                CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [16..19)::3
+                                    CSharpCodeBlock - [16..19)::3
+                                        CSharpExpressionLiteral - [16..19)::3 - [Foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[Foo];
+            MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [20..23)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/MultiPartLiteralAttribute.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/MultiPartLiteralAttribute.stree.txt
index 5d2803793a..ac550a06fd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/MultiPartLiteralAttribute.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/MultiPartLiteralAttribute.stree.txt
@@ -1,25 +1,33 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Tag block - Gen<None> - 24 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:href, href='@(2:0,2),'@(20:0,20)> - 19 - (2:0,2)
-            Markup span - Gen<None> - [ href='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[href];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(9:0,9)> - [Foo] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<LitAttr: @(12:0,12)> - [ Bar] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:2
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[Bar];
-            Markup span - Gen<LitAttr: @(16:0,16)> - [ Baz] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:2
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[Baz];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..24)::24 - [<a href='Foo Bar Baz' />]
+    MarkupTagBlock - [0..24)::24 - [<a href='Foo Bar Baz' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..21)::19 - [ href='Foo Bar Baz']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..7)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[href];
+            Equals;[=];
+            MarkupTextLiteral - [8..9)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [9..20)::11
+                MarkupLiteralAttributeValue - [9..12)::3 - [Foo]
+                    MarkupTextLiteral - [9..12)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+                MarkupLiteralAttributeValue - [12..16)::4 - [ Bar]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..16)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+                MarkupLiteralAttributeValue - [16..20)::4 - [ Baz]
+                    MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [17..20)::3 - [Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Baz];
+            MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [21..24)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.cspans.txt
index b7b5a4adcb..f443dd9ca0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.cspans.txt
@@ -1,10 +1,10 @@
 Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [26] )
 Markup span at (2:0,2 [7] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [21] )
 Transition span at (9:0,9 [1] ) (Accepts:None) - Parent: Expression block at (9:0,9 [4] )
-Code span at (10:0,10 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (9:0,9 [4] )
+Code span at (10:0,10 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (9:0,9 [4] )
 Markup span at (13:0,13 [4] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [21] )
 Markup span at (17:0,17 [1] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [5] )
 Transition span at (18:0,18 [1] ) (Accepts:None) - Parent: Expression block at (18:0,18 [4] )
-Code span at (19:0,19 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (18:0,18 [4] )
+Code span at (19:0,19 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (18:0,18 [4] )
 Markup span at (22:0,22 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [21] )
 Markup span at (23:0,23 [3] ) (Accepts:None) - Parent: Tag block at (0:0,0 [26] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.stree.txt
index 4f6da5f8d2..7ca933a84f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/MultiValueExpressionAttribute.stree.txt
@@ -1,34 +1,47 @@
-Markup block - Gen<None> - 26 - (0:0,0)
-    Tag block - Gen<None> - 26 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:href, href='@(2:0,2),'@(22:0,22)> - 21 - (2:0,2)
-            Markup span - Gen<None> - [ href='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[href];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup block - Gen<DynAttr:@(9:0,9)> - 4 - (9:0,9)
-                Expression block - Gen<Expr> - 4 - (9:0,9)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (10:0,10) - Tokens:1
-                        CSharpTokenType.Identifier;[foo];
-            Markup span - Gen<LitAttr: @(13:0,13)> - [ bar] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:2
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[bar];
-            Markup block - Gen<DynAttr: @(17:0,17)> - 5 - (17:0,17)
-                Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-                Expression block - Gen<Expr> - 4 - (18:0,18)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (19:0,19) - Tokens:1
-                        CSharpTokenType.Identifier;[baz];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..26)::26 - [<a href='@foo bar @baz' />]
+    MarkupTagBlock - [0..26)::26 - [<a href='@foo bar @baz' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..23)::21 - [ href='@foo bar @baz']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..7)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[href];
+            Equals;[=];
+            MarkupTextLiteral - [8..9)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [9..22)::13
+                MarkupDynamicAttributeValue - [9..13)::4 - [@foo]
+                    GenericBlock - [9..13)::4
+                        CSharpCodeBlock - [9..13)::4
+                            CSharpImplicitExpression - [9..13)::4
+                                CSharpTransition - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [10..13)::3
+                                    CSharpCodeBlock - [10..13)::3
+                                        CSharpExpressionLiteral - [10..13)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[foo];
+                MarkupLiteralAttributeValue - [13..17)::4 - [ bar]
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..17)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bar];
+                MarkupDynamicAttributeValue - [17..22)::5 - [ @baz]
+                    MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    GenericBlock - [18..22)::4
+                        CSharpCodeBlock - [18..22)::4
+                            CSharpImplicitExpression - [18..22)::4
+                                CSharpTransition - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [19..22)::3
+                                    CSharpCodeBlock - [19..22)::3
+                                        CSharpExpressionLiteral - [19..22)::3 - [baz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[baz];
+            MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [23..26)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/NewLineBetweenAttributes.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/NewLineBetweenAttributes.stree.txt
index d9c2775bac..6de9860c96 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/NewLineBetweenAttributes.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/NewLineBetweenAttributes.stree.txt
@@ -1,29 +1,37 @@
-Markup block - Gen<None> - 29 - (0:0,0)
-    Tag block - Gen<None> - 29 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:href,LFhref='@(2:0,2),'@(13:1,9)> - 12 - (2:0,2)
-            Markup span - Gen<None> - [LFhref='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:4
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.Text;[href];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(10:1,6)> - [Foo] - SpanEditHandler;Accepts:Any - (10:1,6) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (13:1,9) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:abcd,LFabcd='@(14:1,10),'@(25:2,9)> - 12 - (14:1,10)
-            Markup span - Gen<None> - [LFabcd='] - SpanEditHandler;Accepts:Any - (14:1,10) - Tokens:4
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.Text;[abcd];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(22:2,6)> - [Bar] - SpanEditHandler;Accepts:Any - (22:2,6) - Tokens:1
-                HtmlTokenType.Text;[Bar];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (25:2,9) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (26:2,10) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..29)::29 - [<aLFhref='Foo'LFabcd='Bar' />]
+    MarkupTagBlock - [0..29)::29 - [<aLFhref='Foo'LFabcd='Bar' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..14)::12 - [LFhref='Foo']
+            MarkupTextLiteral - [2..4)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupTextLiteral - [4..8)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[href];
+            Equals;[=];
+            MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [10..13)::3
+                MarkupLiteralAttributeValue - [10..13)::3 - [Foo]
+                    MarkupTextLiteral - [10..13)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupAttributeBlock - [14..26)::12 - [LFabcd='Bar']
+            MarkupTextLiteral - [14..16)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupTextLiteral - [16..20)::4 - [abcd] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[abcd];
+            Equals;[=];
+            MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [22..25)::3
+                MarkupLiteralAttributeValue - [22..25)::3 - [Bar]
+                    MarkupTextLiteral - [22..25)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+            MarkupTextLiteral - [25..26)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [26..29)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/NewLinePrecedingAttribute.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/NewLinePrecedingAttribute.stree.txt
index 81abc72e91..d3f3368f3c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/NewLinePrecedingAttribute.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/NewLinePrecedingAttribute.stree.txt
@@ -1,19 +1,23 @@
-Markup block - Gen<None> - 17 - (0:0,0)
-    Tag block - Gen<None> - 17 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:href,LFhref='@(2:0,2),'@(13:1,9)> - 12 - (2:0,2)
-            Markup span - Gen<None> - [LFhref='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:4
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.Text;[href];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(10:1,6)> - [Foo] - SpanEditHandler;Accepts:Any - (10:1,6) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (13:1,9) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (14:1,10) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..17)::17 - [<aLFhref='Foo' />]
+    MarkupTagBlock - [0..17)::17 - [<aLFhref='Foo' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..14)::12 - [LFhref='Foo']
+            MarkupTextLiteral - [2..4)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupTextLiteral - [4..8)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[href];
+            Equals;[=];
+            MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [10..13)::3
+                MarkupLiteralAttributeValue - [10..13)::3 - [Foo]
+                    MarkupTextLiteral - [10..13)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [14..17)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.cspans.txt
index 8c46912b85..4bb3b19b9b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [17] )
 Markup span at (2:0,2 [7] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [12] )
 Transition span at (9:0,9 [1] ) (Accepts:None) - Parent: Expression block at (9:0,9 [4] )
-Code span at (10:0,10 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (9:0,9 [4] )
+Code span at (10:0,10 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (9:0,9 [4] )
 Markup span at (13:0,13 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [12] )
 Markup span at (14:0,14 [3] ) (Accepts:None) - Parent: Tag block at (0:0,0 [17] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.stree.txt
index fbc952652c..4c788d3166 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SimpleExpressionAttribute.stree.txt
@@ -1,23 +1,30 @@
-Markup block - Gen<None> - 17 - (0:0,0)
-    Tag block - Gen<None> - 17 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:href, href='@(2:0,2),'@(13:0,13)> - 12 - (2:0,2)
-            Markup span - Gen<None> - [ href='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[href];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup block - Gen<DynAttr:@(9:0,9)> - 4 - (9:0,9)
-                Expression block - Gen<Expr> - 4 - (9:0,9)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (10:0,10) - Tokens:1
-                        CSharpTokenType.Identifier;[foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..17)::17 - [<a href='@foo' />]
+    MarkupTagBlock - [0..17)::17 - [<a href='@foo' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..14)::12 - [ href='@foo']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..7)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[href];
+            Equals;[=];
+            MarkupTextLiteral - [8..9)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [9..13)::4
+                MarkupDynamicAttributeValue - [9..13)::4 - [@foo]
+                    GenericBlock - [9..13)::4
+                        CSharpCodeBlock - [9..13)::4
+                            CSharpImplicitExpression - [9..13)::4
+                                CSharpTransition - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [10..13)::3
+                                    CSharpCodeBlock - [10..13)::3
+                                        CSharpExpressionLiteral - [10..13)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[foo];
+            MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [14..17)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttribute.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttribute.stree.txt
index 788961a97b..5226e007df 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttribute.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttribute.stree.txt
@@ -1,19 +1,23 @@
-Markup block - Gen<None> - 16 - (0:0,0)
-    Tag block - Gen<None> - 16 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:href, href='@(2:0,2),'@(12:0,12)> - 11 - (2:0,2)
-            Markup span - Gen<None> - [ href='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[href];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(9:0,9)> - [Foo] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..16)::16 - [<a href='Foo' />]
+    MarkupTagBlock - [0..16)::16 - [<a href='Foo' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..13)::11 - [ href='Foo']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..7)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[href];
+            Equals;[=];
+            MarkupTextLiteral - [8..9)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [9..12)::3
+                MarkupLiteralAttributeValue - [9..12)::3 - [Foo]
+                    MarkupTextLiteral - [9..12)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [13..16)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttributeWithWhitespaceSurroundingEquals.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttributeWithWhitespaceSurroundingEquals.stree.txt
index 2f85108742..150eab1458 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttributeWithWhitespaceSurroundingEquals.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SimpleLiteralAttributeWithWhitespaceSurroundingEquals.stree.txt
@@ -1,23 +1,28 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Tag block - Gen<None> - 24 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:href, href LF= 	LF'@(2:0,2),'@(20:2,4)> - 19 - (2:0,2)
-            Markup span - Gen<None> - [ href LF= 	LF'] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:8
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[href];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.WhiteSpace;[ 	];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(17:2,1)> - [Foo] - SpanEditHandler;Accepts:Any - (17:2,1) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (20:2,4) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (21:2,5) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..24)::24 - [<a href LF= 	LF'Foo' />]
+    MarkupTagBlock - [0..24)::24 - [<a href LF= 	LF'Foo' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..21)::19 - [ href LF= 	LF'Foo']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..7)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[href];
+            MarkupTextLiteral - [7..11)::4 - [ LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                NewLine;[LF];
+            Equals;[=];
+            MarkupTextLiteral - [12..17)::5 - [ 	LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                Whitespace;[ 	];
+                NewLine;[LF];
+                SingleQuote;['];
+            GenericBlock - [17..20)::3
+                MarkupLiteralAttributeValue - [17..20)::3 - [Foo]
+                    MarkupTextLiteral - [17..20)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [21..24)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes1.stree.txt
index 5e40446270..644d279c65 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes1.stree.txt
@@ -1,21 +1,25 @@
-Markup block - Gen<None> - 18 - (0:0,0)
-    Tag block - Gen<None> - 18 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:[item], [item]='@(2:0,2),'@(14:0,14)> - 13 - (2:0,2)
-            Markup span - Gen<None> - [ [item]='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:6
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.LeftBracket;[[];
-                HtmlTokenType.Text;[item];
-                HtmlTokenType.RightBracket;[]];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(11:0,11)> - [Foo] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..18)::18 - [<a [item]='Foo' />]
+    MarkupTagBlock - [0..18)::18 - [<a [item]='Foo' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..15)::13 - [ [item]='Foo']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..9)::6 - [[item]] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                LeftBracket;[[];
+                Text;[item];
+                RightBracket;[]];
+            Equals;[=];
+            MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [11..14)::3
+                MarkupLiteralAttributeValue - [11..14)::3 - [Foo]
+                    MarkupTextLiteral - [11..14)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [15..18)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes2.stree.txt
index c7f4e26d2f..34a56480b2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes2.stree.txt
@@ -1,20 +1,24 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Tag block - Gen<None> - 19 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:[(item,, [(item,='@(2:0,2),'@(15:0,15)> - 14 - (2:0,2)
-            Markup span - Gen<None> - [ [(item,='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:5
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.LeftBracket;[[];
-                HtmlTokenType.Text;[(item,];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(12:0,12)> - [Foo] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..19)::19 - [<a [(item,='Foo' />]
+    MarkupTagBlock - [0..19)::19 - [<a [(item,='Foo' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..16)::14 - [ [(item,='Foo']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..10)::7 - [[(item,] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                LeftBracket;[[];
+                Text;[(item,];
+            Equals;[=];
+            MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [12..15)::3
+                MarkupLiteralAttributeValue - [12..15)::3 - [Foo]
+                    MarkupTextLiteral - [12..15)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [16..19)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes3.stree.txt
index a642ee0bcc..8362be761a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes3.stree.txt
@@ -1,19 +1,23 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Tag block - Gen<None> - 19 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:(click), (click)='@(2:0,2),'@(15:0,15)> - 14 - (2:0,2)
-            Markup span - Gen<None> - [ (click)='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[(click)];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(12:0,12)> - [Foo] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..19)::19 - [<a (click)='Foo' />]
+    MarkupTagBlock - [0..19)::19 - [<a (click)='Foo' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..16)::14 - [ (click)='Foo']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..10)::7 - [(click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[(click)];
+            Equals;[=];
+            MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [12..15)::3
+                MarkupLiteralAttributeValue - [12..15)::3 - [Foo]
+                    MarkupTextLiteral - [12..15)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [16..19)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes4.stree.txt
index 7fe3b85a62..e8b4c737a3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes4.stree.txt
@@ -1,19 +1,23 @@
-Markup block - Gen<None> - 20 - (0:0,0)
-    Tag block - Gen<None> - 20 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:(^click), (^click)='@(2:0,2),'@(16:0,16)> - 15 - (2:0,2)
-            Markup span - Gen<None> - [ (^click)='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[(^click)];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(13:0,13)> - [Foo] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..20)::20 - [<a (^click)='Foo' />]
+    MarkupTagBlock - [0..20)::20 - [<a (^click)='Foo' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..17)::15 - [ (^click)='Foo']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..11)::8 - [(^click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[(^click)];
+            Equals;[=];
+            MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [13..16)::3
+                MarkupLiteralAttributeValue - [13..16)::3 - [Foo]
+                    MarkupTextLiteral - [13..16)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [17..20)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes5.stree.txt
index d269f63036..a90b0eb210 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes5.stree.txt
@@ -1,19 +1,23 @@
-Markup block - Gen<None> - 22 - (0:0,0)
-    Tag block - Gen<None> - 22 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:*something, *something='@(2:0,2),'@(18:0,18)> - 17 - (2:0,2)
-            Markup span - Gen<None> - [ *something='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[*something];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(15:0,15)> - [Foo] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..22)::22 - [<a *something='Foo' />]
+    MarkupTagBlock - [0..22)::22 - [<a *something='Foo' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..19)::17 - [ *something='Foo']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..13)::10 - [*something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[*something];
+            Equals;[=];
+            MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [15..18)::3
+                MarkupLiteralAttributeValue - [15..18)::3 - [Foo]
+                    MarkupTextLiteral - [15..18)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [19..22)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes6.stree.txt
index 2df7382985..c422227697 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes6.stree.txt
@@ -1,19 +1,23 @@
-Markup block - Gen<None> - 18 - (0:0,0)
-    Tag block - Gen<None> - 18 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:#local, #local='@(2:0,2),'@(14:0,14)> - 13 - (2:0,2)
-            Markup span - Gen<None> - [ #local='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[#local];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(11:0,11)> - [Foo] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..18)::18 - [<a #local='Foo' />]
+    MarkupTagBlock - [0..18)::18 - [<a #local='Foo' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..15)::13 - [ #local='Foo']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..9)::6 - [#local] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[#local];
+            Equals;[=];
+            MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [11..14)::3
+                MarkupLiteralAttributeValue - [11..14)::3 - [Foo]
+                    MarkupTextLiteral - [11..14)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [15..18)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace1.stree.txt
index 08d12c98cf..ed90ad5f48 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace1.stree.txt
@@ -1,35 +1,44 @@
-Markup block - Gen<None> - 35 - (0:0,0)
-    Tag block - Gen<None> - 35 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:[item], [item]LF='@(2:0,2),'@(16:1,5)> - 15 - (2:0,2)
-            Markup span - Gen<None> - [ [item]LF='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:7
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.LeftBracket;[[];
-                HtmlTokenType.Text;[item];
-                HtmlTokenType.RightBracket;[]];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(13:1,2)> - [Foo] - SpanEditHandler;Accepts:Any - (13:1,2) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (16:1,5) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:[item],	[item]=LF'@(17:1,6),'@(31:2,4)> - 15 - (17:1,6)
-            Markup span - Gen<None> - [	[item]=LF'] - SpanEditHandler;Accepts:Any - (17:1,6) - Tokens:7
-                HtmlTokenType.WhiteSpace;[	];
-                HtmlTokenType.LeftBracket;[[];
-                HtmlTokenType.Text;[item];
-                HtmlTokenType.RightBracket;[]];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(28:2,1)> - [Bar] - SpanEditHandler;Accepts:Any - (28:2,1) - Tokens:1
-                HtmlTokenType.Text;[Bar];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (31:2,4) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (32:2,5) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..35)::35 - [<a [item]LF='Foo'	[item]=LF'Bar' />]
+    MarkupTagBlock - [0..35)::35 - [<a [item]LF='Foo'	[item]=LF'Bar' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..17)::15 - [ [item]LF='Foo']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..9)::6 - [[item]] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                LeftBracket;[[];
+                Text;[item];
+                RightBracket;[]];
+            MarkupTextLiteral - [9..11)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            Equals;[=];
+            MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [13..16)::3
+                MarkupLiteralAttributeValue - [13..16)::3 - [Foo]
+                    MarkupTextLiteral - [13..16)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupAttributeBlock - [17..32)::15 - [	[item]=LF'Bar']
+            MarkupTextLiteral - [17..18)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[	];
+            MarkupTextLiteral - [18..24)::6 - [[item]] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                LeftBracket;[[];
+                Text;[item];
+                RightBracket;[]];
+            Equals;[=];
+            MarkupTextLiteral - [25..28)::3 - [LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                SingleQuote;['];
+            GenericBlock - [28..31)::3
+                MarkupLiteralAttributeValue - [28..31)::3 - [Bar]
+                    MarkupTextLiteral - [28..31)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+            MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [32..35)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace2.stree.txt
index d5323cb0cb..154e149e72 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace2.stree.txt
@@ -1,33 +1,42 @@
-Markup block - Gen<None> - 37 - (0:0,0)
-    Tag block - Gen<None> - 37 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:[(item,, [(item,LF='@(2:0,2),'@(17:1,5)> - 16 - (2:0,2)
-            Markup span - Gen<None> - [ [(item,LF='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:6
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.LeftBracket;[[];
-                HtmlTokenType.Text;[(item,];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(14:1,2)> - [Foo] - SpanEditHandler;Accepts:Any - (14:1,2) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (17:1,5) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:[(item,,	[(item,=LF'@(18:1,6),'@(33:2,4)> - 16 - (18:1,6)
-            Markup span - Gen<None> - [	[(item,=LF'] - SpanEditHandler;Accepts:Any - (18:1,6) - Tokens:6
-                HtmlTokenType.WhiteSpace;[	];
-                HtmlTokenType.LeftBracket;[[];
-                HtmlTokenType.Text;[(item,];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(30:2,1)> - [Bar] - SpanEditHandler;Accepts:Any - (30:2,1) - Tokens:1
-                HtmlTokenType.Text;[Bar];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (33:2,4) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (34:2,5) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..37)::37 - [<a [(item,LF='Foo'	[(item,=LF'Bar' />]
+    MarkupTagBlock - [0..37)::37 - [<a [(item,LF='Foo'	[(item,=LF'Bar' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..18)::16 - [ [(item,LF='Foo']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..10)::7 - [[(item,] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                LeftBracket;[[];
+                Text;[(item,];
+            MarkupTextLiteral - [10..12)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            Equals;[=];
+            MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [14..17)::3
+                MarkupLiteralAttributeValue - [14..17)::3 - [Foo]
+                    MarkupTextLiteral - [14..17)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupAttributeBlock - [18..34)::16 - [	[(item,=LF'Bar']
+            MarkupTextLiteral - [18..19)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[	];
+            MarkupTextLiteral - [19..26)::7 - [[(item,] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                LeftBracket;[[];
+                Text;[(item,];
+            Equals;[=];
+            MarkupTextLiteral - [27..30)::3 - [LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                SingleQuote;['];
+            GenericBlock - [30..33)::3
+                MarkupLiteralAttributeValue - [30..33)::3 - [Bar]
+                    MarkupTextLiteral - [30..33)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+            MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [34..37)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace3.stree.txt
index 69accc1930..32cdc36a1c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace3.stree.txt
@@ -1,31 +1,40 @@
-Markup block - Gen<None> - 37 - (0:0,0)
-    Tag block - Gen<None> - 37 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:(click), (click)LF='@(2:0,2),'@(17:1,5)> - 16 - (2:0,2)
-            Markup span - Gen<None> - [ (click)LF='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:5
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[(click)];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(14:1,2)> - [Foo] - SpanEditHandler;Accepts:Any - (14:1,2) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (17:1,5) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:(click),	(click)=LF'@(18:1,6),'@(33:2,4)> - 16 - (18:1,6)
-            Markup span - Gen<None> - [	(click)=LF'] - SpanEditHandler;Accepts:Any - (18:1,6) - Tokens:5
-                HtmlTokenType.WhiteSpace;[	];
-                HtmlTokenType.Text;[(click)];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(30:2,1)> - [Bar] - SpanEditHandler;Accepts:Any - (30:2,1) - Tokens:1
-                HtmlTokenType.Text;[Bar];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (33:2,4) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (34:2,5) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..37)::37 - [<a (click)LF='Foo'	(click)=LF'Bar' />]
+    MarkupTagBlock - [0..37)::37 - [<a (click)LF='Foo'	(click)=LF'Bar' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..18)::16 - [ (click)LF='Foo']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..10)::7 - [(click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[(click)];
+            MarkupTextLiteral - [10..12)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            Equals;[=];
+            MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [14..17)::3
+                MarkupLiteralAttributeValue - [14..17)::3 - [Foo]
+                    MarkupTextLiteral - [14..17)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupAttributeBlock - [18..34)::16 - [	(click)=LF'Bar']
+            MarkupTextLiteral - [18..19)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[	];
+            MarkupTextLiteral - [19..26)::7 - [(click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[(click)];
+            Equals;[=];
+            MarkupTextLiteral - [27..30)::3 - [LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                SingleQuote;['];
+            GenericBlock - [30..33)::3
+                MarkupLiteralAttributeValue - [30..33)::3 - [Bar]
+                    MarkupTextLiteral - [30..33)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+            MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [34..37)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace4.stree.txt
index 727fc6259d..24a5075573 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace4.stree.txt
@@ -1,31 +1,40 @@
-Markup block - Gen<None> - 39 - (0:0,0)
-    Tag block - Gen<None> - 39 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:(^click), (^click)LF='@(2:0,2),'@(18:1,5)> - 17 - (2:0,2)
-            Markup span - Gen<None> - [ (^click)LF='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:5
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[(^click)];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(15:1,2)> - [Foo] - SpanEditHandler;Accepts:Any - (15:1,2) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (18:1,5) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:(^click),	(^click)=LF'@(19:1,6),'@(35:2,4)> - 17 - (19:1,6)
-            Markup span - Gen<None> - [	(^click)=LF'] - SpanEditHandler;Accepts:Any - (19:1,6) - Tokens:5
-                HtmlTokenType.WhiteSpace;[	];
-                HtmlTokenType.Text;[(^click)];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(32:2,1)> - [Bar] - SpanEditHandler;Accepts:Any - (32:2,1) - Tokens:1
-                HtmlTokenType.Text;[Bar];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (35:2,4) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (36:2,5) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..39)::39 - [<a (^click)LF='Foo'	(^click)=LF'Bar' />]
+    MarkupTagBlock - [0..39)::39 - [<a (^click)LF='Foo'	(^click)=LF'Bar' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..19)::17 - [ (^click)LF='Foo']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..11)::8 - [(^click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[(^click)];
+            MarkupTextLiteral - [11..13)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            Equals;[=];
+            MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [15..18)::3
+                MarkupLiteralAttributeValue - [15..18)::3 - [Foo]
+                    MarkupTextLiteral - [15..18)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupAttributeBlock - [19..36)::17 - [	(^click)=LF'Bar']
+            MarkupTextLiteral - [19..20)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[	];
+            MarkupTextLiteral - [20..28)::8 - [(^click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[(^click)];
+            Equals;[=];
+            MarkupTextLiteral - [29..32)::3 - [LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                SingleQuote;['];
+            GenericBlock - [32..35)::3
+                MarkupLiteralAttributeValue - [32..35)::3 - [Bar]
+                    MarkupTextLiteral - [32..35)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+            MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [36..39)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace5.stree.txt
index c974ea8f99..e25c7154e9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace5.stree.txt
@@ -1,31 +1,40 @@
-Markup block - Gen<None> - 43 - (0:0,0)
-    Tag block - Gen<None> - 43 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:*something, *somethingLF='@(2:0,2),'@(20:1,5)> - 19 - (2:0,2)
-            Markup span - Gen<None> - [ *somethingLF='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:5
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[*something];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(17:1,2)> - [Foo] - SpanEditHandler;Accepts:Any - (17:1,2) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (20:1,5) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:*something,	*something=LF'@(21:1,6),'@(39:2,4)> - 19 - (21:1,6)
-            Markup span - Gen<None> - [	*something=LF'] - SpanEditHandler;Accepts:Any - (21:1,6) - Tokens:5
-                HtmlTokenType.WhiteSpace;[	];
-                HtmlTokenType.Text;[*something];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(36:2,1)> - [Bar] - SpanEditHandler;Accepts:Any - (36:2,1) - Tokens:1
-                HtmlTokenType.Text;[Bar];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (39:2,4) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (40:2,5) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..43)::43 - [<a *somethingLF='Foo'	*something=LF'Bar' />]
+    MarkupTagBlock - [0..43)::43 - [<a *somethingLF='Foo'	*something=LF'Bar' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..21)::19 - [ *somethingLF='Foo']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..13)::10 - [*something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[*something];
+            MarkupTextLiteral - [13..15)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            Equals;[=];
+            MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [17..20)::3
+                MarkupLiteralAttributeValue - [17..20)::3 - [Foo]
+                    MarkupTextLiteral - [17..20)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupAttributeBlock - [21..40)::19 - [	*something=LF'Bar']
+            MarkupTextLiteral - [21..22)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[	];
+            MarkupTextLiteral - [22..32)::10 - [*something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[*something];
+            Equals;[=];
+            MarkupTextLiteral - [33..36)::3 - [LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                SingleQuote;['];
+            GenericBlock - [36..39)::3
+                MarkupLiteralAttributeValue - [36..39)::3 - [Bar]
+                    MarkupTextLiteral - [36..39)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+            MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [40..43)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace6.stree.txt
index ba777d7c25..bbef8bcd54 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_BeforeEqualWhitespace6.stree.txt
@@ -1,31 +1,40 @@
-Markup block - Gen<None> - 35 - (0:0,0)
-    Tag block - Gen<None> - 35 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:#local, #localLF='@(2:0,2),'@(16:1,5)> - 15 - (2:0,2)
-            Markup span - Gen<None> - [ #localLF='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:5
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[#local];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(13:1,2)> - [Foo] - SpanEditHandler;Accepts:Any - (13:1,2) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (16:1,5) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:#local,	#local=LF'@(17:1,6),'@(31:2,4)> - 15 - (17:1,6)
-            Markup span - Gen<None> - [	#local=LF'] - SpanEditHandler;Accepts:Any - (17:1,6) - Tokens:5
-                HtmlTokenType.WhiteSpace;[	];
-                HtmlTokenType.Text;[#local];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(28:2,1)> - [Bar] - SpanEditHandler;Accepts:Any - (28:2,1) - Tokens:1
-                HtmlTokenType.Text;[Bar];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (31:2,4) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (32:2,5) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..35)::35 - [<a #localLF='Foo'	#local=LF'Bar' />]
+    MarkupTagBlock - [0..35)::35 - [<a #localLF='Foo'	#local=LF'Bar' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..17)::15 - [ #localLF='Foo']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..9)::6 - [#local] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[#local];
+            MarkupTextLiteral - [9..11)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            Equals;[=];
+            MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [13..16)::3
+                MarkupLiteralAttributeValue - [13..16)::3 - [Foo]
+                    MarkupTextLiteral - [13..16)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupAttributeBlock - [17..32)::15 - [	#local=LF'Bar']
+            MarkupTextLiteral - [17..18)::1 - [	] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[	];
+            MarkupTextLiteral - [18..24)::6 - [#local] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[#local];
+            Equals;[=];
+            MarkupTextLiteral - [25..28)::3 - [LF'] - Gen<None> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                SingleQuote;['];
+            GenericBlock - [28..31)::3
+                MarkupLiteralAttributeValue - [28..31)::3 - [Bar]
+                    MarkupTextLiteral - [28..31)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+            MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [32..35)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace1.stree.txt
index 6d596846a4..992fccc9d1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace1.stree.txt
@@ -1,36 +1,44 @@
-Markup block - Gen<None> - 37 - (0:0,0)
-    Tag block - Gen<None> - 37 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:[item], LF  [item]='@(2:0,2),'@(18:1,13)> - 17 - (2:0,2)
-            Markup span - Gen<None> - [ LF  [item]='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:8
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.WhiteSpace;[  ];
-                HtmlTokenType.LeftBracket;[[];
-                HtmlTokenType.Text;[item];
-                HtmlTokenType.RightBracket;[]];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(15:1,10)> - [Foo] - SpanEditHandler;Accepts:Any - (15:1,10) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (18:1,13) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:[item],	LF[item]='@(19:1,14),'@(33:2,11)> - 15 - (19:1,14)
-            Markup span - Gen<None> - [	LF[item]='] - SpanEditHandler;Accepts:Any - (19:1,14) - Tokens:7
-                HtmlTokenType.WhiteSpace;[	];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.LeftBracket;[[];
-                HtmlTokenType.Text;[item];
-                HtmlTokenType.RightBracket;[]];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(30:2,8)> - [Bar] - SpanEditHandler;Accepts:Any - (30:2,8) - Tokens:1
-                HtmlTokenType.Text;[Bar];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (33:2,11) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (34:2,12) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..37)::37 - [<a LF  [item]='Foo'	LF[item]='Bar' />]
+    MarkupTagBlock - [0..37)::37 - [<a LF  [item]='Foo'	LF[item]='Bar' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..19)::17 - [ LF  [item]='Foo']
+            MarkupTextLiteral - [2..7)::5 - [ LF  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                NewLine;[LF];
+                Whitespace;[  ];
+            MarkupTextLiteral - [7..13)::6 - [[item]] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                LeftBracket;[[];
+                Text;[item];
+                RightBracket;[]];
+            Equals;[=];
+            MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [15..18)::3
+                MarkupLiteralAttributeValue - [15..18)::3 - [Foo]
+                    MarkupTextLiteral - [15..18)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupAttributeBlock - [19..34)::15 - [	LF[item]='Bar']
+            MarkupTextLiteral - [19..22)::3 - [	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[	];
+                NewLine;[LF];
+            MarkupTextLiteral - [22..28)::6 - [[item]] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                LeftBracket;[[];
+                Text;[item];
+                RightBracket;[]];
+            Equals;[=];
+            MarkupTextLiteral - [29..30)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [30..33)::3
+                MarkupLiteralAttributeValue - [30..33)::3 - [Bar]
+                    MarkupTextLiteral - [30..33)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+            MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [34..37)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace2.stree.txt
index 8b102f1cad..19f24c26fd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace2.stree.txt
@@ -1,34 +1,42 @@
-Markup block - Gen<None> - 39 - (0:0,0)
-    Tag block - Gen<None> - 39 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:[(item,, LF  [(item,='@(2:0,2),'@(19:1,14)> - 18 - (2:0,2)
-            Markup span - Gen<None> - [ LF  [(item,='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:7
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.WhiteSpace;[  ];
-                HtmlTokenType.LeftBracket;[[];
-                HtmlTokenType.Text;[(item,];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(16:1,11)> - [Foo] - SpanEditHandler;Accepts:Any - (16:1,11) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (19:1,14) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:[(item,,	LF[(item,='@(20:1,15),'@(35:2,12)> - 16 - (20:1,15)
-            Markup span - Gen<None> - [	LF[(item,='] - SpanEditHandler;Accepts:Any - (20:1,15) - Tokens:6
-                HtmlTokenType.WhiteSpace;[	];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.LeftBracket;[[];
-                HtmlTokenType.Text;[(item,];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(32:2,9)> - [Bar] - SpanEditHandler;Accepts:Any - (32:2,9) - Tokens:1
-                HtmlTokenType.Text;[Bar];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (35:2,12) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (36:2,13) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..39)::39 - [<a LF  [(item,='Foo'	LF[(item,='Bar' />]
+    MarkupTagBlock - [0..39)::39 - [<a LF  [(item,='Foo'	LF[(item,='Bar' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..20)::18 - [ LF  [(item,='Foo']
+            MarkupTextLiteral - [2..7)::5 - [ LF  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                NewLine;[LF];
+                Whitespace;[  ];
+            MarkupTextLiteral - [7..14)::7 - [[(item,] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                LeftBracket;[[];
+                Text;[(item,];
+            Equals;[=];
+            MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [16..19)::3
+                MarkupLiteralAttributeValue - [16..19)::3 - [Foo]
+                    MarkupTextLiteral - [16..19)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupAttributeBlock - [20..36)::16 - [	LF[(item,='Bar']
+            MarkupTextLiteral - [20..23)::3 - [	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[	];
+                NewLine;[LF];
+            MarkupTextLiteral - [23..30)::7 - [[(item,] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                LeftBracket;[[];
+                Text;[(item,];
+            Equals;[=];
+            MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [32..35)::3
+                MarkupLiteralAttributeValue - [32..35)::3 - [Bar]
+                    MarkupTextLiteral - [32..35)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+            MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [36..39)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace3.stree.txt
index d2e819f448..b540ce71ed 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace3.stree.txt
@@ -1,32 +1,40 @@
-Markup block - Gen<None> - 39 - (0:0,0)
-    Tag block - Gen<None> - 39 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:(click), LF  (click)='@(2:0,2),'@(19:1,14)> - 18 - (2:0,2)
-            Markup span - Gen<None> - [ LF  (click)='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:6
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.WhiteSpace;[  ];
-                HtmlTokenType.Text;[(click)];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(16:1,11)> - [Foo] - SpanEditHandler;Accepts:Any - (16:1,11) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (19:1,14) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:(click),	LF(click)='@(20:1,15),'@(35:2,12)> - 16 - (20:1,15)
-            Markup span - Gen<None> - [	LF(click)='] - SpanEditHandler;Accepts:Any - (20:1,15) - Tokens:5
-                HtmlTokenType.WhiteSpace;[	];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.Text;[(click)];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(32:2,9)> - [Bar] - SpanEditHandler;Accepts:Any - (32:2,9) - Tokens:1
-                HtmlTokenType.Text;[Bar];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (35:2,12) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (36:2,13) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..39)::39 - [<a LF  (click)='Foo'	LF(click)='Bar' />]
+    MarkupTagBlock - [0..39)::39 - [<a LF  (click)='Foo'	LF(click)='Bar' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..20)::18 - [ LF  (click)='Foo']
+            MarkupTextLiteral - [2..7)::5 - [ LF  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                NewLine;[LF];
+                Whitespace;[  ];
+            MarkupTextLiteral - [7..14)::7 - [(click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[(click)];
+            Equals;[=];
+            MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [16..19)::3
+                MarkupLiteralAttributeValue - [16..19)::3 - [Foo]
+                    MarkupTextLiteral - [16..19)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupAttributeBlock - [20..36)::16 - [	LF(click)='Bar']
+            MarkupTextLiteral - [20..23)::3 - [	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[	];
+                NewLine;[LF];
+            MarkupTextLiteral - [23..30)::7 - [(click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[(click)];
+            Equals;[=];
+            MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [32..35)::3
+                MarkupLiteralAttributeValue - [32..35)::3 - [Bar]
+                    MarkupTextLiteral - [32..35)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+            MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [36..39)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace4.stree.txt
index 7eea038365..e1492b44ec 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace4.stree.txt
@@ -1,32 +1,40 @@
-Markup block - Gen<None> - 41 - (0:0,0)
-    Tag block - Gen<None> - 41 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:(^click), LF  (^click)='@(2:0,2),'@(20:1,15)> - 19 - (2:0,2)
-            Markup span - Gen<None> - [ LF  (^click)='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:6
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.WhiteSpace;[  ];
-                HtmlTokenType.Text;[(^click)];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(17:1,12)> - [Foo] - SpanEditHandler;Accepts:Any - (17:1,12) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (20:1,15) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:(^click),	LF(^click)='@(21:1,16),'@(37:2,13)> - 17 - (21:1,16)
-            Markup span - Gen<None> - [	LF(^click)='] - SpanEditHandler;Accepts:Any - (21:1,16) - Tokens:5
-                HtmlTokenType.WhiteSpace;[	];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.Text;[(^click)];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(34:2,10)> - [Bar] - SpanEditHandler;Accepts:Any - (34:2,10) - Tokens:1
-                HtmlTokenType.Text;[Bar];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (37:2,13) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (38:2,14) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..41)::41 - [<a LF  (^click)='Foo'	LF(^click)='Bar' />]
+    MarkupTagBlock - [0..41)::41 - [<a LF  (^click)='Foo'	LF(^click)='Bar' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..21)::19 - [ LF  (^click)='Foo']
+            MarkupTextLiteral - [2..7)::5 - [ LF  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                NewLine;[LF];
+                Whitespace;[  ];
+            MarkupTextLiteral - [7..15)::8 - [(^click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[(^click)];
+            Equals;[=];
+            MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [17..20)::3
+                MarkupLiteralAttributeValue - [17..20)::3 - [Foo]
+                    MarkupTextLiteral - [17..20)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupAttributeBlock - [21..38)::17 - [	LF(^click)='Bar']
+            MarkupTextLiteral - [21..24)::3 - [	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[	];
+                NewLine;[LF];
+            MarkupTextLiteral - [24..32)::8 - [(^click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[(^click)];
+            Equals;[=];
+            MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [34..37)::3
+                MarkupLiteralAttributeValue - [34..37)::3 - [Bar]
+                    MarkupTextLiteral - [34..37)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+            MarkupTextLiteral - [37..38)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [38..41)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace5.stree.txt
index 22e2191b3a..d227e0fe28 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace5.stree.txt
@@ -1,32 +1,40 @@
-Markup block - Gen<None> - 45 - (0:0,0)
-    Tag block - Gen<None> - 45 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:*something, LF  *something='@(2:0,2),'@(22:1,17)> - 21 - (2:0,2)
-            Markup span - Gen<None> - [ LF  *something='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:6
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.WhiteSpace;[  ];
-                HtmlTokenType.Text;[*something];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(19:1,14)> - [Foo] - SpanEditHandler;Accepts:Any - (19:1,14) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (22:1,17) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:*something,	LF*something='@(23:1,18),'@(41:2,15)> - 19 - (23:1,18)
-            Markup span - Gen<None> - [	LF*something='] - SpanEditHandler;Accepts:Any - (23:1,18) - Tokens:5
-                HtmlTokenType.WhiteSpace;[	];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.Text;[*something];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(38:2,12)> - [Bar] - SpanEditHandler;Accepts:Any - (38:2,12) - Tokens:1
-                HtmlTokenType.Text;[Bar];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (41:2,15) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (42:2,16) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..45)::45 - [<a LF  *something='Foo'	LF*something='Bar' />]
+    MarkupTagBlock - [0..45)::45 - [<a LF  *something='Foo'	LF*something='Bar' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..23)::21 - [ LF  *something='Foo']
+            MarkupTextLiteral - [2..7)::5 - [ LF  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                NewLine;[LF];
+                Whitespace;[  ];
+            MarkupTextLiteral - [7..17)::10 - [*something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[*something];
+            Equals;[=];
+            MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [19..22)::3
+                MarkupLiteralAttributeValue - [19..22)::3 - [Foo]
+                    MarkupTextLiteral - [19..22)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupAttributeBlock - [23..42)::19 - [	LF*something='Bar']
+            MarkupTextLiteral - [23..26)::3 - [	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[	];
+                NewLine;[LF];
+            MarkupTextLiteral - [26..36)::10 - [*something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[*something];
+            Equals;[=];
+            MarkupTextLiteral - [37..38)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [38..41)::3
+                MarkupLiteralAttributeValue - [38..41)::3 - [Bar]
+                    MarkupTextLiteral - [38..41)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+            MarkupTextLiteral - [41..42)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [42..45)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace6.stree.txt
index 03356f4da8..c5195535fe 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/SymbolBoundAttributes_Whitespace6.stree.txt
@@ -1,32 +1,40 @@
-Markup block - Gen<None> - 37 - (0:0,0)
-    Tag block - Gen<None> - 37 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:#local, LF  #local='@(2:0,2),'@(18:1,13)> - 17 - (2:0,2)
-            Markup span - Gen<None> - [ LF  #local='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:6
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.WhiteSpace;[  ];
-                HtmlTokenType.Text;[#local];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(15:1,10)> - [Foo] - SpanEditHandler;Accepts:Any - (15:1,10) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (18:1,13) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:#local,	LF#local='@(19:1,14),'@(33:2,11)> - 15 - (19:1,14)
-            Markup span - Gen<None> - [	LF#local='] - SpanEditHandler;Accepts:Any - (19:1,14) - Tokens:5
-                HtmlTokenType.WhiteSpace;[	];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.Text;[#local];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(30:2,8)> - [Bar] - SpanEditHandler;Accepts:Any - (30:2,8) - Tokens:1
-                HtmlTokenType.Text;[Bar];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (33:2,11) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (34:2,12) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..37)::37 - [<a LF  #local='Foo'	LF#local='Bar' />]
+    MarkupTagBlock - [0..37)::37 - [<a LF  #local='Foo'	LF#local='Bar' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..19)::17 - [ LF  #local='Foo']
+            MarkupTextLiteral - [2..7)::5 - [ LF  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                NewLine;[LF];
+                Whitespace;[  ];
+            MarkupTextLiteral - [7..13)::6 - [#local] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[#local];
+            Equals;[=];
+            MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [15..18)::3
+                MarkupLiteralAttributeValue - [15..18)::3 - [Foo]
+                    MarkupTextLiteral - [15..18)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupAttributeBlock - [19..34)::15 - [	LF#local='Bar']
+            MarkupTextLiteral - [19..22)::3 - [	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[	];
+                NewLine;[LF];
+            MarkupTextLiteral - [22..28)::6 - [#local] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[#local];
+            Equals;[=];
+            MarkupTextLiteral - [29..30)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [30..33)::3
+                MarkupLiteralAttributeValue - [30..33)::3 - [Bar]
+                    MarkupTextLiteral - [30..33)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Bar];
+            MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [34..37)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInBlock.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInBlock.cspans.txt
index 5968c9dca7..7fe8758006 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInBlock.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInBlock.cspans.txt
@@ -1,5 +1,5 @@
 Markup span at (0:0,0 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [20] )
 Markup span at (6:0,6 [7] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [11] )
 Transition span at (13:0,13 [1] ) (Accepts:None) - Parent: Expression block at (13:0,13 [4] )
-Code span at (14:0,14 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (13:0,13 [4] )
+Code span at (14:0,14 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (13:0,13 [4] )
 Markup span at (17:0,17 [3] ) (Accepts:None) - Parent: Tag block at (0:0,0 [20] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInBlock.stree.txt
index 8dc0a20d77..d040f4101e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInBlock.stree.txt
@@ -1,20 +1,26 @@
-Markup block - Gen<None> - 20 - (0:0,0)
-    Tag block - Gen<None> - 20 - (0:0,0)
-        Markup span - Gen<Markup> - [<input] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[input];
-        Markup block - Gen<Attr:value, value=@(6:0,6),@(17:0,17)> - 11 - (6:0,6)
-            Markup span - Gen<None> - [ value=] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[value];
-                HtmlTokenType.Equals;[=];
-            Markup block - Gen<DynAttr:@(13:0,13)> - 4 - (13:0,13)
-                Expression block - Gen<Expr> - 4 - (13:0,13)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (14:0,14) - Tokens:1
-                        CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..20)::20 - [<input value=@foo />]
+    MarkupTagBlock - [0..20)::20 - [<input value=@foo />]
+        MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[input];
+        MarkupAttributeBlock - [6..17)::11 - [ value=@foo]
+            MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [7..12)::5 - [value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[value];
+            Equals;[=];
+            GenericBlock - [13..17)::4
+                MarkupDynamicAttributeValue - [13..17)::4 - [@foo]
+                    GenericBlock - [13..17)::4
+                        CSharpCodeBlock - [13..17)::4
+                            CSharpImplicitExpression - [13..17)::4
+                                CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [14..17)::3
+                                    CSharpCodeBlock - [14..17)::3
+                                        CSharpExpressionLiteral - [14..17)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[foo];
+        MarkupTextLiteral - [17..20)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInDocument.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInDocument.cspans.txt
index 2d429bad42..f2a943403f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInDocument.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInDocument.cspans.txt
@@ -1,5 +1,5 @@
 Markup span at (0:0,0 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [20] )
 Markup span at (6:0,6 [7] ) (Accepts:Any) - Parent: Markup block at (6:0,6 [11] )
 Transition span at (13:0,13 [1] ) (Accepts:None) - Parent: Expression block at (13:0,13 [4] )
-Code span at (14:0,14 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (13:0,13 [4] )
+Code span at (14:0,14 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (13:0,13 [4] )
 Markup span at (17:0,17 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [20] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInDocument.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInDocument.stree.txt
index c4bde27527..98799bc17d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInDocument.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedAttributeWithCodeWithSpacesInDocument.stree.txt
@@ -1,20 +1,27 @@
-Markup block - Gen<None> - 20 - (0:0,0)
-    Tag block - Gen<None> - 20 - (0:0,0)
-        Markup span - Gen<Markup> - [<input] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[input];
-        Markup block - Gen<Attr:value, value=@(6:0,6),@(17:0,17)> - 11 - (6:0,6)
-            Markup span - Gen<None> - [ value=] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[value];
-                HtmlTokenType.Equals;[=];
-            Markup block - Gen<DynAttr:@(13:0,13)> - 4 - (13:0,13)
-                Expression block - Gen<Expr> - 4 - (13:0,13)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (14:0,14) - Tokens:1
-                        CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..20)::20 - [<input value=@foo />]
+    MarkupBlock - [0..20)::20
+        MarkupTagBlock - [0..20)::20 - [<input value=@foo />]
+            MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+            MarkupAttributeBlock - [6..17)::11 - [ value=@foo]
+                MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [7..12)::5 - [value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[value];
+                Equals;[=];
+                GenericBlock - [13..17)::4
+                    MarkupDynamicAttributeValue - [13..17)::4 - [@foo]
+                        GenericBlock - [13..17)::4
+                            CSharpCodeBlock - [13..17)::4
+                                CSharpImplicitExpression - [13..17)::4
+                                    CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [14..17)::3
+                                        CSharpCodeBlock - [14..17)::3
+                                            CSharpExpressionLiteral - [14..17)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                Identifier;[foo];
+            MarkupTextLiteral - [17..20)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedLiteralAttribute.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedLiteralAttribute.stree.txt
index e5f4e3ab7e..7d8ed2ebb9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedLiteralAttribute.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/UnquotedLiteralAttribute.stree.txt
@@ -1,24 +1,29 @@
-Markup block - Gen<None> - 22 - (0:0,0)
-    Tag block - Gen<None> - 22 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:href, href=@(2:0,2),@(11:0,11)> - 9 - (2:0,2)
-            Markup span - Gen<None> - [ href=] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[href];
-                HtmlTokenType.Equals;[=];
-            Markup span - Gen<LitAttr:@(8:0,8)> - [Foo] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-        Markup block - Gen<None> - 4 - (11:0,11)
-            Markup span - Gen<Markup> - [ Bar] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:2
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[Bar];
-        Markup block - Gen<None> - 4 - (15:0,15)
-            Markup span - Gen<Markup> - [ Baz] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:2
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[Baz];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..22)::22 - [<a href=Foo Bar Baz />]
+    MarkupTagBlock - [0..22)::22 - [<a href=Foo Bar Baz />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..11)::9 - [ href=Foo]
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..7)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[href];
+            Equals;[=];
+            GenericBlock - [8..11)::3
+                MarkupLiteralAttributeValue - [8..11)::3 - [Foo]
+                    MarkupTextLiteral - [8..11)::3 - [Foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+        MarkupMinimizedAttributeBlock - [11..15)::4 - [ Bar]
+            MarkupTextLiteral - [11..12)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [12..15)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Bar];
+        MarkupMinimizedAttributeBlock - [15..19)::4 - [ Baz]
+            MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [16..19)::3 - [Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Baz];
+        MarkupTextLiteral - [19..22)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.cspans.txt
index adaa5e49ff..f1da53c6d4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.cspans.txt
@@ -1,7 +1,7 @@
 Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [27] )
 Markup span at (2:0,2 [7] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [22] )
 Transition span at (9:0,9 [1] ) (Accepts:None) - Parent: Expression block at (9:0,9 [4] )
-Code span at (10:0,10 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (9:0,9 [4] )
+Code span at (10:0,10 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (9:0,9 [4] )
 Markup span at (13:0,13 [10] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [22] )
 Markup span at (23:0,23 [1] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [22] )
 Markup span at (24:0,24 [3] ) (Accepts:None) - Parent: Tag block at (0:0,0 [27] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.stree.txt
index c614c2d5e1..389babea53 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/VirtualPathAttributesWorkWithConditionalAttributes.stree.txt
@@ -1,30 +1,39 @@
-Markup block - Gen<None> - 27 - (0:0,0)
-    Tag block - Gen<None> - 27 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:href, href='@(2:0,2),'@(23:0,23)> - 22 - (2:0,2)
-            Markup span - Gen<None> - [ href='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[href];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup block - Gen<DynAttr:@(9:0,9)> - 4 - (9:0,9)
-                Expression block - Gen<Expr> - 4 - (9:0,9)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (10:0,10) - Tokens:1
-                        CSharpTokenType.Identifier;[foo];
-            Markup span - Gen<LitAttr: @(13:0,13)> - [ ~/Foo/Bar] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:6
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[~];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[Foo];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[Bar];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..27)::27 - [<a href='@foo ~/Foo/Bar' />]
+    MarkupTagBlock - [0..27)::27 - [<a href='@foo ~/Foo/Bar' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..24)::22 - [ href='@foo ~/Foo/Bar']
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..7)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[href];
+            Equals;[=];
+            MarkupTextLiteral - [8..9)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [9..23)::14
+                MarkupDynamicAttributeValue - [9..13)::4 - [@foo]
+                    GenericBlock - [9..13)::4
+                        CSharpCodeBlock - [9..13)::4
+                            CSharpImplicitExpression - [9..13)::4
+                                CSharpTransition - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [10..13)::3
+                                    CSharpCodeBlock - [10..13)::3
+                                        CSharpExpressionLiteral - [10..13)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[foo];
+                MarkupLiteralAttributeValue - [13..23)::10 - [ ~/Foo/Bar]
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..23)::9 - [~/Foo/Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[~];
+                        ForwardSlash;[/];
+                        Text;[Foo];
+                        ForwardSlash;[/];
+                        Text;[Bar];
+            MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [24..27)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/WhitespaceAndNewLinePrecedingAttribute.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/WhitespaceAndNewLinePrecedingAttribute.stree.txt
index 7a6ded8c5b..142355d4d7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/WhitespaceAndNewLinePrecedingAttribute.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlAttributeTest/WhitespaceAndNewLinePrecedingAttribute.stree.txt
@@ -1,20 +1,24 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Tag block - Gen<None> - 19 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:href, 	LFhref='@(2:0,2),'@(15:1,9)> - 14 - (2:0,2)
-            Markup span - Gen<None> - [ 	LFhref='] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:5
-                HtmlTokenType.WhiteSpace;[ 	];
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.Text;[href];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(12:1,6)> - [Foo] - SpanEditHandler;Accepts:Any - (12:1,6) - Tokens:1
-                HtmlTokenType.Text;[Foo];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (15:1,9) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (16:1,10) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..19)::19 - [<a 	LFhref='Foo' />]
+    MarkupTagBlock - [0..19)::19 - [<a 	LFhref='Foo' />]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..16)::14 - [ 	LFhref='Foo']
+            MarkupTextLiteral - [2..6)::4 - [ 	LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ 	];
+                NewLine;[LF];
+            MarkupTextLiteral - [6..10)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[href];
+            Equals;[=];
+            MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [12..15)::3
+                MarkupLiteralAttributeValue - [12..15)::3 - [Foo]
+                    MarkupTextLiteral - [12..15)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Foo];
+            MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [16..19)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AcceptsEmptyTextTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AcceptsEmptyTextTag.stree.txt
index e83825eb68..3822a0dbc8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AcceptsEmptyTextTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AcceptsEmptyTextTag.stree.txt
@@ -1,7 +1,7 @@
-Markup block - Gen<None> - 7 - (0:0,0)
-    Tag block - Gen<None> - 7 - (0:0,0)
-        Transition span - Gen<None> - [<text/>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[text];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..7)::7 - [<text/>]
+    MarkupTagBlock - [0..7)::7 - [<text/>]
+        MarkupTransition - [0..7)::7 - Gen<None> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[text];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AcceptsTextTagAsOuterTagButDoesNotRender.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AcceptsTextTagAsOuterTagButDoesNotRender.stree.txt
index 7ed755b521..974b315541 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AcceptsTextTagAsOuterTagButDoesNotRender.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AcceptsTextTagAsOuterTagButDoesNotRender.stree.txt
@@ -1,25 +1,25 @@
-Markup block - Gen<None> - 30 - (0:0,0)
-    Tag block - Gen<None> - 6 - (0:0,0)
-        Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[text];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [Foo Bar ] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:4
-        HtmlTokenType.Text;[Foo];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[Bar];
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<None> - 5 - (14:0,14)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ Baz] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:2
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[Baz];
-    Tag block - Gen<None> - 7 - (23:0,23)
-        Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[text];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..30)::30 - [<text>Foo Bar <foo> Baz</text>]
+    MarkupTagBlock - [0..6)::6 - [<text>]
+        MarkupTransition - [0..6)::6 - Gen<None> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[text];
+            CloseAngle;[>];
+    MarkupTextLiteral - [6..14)::8 - [Foo Bar ] - Gen<Markup> - SpanEditHandler;Accepts:None
+        Text;[Foo];
+        Whitespace;[ ];
+        Text;[Bar];
+        Whitespace;[ ];
+    MarkupTagBlock - [14..19)::5 - [<foo>]
+        MarkupTextLiteral - [14..19)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTextLiteral - [19..23)::4 - [ Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+        Text;[Baz];
+    MarkupTagBlock - [23..30)::7 - [</text>]
+        MarkupTransition - [23..30)::7 - Gen<None> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[text];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfDoubleQuoted.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfDoubleQuoted.stree.txt
index 934ca460c7..9428377703 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfDoubleQuoted.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfDoubleQuoted.stree.txt
@@ -1,30 +1,34 @@
-Markup block - Gen<None> - 26 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 15 - (5:0,5)
-        Markup span - Gen<Markup> - [<bar] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[bar];
-        Markup block - Gen<Attr:baz, baz="@(9:0,9),"@(16:0,16)> - 8 - (9:0,9)
-            Markup span - Gen<None> - [ baz="] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[baz];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<LitAttr:@(15:0,15)> - [>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-                HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                HtmlTokenType.DoubleQuote;["];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (20:0,20)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..26)::26 - [<foo><bar baz=">" /></foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTagBlock - [5..20)::15 - [<bar baz=">" />]
+        MarkupTextLiteral - [5..9)::4 - [<bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[bar];
+        MarkupAttributeBlock - [9..17)::8 - [ baz=">"]
+            MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [10..13)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[baz];
+            Equals;[=];
+            MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                DoubleQuote;["];
+            GenericBlock - [15..16)::1
+                MarkupLiteralAttributeValue - [15..16)::1 - [>]
+                    MarkupTextLiteral - [15..16)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        CloseAngle;[>];
+            MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                DoubleQuote;["];
+        MarkupTextLiteral - [17..20)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
+    MarkupTagBlock - [20..26)::6 - [</foo>]
+        MarkupTextLiteral - [20..26)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfSingleQuoted.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfSingleQuoted.stree.txt
index 6f33ad609c..3195045ef3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfSingleQuoted.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsCloseAngleBracketInAttributeValueIfSingleQuoted.stree.txt
@@ -1,30 +1,34 @@
-Markup block - Gen<None> - 26 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 15 - (5:0,5)
-        Markup span - Gen<Markup> - [<bar] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[bar];
-        Markup block - Gen<Attr:baz, baz='@(9:0,9),'@(16:0,16)> - 8 - (9:0,9)
-            Markup span - Gen<None> - [ baz='] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[baz];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(15:0,15)> - [>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-                HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (20:0,20)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..26)::26 - [<foo><bar baz='>' /></foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTagBlock - [5..20)::15 - [<bar baz='>' />]
+        MarkupTextLiteral - [5..9)::4 - [<bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[bar];
+        MarkupAttributeBlock - [9..17)::8 - [ baz='>']
+            MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [10..13)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[baz];
+            Equals;[=];
+            MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [15..16)::1
+                MarkupLiteralAttributeValue - [15..16)::1 - [>]
+                    MarkupTextLiteral - [15..16)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        CloseAngle;[>];
+            MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [17..20)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
+    MarkupTagBlock - [20..26)::6 - [</foo>]
+        MarkupTextLiteral - [20..26)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfDoubleQuoted.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfDoubleQuoted.stree.txt
index 85cb234a79..f6fae621cd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfDoubleQuoted.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfDoubleQuoted.stree.txt
@@ -1,34 +1,38 @@
-Markup block - Gen<None> - 30 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 13 - (5:0,5)
-        Markup span - Gen<Markup> - [<bar] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[bar];
-        Markup block - Gen<Attr:baz, baz="@(9:0,9),"@(16:0,16)> - 8 - (9:0,9)
-            Markup span - Gen<None> - [ baz="] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[baz];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<LitAttr:@(15:0,15)> - [/] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-                HtmlTokenType.ForwardSlash;[/];
-            Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                HtmlTokenType.DoubleQuote;["];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (18:0,18)
-        Markup span - Gen<Markup> - [</bar>] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[bar];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (24:0,24)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..30)::30 - [<foo><bar baz="/"></bar></foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTagBlock - [5..18)::13 - [<bar baz="/">]
+        MarkupTextLiteral - [5..9)::4 - [<bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[bar];
+        MarkupAttributeBlock - [9..17)::8 - [ baz="/"]
+            MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [10..13)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[baz];
+            Equals;[=];
+            MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                DoubleQuote;["];
+            GenericBlock - [15..16)::1
+                MarkupLiteralAttributeValue - [15..16)::1 - [/]
+                    MarkupTextLiteral - [15..16)::1 - [/] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        ForwardSlash;[/];
+            MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                DoubleQuote;["];
+        MarkupTextLiteral - [17..18)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            CloseAngle;[>];
+    MarkupTagBlock - [18..24)::6 - [</bar>]
+        MarkupTextLiteral - [18..24)::6 - [</bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[bar];
+            CloseAngle;[>];
+    MarkupTagBlock - [24..30)::6 - [</foo>]
+        MarkupTextLiteral - [24..30)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfSingleQuoted.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfSingleQuoted.stree.txt
index da1415d360..9e465a5608 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfSingleQuoted.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsSlashInAttributeValueIfSingleQuoted.stree.txt
@@ -1,34 +1,38 @@
-Markup block - Gen<None> - 30 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 13 - (5:0,5)
-        Markup span - Gen<Markup> - [<bar] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[bar];
-        Markup block - Gen<Attr:baz, baz='@(9:0,9),'@(16:0,16)> - 8 - (9:0,9)
-            Markup span - Gen<None> - [ baz='] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[baz];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(15:0,15)> - [/] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-                HtmlTokenType.ForwardSlash;[/];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (18:0,18)
-        Markup span - Gen<Markup> - [</bar>] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[bar];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (24:0,24)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..30)::30 - [<foo><bar baz='/'></bar></foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTagBlock - [5..18)::13 - [<bar baz='/'>]
+        MarkupTextLiteral - [5..9)::4 - [<bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[bar];
+        MarkupAttributeBlock - [9..17)::8 - [ baz='/']
+            MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [10..13)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[baz];
+            Equals;[=];
+            MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+            GenericBlock - [15..16)::1
+                MarkupLiteralAttributeValue - [15..16)::1 - [/]
+                    MarkupTextLiteral - [15..16)::1 - [/] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        ForwardSlash;[/];
+            MarkupTextLiteral - [16..17)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                SingleQuote;['];
+        MarkupTextLiteral - [17..18)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            CloseAngle;[>];
+    MarkupTagBlock - [18..24)::6 - [</bar>]
+        MarkupTextLiteral - [18..24)::6 - [</bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[bar];
+            CloseAngle;[>];
+    MarkupTagBlock - [24..30)::6 - [</foo>]
+        MarkupTextLiteral - [24..30)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsStartAndEndTagsToDifferInCase.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsStartAndEndTagsToDifferInCase.stree.txt
index 4a662fb518..9e5a17d162 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsStartAndEndTagsToDifferInCase.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsStartAndEndTagsToDifferInCase.stree.txt
@@ -1,25 +1,25 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Tag block - Gen<None> - 4 - (0:0,0)
-        Markup span - Gen<Markup> - [<li>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[li];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 3 - (4:0,4)
-        Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:1
-        HtmlTokenType.Text;[Foo];
-    Tag block - Gen<None> - 4 - (10:0,10)
-        Markup span - Gen<Markup> - [</P>] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[P];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 5 - (14:0,14)
-        Markup span - Gen<Markup> - [</lI>] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[lI];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..19)::19 - [<li><p>Foo</P></lI>]
+    MarkupTagBlock - [0..4)::4 - [<li>]
+        MarkupTextLiteral - [0..4)::4 - [<li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[li];
+            CloseAngle;[>];
+    MarkupTagBlock - [4..7)::3 - [<p>]
+        MarkupTextLiteral - [4..7)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[p];
+            CloseAngle;[>];
+    MarkupTextLiteral - [7..10)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Text;[Foo];
+    MarkupTagBlock - [10..14)::4 - [</P>]
+        MarkupTextLiteral - [10..14)::4 - [</P>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[P];
+            CloseAngle;[>];
+    MarkupTagBlock - [14..19)::5 - [</lI>]
+        MarkupTextLiteral - [14..19)::5 - [</lI>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[lI];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsUnclosedTagsAsLongAsItCanRecoverToAnExpectedEndTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsUnclosedTagsAsLongAsItCanRecoverToAnExpectedEndTag.stree.txt
index 28a792044b..a766c43522 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsUnclosedTagsAsLongAsItCanRecoverToAnExpectedEndTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/AllowsUnclosedTagsAsLongAsItCanRecoverToAnExpectedEndTag.stree.txt
@@ -1,22 +1,22 @@
-Markup block - Gen<None> - 21 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 5 - (5:0,5)
-        Markup span - Gen<Markup> - [<bar>] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[bar];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 5 - (10:0,10)
-        Markup span - Gen<Markup> - [<baz>] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[baz];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (15:0,15)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..21)::21 - [<foo><bar><baz></foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTagBlock - [5..10)::5 - [<bar>]
+        MarkupTextLiteral - [5..10)::5 - [<bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[bar];
+            CloseAngle;[>];
+    MarkupTagBlock - [10..15)::5 - [<baz>]
+        MarkupTextLiteral - [10..15)::5 - [<baz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[baz];
+            CloseAngle;[>];
+    MarkupTagBlock - [15..21)::6 - [</foo>]
+        MarkupTextLiteral - [15..21)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/CanHandleSelfClosingTagsWithinBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/CanHandleSelfClosingTagsWithinBlock.stree.txt
index 8479ad1646..6b5ee29774 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/CanHandleSelfClosingTagsWithinBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/CanHandleSelfClosingTagsWithinBlock.stree.txt
@@ -1,19 +1,19 @@
-Markup block - Gen<None> - 18 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (5:0,5)
-        Markup span - Gen<Markup> - [<bar />] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:5
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[bar];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (12:0,12)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..18)::18 - [<foo><bar /></foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTagBlock - [5..12)::7 - [<bar />]
+        MarkupTextLiteral - [5..12)::7 - [<bar />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[bar];
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
+    MarkupTagBlock - [12..18)::6 - [</foo>]
+        MarkupTextLiteral - [12..18)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt
index e8021898d2..8d9c25cecb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt
@@ -1,29 +1,29 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<div>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [Foo ] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:2
-        HtmlTokenType.Text;[Foo];
-        HtmlTokenType.WhiteSpace;[ ];
-    Statement block - Gen<None> - 12 - (9:0,9)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Stmt> - [if(true) {}] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:7
-            CSharpTokenType.Keyword;[if];
-            CSharpTokenType.LeftParenthesis;[(];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.RightParenthesis;[)];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.LeftBrace;[{];
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [ Bar] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:2
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[Bar];
-    Tag block - Gen<None> - 6 - (25:0,25)
-        Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..31)::31 - [<div>Foo @if(true) {} Bar</div>]
+    MarkupTagBlock - [0..5)::5 - [<div>]
+        MarkupTextLiteral - [0..5)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[div];
+            CloseAngle;[>];
+    MarkupTextLiteral - [5..9)::4 - [Foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Text;[Foo];
+        Whitespace;[ ];
+    CSharpCodeBlock - [9..21)::12
+        CSharpTransition - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpStatementLiteral - [10..21)::11 - [if(true) {}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+            Keyword;[if];
+            LeftParenthesis;[(];
+            Keyword;[true];
+            RightParenthesis;[)];
+            Whitespace;[ ];
+            LeftBrace;[{];
+            RightBrace;[}];
+    MarkupTextLiteral - [21..25)::4 - [ Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+        Text;[Bar];
+    MarkupTagBlock - [25..31)::6 - [</div>]
+        MarkupTextLiteral - [25..31)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[div];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/DoesNotConsiderPsuedoTagWithinMarkupBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/DoesNotConsiderPsuedoTagWithinMarkupBlock.stree.txt
index f3271550fe..6b28652108 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/DoesNotConsiderPsuedoTagWithinMarkupBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/DoesNotConsiderPsuedoTagWithinMarkupBlock.stree.txt
@@ -1,28 +1,28 @@
-Markup block - Gen<None> - 28 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (5:0,5)
-        Markup span - Gen<Markup> - [<text>] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[text];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 5 - (11:0,11)
-        Markup span - Gen<Markup> - [<bar>] - SpanEditHandler;Accepts:None - (11:0,11) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[bar];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (16:0,16)
-        Markup span - Gen<Markup> - [</bar>] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[bar];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (22:0,22)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..28)::28 - [<foo><text><bar></bar></foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTagBlock - [5..11)::6 - [<text>]
+        MarkupTextLiteral - [5..11)::6 - [<text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[text];
+            CloseAngle;[>];
+    MarkupTagBlock - [11..16)::5 - [<bar>]
+        MarkupTextLiteral - [11..16)::5 - [<bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[bar];
+            CloseAngle;[>];
+    MarkupTagBlock - [16..22)::6 - [</bar>]
+        MarkupTextLiteral - [16..22)::6 - [</bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[bar];
+            CloseAngle;[>];
+    MarkupTagBlock - [22..28)::6 - [</foo>]
+        MarkupTextLiteral - [22..28)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/DoesNotTerminateXMLProcInstrAtCloseAngleUnlessPreceededByQuestionMark.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/DoesNotTerminateXMLProcInstrAtCloseAngleUnlessPreceededByQuestionMark.stree.txt
index ca353a1761..b8cb245113 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/DoesNotTerminateXMLProcInstrAtCloseAngleUnlessPreceededByQuestionMark.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/DoesNotTerminateXMLProcInstrAtCloseAngleUnlessPreceededByQuestionMark.stree.txt
@@ -1,25 +1,25 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<?xml foo bar> baz?>] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:12
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.QuestionMark;[?];
-        HtmlTokenType.Text;[xml];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[foo];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[bar];
-        HtmlTokenType.CloseAngle;[>];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[baz];
-        HtmlTokenType.QuestionMark;[?];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (25:0,25)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..31)::31 - [<foo><?xml foo bar> baz?></foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTextLiteral - [5..25)::20 - [<?xml foo bar> baz?>] - Gen<Markup> - SpanEditHandler;Accepts:None
+        OpenAngle;[<];
+        QuestionMark;[?];
+        Text;[xml];
+        Whitespace;[ ];
+        Text;[foo];
+        Whitespace;[ ];
+        Text;[bar];
+        CloseAngle;[>];
+        Whitespace;[ ];
+        Text;[baz];
+        QuestionMark;[?];
+        CloseAngle;[>];
+    MarkupTagBlock - [25..31)::6 - [</foo>]
+        MarkupTextLiteral - [25..31)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.stree.txt
index 8a0dce6d3c..cc4bd180b3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleAtEof.stree.txt
@@ -1,14 +1,20 @@
-Markup block - Gen<None> - 5 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 5 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (2:0,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 1 - (4:1,0)
-            Tag block - Gen<None> - 1 - (4:1,0)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (4:1,0) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
+RazorDocument - [0..5)::5 - [@{LF<]
+    MarkupBlock - [0..5)::5
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..5)::5
+            CSharpStatement - [0..5)::5
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..5)::4
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..5)::3
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [4..5)::1
+                            MarkupTagBlock - [4..5)::1 - [<]
+                                MarkupTextLiteral - [4..5)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                    RazorMetaCode - [5..5)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.stree.txt
index 63026214bc..5542db4596 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HandlesOpenAngleWithProperTagFollowingIt.stree.txt
@@ -1,24 +1,30 @@
-Markup block - Gen<None> - 14 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 14 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (2:0,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 3 - (4:1,0)
-            Tag block - Gen<None> - 3 - (4:1,0)
-                Markup span - Gen<Markup> - [<LF] - SpanEditHandler;Accepts:Any - (4:1,0) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 7 - (7:2,0)
-            Tag block - Gen<None> - 7 - (7:2,0)
-                Markup span - Gen<Markup> - [</html>] - SpanEditHandler;Accepts:None - (7:2,0) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[html];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (14:2,7) - Tokens:1
-            CSharpTokenType.Unknown;[];
+RazorDocument - [0..14)::14 - [@{LF<LF</html>]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..14)::14
+            CSharpStatement - [0..14)::14
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..14)::13
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..14)::12
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [4..7)::3
+                            MarkupTagBlock - [4..7)::3 - [<LF]
+                                MarkupTextLiteral - [4..7)::3 - [<LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    NewLine;[LF];
+                        MarkupBlock - [7..14)::7
+                            MarkupTagBlock - [7..14)::7 - [</html>]
+                                MarkupTextLiteral - [7..14)::7 - [</html>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[html];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [14..14)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [14..14)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HandlesUnbalancedTripleDashHTMLComments.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HandlesUnbalancedTripleDashHTMLComments.cspans.txt
index fc99732771..aaf4fd258d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HandlesUnbalancedTripleDashHTMLComments.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HandlesUnbalancedTripleDashHTMLComments.cspans.txt
@@ -4,7 +4,7 @@ MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0
 Code span at (2:0,2 [2] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [68] )
 Markup span at (4:1,0 [4] ) (Accepts:Any) - Parent: Markup block at (4:1,0 [63] )
 Markup span at (8:1,4 [4] ) (Accepts:None) - Parent: HtmlComment block at (8:1,4 [57] )
-Markup span at (12:1,8 [50] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (8:1,4 [57] )
+Markup span at (12:1,8 [50] ) (Accepts:Whitespace) - Parent: HtmlComment block at (8:1,4 [57] )
 Markup span at (62:1,58 [3] ) (Accepts:None) - Parent: HtmlComment block at (8:1,4 [57] )
 Markup span at (65:1,61 [2] ) (Accepts:None) - Parent: Markup block at (4:1,0 [63] )
 Code span at (67:2,0 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [68] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HandlesUnbalancedTripleDashHTMLComments.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HandlesUnbalancedTripleDashHTMLComments.stree.txt
index 34516b832c..d6c3b6a1b3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HandlesUnbalancedTripleDashHTMLComments.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HandlesUnbalancedTripleDashHTMLComments.stree.txt
@@ -1,52 +1,56 @@
-Markup block - Gen<None> - 68 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 68 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (2:0,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 63 - (4:1,0)
-            Markup span - Gen<Markup> - [    ] - SpanEditHandler;Accepts:Any - (4:1,0) - Tokens:1
-                HtmlTokenType.WhiteSpace;[    ];
-            HtmlComment block - Gen<None> - 57 - (8:1,4)
-                Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (8:1,4) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Bang;[!];
-                    HtmlTokenType.DoubleHyphen;[--];
-                Markup span - Gen<Markup> - [ Hello, I'm a comment that shouldn't break razor -] - SpanEditHandler;Accepts:WhiteSpace - (12:1,8) - Tokens:22
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[Hello,];
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[I];
-                    HtmlTokenType.SingleQuote;['];
-                    HtmlTokenType.Text;[m];
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[a];
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[comment];
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[that];
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[shouldn];
-                    HtmlTokenType.SingleQuote;['];
-                    HtmlTokenType.Text;[t];
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[break];
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[razor];
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[-];
-                Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (62:1,58) - Tokens:2
-                    HtmlTokenType.DoubleHyphen;[--];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (65:1,61) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (67:2,0) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (67:2,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (68:2,1) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..68)::68 - [@{LF    <!-- Hello, I'm a comment that shouldn't break razor --->LF}]
+    MarkupBlock - [0..68)::68
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..68)::68
+            CSharpStatement - [0..68)::68
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..68)::67
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..67)::65
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [4..67)::63
+                            MarkupTextLiteral - [4..8)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[    ];
+                            MarkupCommentBlock - [8..65)::57
+                                MarkupTextLiteral - [8..12)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Bang;[!];
+                                    DoubleHyphen;[--];
+                                MarkupTextLiteral - [12..62)::50 - [ Hello, I'm a comment that shouldn't break razor -] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                                    Whitespace;[ ];
+                                    Text;[Hello,];
+                                    Whitespace;[ ];
+                                    Text;[I];
+                                    SingleQuote;['];
+                                    Text;[m];
+                                    Whitespace;[ ];
+                                    Text;[a];
+                                    Whitespace;[ ];
+                                    Text;[comment];
+                                    Whitespace;[ ];
+                                    Text;[that];
+                                    Whitespace;[ ];
+                                    Text;[shouldn];
+                                    SingleQuote;['];
+                                    Text;[t];
+                                    Whitespace;[ ];
+                                    Text;[break];
+                                    Whitespace;[ ];
+                                    Text;[razor];
+                                    Whitespace;[ ];
+                                    Text;[-];
+                                MarkupTextLiteral - [62..65)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    DoubleHyphen;[--];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [65..67)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [67..67)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [67..68)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [68..68)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HtmlCommentSupportsMultipleDashes.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HtmlCommentSupportsMultipleDashes.cspans.txt
index fb1d04959e..e1fed0e5a6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HtmlCommentSupportsMultipleDashes.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HtmlCommentSupportsMultipleDashes.cspans.txt
@@ -1,24 +1,24 @@
 Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
 Markup span at (5:0,5 [4] ) (Accepts:None) - Parent: HtmlComment block at (5:0,5 [22] )
-Markup span at (9:0,9 [15] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (5:0,5 [22] )
+Markup span at (9:0,9 [15] ) (Accepts:Whitespace) - Parent: HtmlComment block at (5:0,5 [22] )
 Markup span at (24:0,24 [3] ) (Accepts:None) - Parent: HtmlComment block at (5:0,5 [22] )
 Markup span at (27:0,27 [6] ) (Accepts:Any) - Parent: Tag block at (27:0,27 [6] )
 Markup span at (33:0,33 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [165] )
 Markup span at (35:1,0 [5] ) (Accepts:Any) - Parent: Tag block at (35:1,0 [5] )
 Markup span at (40:1,5 [4] ) (Accepts:None) - Parent: HtmlComment block at (40:1,5 [24] )
-Markup span at (44:1,9 [17] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (40:1,5 [24] )
+Markup span at (44:1,9 [17] ) (Accepts:Whitespace) - Parent: HtmlComment block at (40:1,5 [24] )
 Markup span at (61:1,26 [3] ) (Accepts:None) - Parent: HtmlComment block at (40:1,5 [24] )
 Markup span at (64:1,29 [6] ) (Accepts:Any) - Parent: Tag block at (64:1,29 [6] )
 Markup span at (70:1,35 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [165] )
 Markup span at (72:2,0 [5] ) (Accepts:Any) - Parent: Tag block at (72:2,0 [5] )
 Markup span at (77:2,5 [4] ) (Accepts:None) - Parent: HtmlComment block at (77:2,5 [26] )
-Markup span at (81:2,9 [19] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (77:2,5 [26] )
+Markup span at (81:2,9 [19] ) (Accepts:Whitespace) - Parent: HtmlComment block at (77:2,5 [26] )
 Markup span at (100:2,28 [3] ) (Accepts:None) - Parent: HtmlComment block at (77:2,5 [26] )
 Markup span at (103:2,31 [6] ) (Accepts:Any) - Parent: Tag block at (103:2,31 [6] )
 Markup span at (109:2,37 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [165] )
 Markup span at (111:3,0 [5] ) (Accepts:Any) - Parent: Tag block at (111:3,0 [5] )
 Markup span at (116:3,5 [4] ) (Accepts:None) - Parent: HtmlComment block at (116:3,5 [41] )
-Markup span at (120:3,9 [34] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (116:3,5 [41] )
+Markup span at (120:3,9 [34] ) (Accepts:Whitespace) - Parent: HtmlComment block at (116:3,5 [41] )
 Markup span at (154:3,43 [3] ) (Accepts:None) - Parent: HtmlComment block at (116:3,5 [41] )
 Markup span at (157:3,46 [6] ) (Accepts:Any) - Parent: Tag block at (157:3,46 [6] )
 Markup span at (163:3,52 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [165] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HtmlCommentSupportsMultipleDashes.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HtmlCommentSupportsMultipleDashes.stree.txt
index 5887f79ffc..80f23f667b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HtmlCommentSupportsMultipleDashes.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/HtmlCommentSupportsMultipleDashes.stree.txt
@@ -1,133 +1,134 @@
-Markup block - Gen<None> - 165 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<div>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-    HtmlComment block - Gen<None> - 22 - (5:0,5)
-        Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Bang;[!];
-            HtmlTokenType.DoubleHyphen;[--];
-        Markup span - Gen<Markup> - [- Hello World -] - SpanEditHandler;Accepts:WhiteSpace - (9:0,9) - Tokens:7
-            HtmlTokenType.Text;[-];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[-];
-        Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:2
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (27:0,27)
-        Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 5 - (35:1,0)
-        Markup span - Gen<Markup> - [<div>] - SpanEditHandler;Accepts:Any - (35:1,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-    HtmlComment block - Gen<None> - 24 - (40:1,5)
-        Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (40:1,5) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Bang;[!];
-            HtmlTokenType.DoubleHyphen;[--];
-        Markup span - Gen<Markup> - [-- Hello World --] - SpanEditHandler;Accepts:WhiteSpace - (44:1,9) - Tokens:7
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.DoubleHyphen;[--];
-        Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (61:1,26) - Tokens:2
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (64:1,29)
-        Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:Any - (64:1,29) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (70:1,35) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 5 - (72:2,0)
-        Markup span - Gen<Markup> - [<div>] - SpanEditHandler;Accepts:Any - (72:2,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-    HtmlComment block - Gen<None> - 26 - (77:2,5)
-        Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (77:2,5) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Bang;[!];
-            HtmlTokenType.DoubleHyphen;[--];
-        Markup span - Gen<Markup> - [--- Hello World ---] - SpanEditHandler;Accepts:WhiteSpace - (81:2,9) - Tokens:9
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.Text;[-];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.Text;[-];
-        Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (100:2,28) - Tokens:2
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (103:2,31)
-        Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:Any - (103:2,31) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (109:2,37) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 5 - (111:3,0)
-        Markup span - Gen<Markup> - [<div>] - SpanEditHandler;Accepts:Any - (111:3,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-    HtmlComment block - Gen<None> - 41 - (116:3,5)
-        Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (116:3,5) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Bang;[!];
-            HtmlTokenType.DoubleHyphen;[--];
-        Markup span - Gen<Markup> - [--- Hello < --- > World </div> ---] - SpanEditHandler;Accepts:WhiteSpace - (120:3,9) - Tokens:21
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.Text;[-];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.Text;[-];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.CloseAngle;[>];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.Text;[-];
-        Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (154:3,43) - Tokens:2
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (157:3,46)
-        Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:Any - (157:3,46) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (163:3,52) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
+RazorDocument - [0..165)::165 - [<div><!--- Hello World ---></div>LF<div><!---- Hello World ----></div>LF<div><!----- Hello World -----></div>LF<div><!----- Hello < --- > World </div> -----></div>LF]
+    MarkupBlock - [0..165)::165
+        MarkupTagBlock - [0..5)::5 - [<div>]
+            MarkupTextLiteral - [0..5)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupCommentBlock - [5..27)::22
+            MarkupTextLiteral - [5..9)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Bang;[!];
+                DoubleHyphen;[--];
+            MarkupTextLiteral - [9..24)::15 - [- Hello World -] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                Text;[-];
+                Whitespace;[ ];
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+                Text;[-];
+            MarkupTextLiteral - [24..27)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                DoubleHyphen;[--];
+                CloseAngle;[>];
+        MarkupTagBlock - [27..33)::6 - [</div>]
+            MarkupTextLiteral - [27..33)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [33..35)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTagBlock - [35..40)::5 - [<div>]
+            MarkupTextLiteral - [35..40)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupCommentBlock - [40..64)::24
+            MarkupTextLiteral - [40..44)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Bang;[!];
+                DoubleHyphen;[--];
+            MarkupTextLiteral - [44..61)::17 - [-- Hello World --] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                DoubleHyphen;[--];
+                Whitespace;[ ];
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+                DoubleHyphen;[--];
+            MarkupTextLiteral - [61..64)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                DoubleHyphen;[--];
+                CloseAngle;[>];
+        MarkupTagBlock - [64..70)::6 - [</div>]
+            MarkupTextLiteral - [64..70)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [70..72)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTagBlock - [72..77)::5 - [<div>]
+            MarkupTextLiteral - [72..77)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupCommentBlock - [77..103)::26
+            MarkupTextLiteral - [77..81)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Bang;[!];
+                DoubleHyphen;[--];
+            MarkupTextLiteral - [81..100)::19 - [--- Hello World ---] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                DoubleHyphen;[--];
+                Text;[-];
+                Whitespace;[ ];
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+                DoubleHyphen;[--];
+                Text;[-];
+            MarkupTextLiteral - [100..103)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                DoubleHyphen;[--];
+                CloseAngle;[>];
+        MarkupTagBlock - [103..109)::6 - [</div>]
+            MarkupTextLiteral - [103..109)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [109..111)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTagBlock - [111..116)::5 - [<div>]
+            MarkupTextLiteral - [111..116)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupCommentBlock - [116..157)::41
+            MarkupTextLiteral - [116..120)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Bang;[!];
+                DoubleHyphen;[--];
+            MarkupTextLiteral - [120..154)::34 - [--- Hello < --- > World </div> ---] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                DoubleHyphen;[--];
+                Text;[-];
+                Whitespace;[ ];
+                Text;[Hello];
+                Whitespace;[ ];
+                OpenAngle;[<];
+                Whitespace;[ ];
+                DoubleHyphen;[--];
+                Text;[-];
+                Whitespace;[ ];
+                CloseAngle;[>];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+                Whitespace;[ ];
+                DoubleHyphen;[--];
+                Text;[-];
+            MarkupTextLiteral - [154..157)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                DoubleHyphen;[--];
+                CloseAngle;[>];
+        MarkupTagBlock - [157..163)::6 - [</div>]
+            MarkupTextLiteral - [157..163)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [163..165)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/IgnoresTagsInContentsOfScriptTag.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/IgnoresTagsInContentsOfScriptTag.cspans.txt
index 785c1328bd..a128cfe2b2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/IgnoresTagsInContentsOfScriptTag.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/IgnoresTagsInContentsOfScriptTag.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (0:0,0 [8] ) (Accepts:None) - Parent: Tag block at (0:0,0 [8] )
 Markup span at (8:0,8 [13] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
 Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [4] )
-Code span at (22:0,22 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (21:0,21 [4] )
+Code span at (22:0,22 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [4] )
 Markup span at (25:0,25 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
 Markup span at (27:0,27 [9] ) (Accepts:None) - Parent: Tag block at (27:0,27 [9] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/IgnoresTagsInContentsOfScriptTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/IgnoresTagsInContentsOfScriptTag.stree.txt
index e7b9045b36..3da3fd052c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/IgnoresTagsInContentsOfScriptTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/IgnoresTagsInContentsOfScriptTag.stree.txt
@@ -1,28 +1,31 @@
-Markup block - Gen<None> - 36 - (0:0,0)
-    Tag block - Gen<None> - 8 - (0:0,0)
-        Markup span - Gen<Markup> - [<script>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [foo<bar baz='] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:7
-        HtmlTokenType.Text;[foo];
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Text;[bar];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[baz];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.SingleQuote;['];
-    Expression block - Gen<Expr> - 4 - (21:0,21)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [boz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (22:0,22) - Tokens:1
-            CSharpTokenType.Identifier;[boz];
-    Markup span - Gen<Markup> - ['>] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:2
-        HtmlTokenType.SingleQuote;['];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 9 - (27:0,27)
-        Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..36)::36 - [<script>foo<bar baz='@boz'></script>]
+    MarkupTagBlock - [0..8)::8 - [<script>]
+        MarkupTextLiteral - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[script];
+            CloseAngle;[>];
+    MarkupTextLiteral - [8..21)::13 - [foo<bar baz='] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Text;[foo];
+        OpenAngle;[<];
+        Text;[bar];
+        Whitespace;[ ];
+        Text;[baz];
+        Equals;[=];
+        SingleQuote;['];
+    CSharpCodeBlock - [21..25)::4
+        CSharpImplicitExpression - [21..25)::4
+            CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpImplicitExpressionBody - [22..25)::3
+                CSharpCodeBlock - [22..25)::3
+                    CSharpExpressionLiteral - [22..25)::3 - [boz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                        Identifier;[boz];
+    MarkupTextLiteral - [25..27)::2 - ['>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        SingleQuote;['];
+        CloseAngle;[>];
+    MarkupTagBlock - [27..36)::9 - [</script>]
+        MarkupTextLiteral - [27..36)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[script];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/OnlyTerminatesCommentOnFullEndSequence.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/OnlyTerminatesCommentOnFullEndSequence.cspans.txt
index 744f103dd2..b2aeb414b3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/OnlyTerminatesCommentOnFullEndSequence.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/OnlyTerminatesCommentOnFullEndSequence.cspans.txt
@@ -1,3 +1,3 @@
 Markup span at (0:0,0 [4] ) (Accepts:None) - Parent: HtmlComment block at (0:0,0 [20] )
-Markup span at (4:0,4 [13] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (0:0,0 [20] )
+Markup span at (4:0,4 [13] ) (Accepts:Whitespace) - Parent: HtmlComment block at (0:0,0 [20] )
 Markup span at (17:0,17 [3] ) (Accepts:None) - Parent: HtmlComment block at (0:0,0 [20] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/OnlyTerminatesCommentOnFullEndSequence.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/OnlyTerminatesCommentOnFullEndSequence.stree.txt
index d9d0aa625d..965a65db74 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/OnlyTerminatesCommentOnFullEndSequence.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/OnlyTerminatesCommentOnFullEndSequence.stree.txt
@@ -1,18 +1,18 @@
-Markup block - Gen<None> - 20 - (0:0,0)
-    HtmlComment block - Gen<None> - 20 - (0:0,0)
-        Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Bang;[!];
-            HtmlTokenType.DoubleHyphen;[--];
-        Markup span - Gen<Markup> - [<foo>--</bar>] - SpanEditHandler;Accepts:WhiteSpace - (4:0,4) - Tokens:8
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[bar];
-            HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:2
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..20)::20 - [<!--<foo>--</bar>-->]
+    MarkupCommentBlock - [0..20)::20
+        MarkupTextLiteral - [0..4)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Bang;[!];
+            DoubleHyphen;[--];
+        MarkupTextLiteral - [4..17)::13 - [<foo>--</bar>] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+            DoubleHyphen;[--];
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[bar];
+            CloseAngle;[>];
+        MarkupTextLiteral - [17..20)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+            DoubleHyphen;[--];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ParsesSGMLDeclarationAsEmptyTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ParsesSGMLDeclarationAsEmptyTag.stree.txt
index 07b6727064..228dacf053 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ParsesSGMLDeclarationAsEmptyTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ParsesSGMLDeclarationAsEmptyTag.stree.txt
@@ -1,23 +1,23 @@
-Markup block - Gen<None> - 33 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<!DOCTYPE foo bar baz>] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:10
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Bang;[!];
-        HtmlTokenType.Text;[DOCTYPE];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[foo];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[bar];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[baz];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (27:0,27)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..33)::33 - [<foo><!DOCTYPE foo bar baz></foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTextLiteral - [5..27)::22 - [<!DOCTYPE foo bar baz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+        OpenAngle;[<];
+        Bang;[!];
+        Text;[DOCTYPE];
+        Whitespace;[ ];
+        Text;[foo];
+        Whitespace;[ ];
+        Text;[bar];
+        Whitespace;[ ];
+        Text;[baz];
+        CloseAngle;[>];
+    MarkupTagBlock - [27..33)::6 - [</foo>]
+        MarkupTextLiteral - [27..33)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ParsesUntilMatchingEndTagIfFirstNonWhitespaceCharacterIsStartTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ParsesUntilMatchingEndTagIfFirstNonWhitespaceCharacterIsStartTag.stree.txt
index ff6a18ba36..89954be671 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ParsesUntilMatchingEndTagIfFirstNonWhitespaceCharacterIsStartTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ParsesUntilMatchingEndTagIfFirstNonWhitespaceCharacterIsStartTag.stree.txt
@@ -1,34 +1,34 @@
-Markup block - Gen<None> - 33 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<baz>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[baz];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 5 - (5:0,5)
-        Markup span - Gen<Markup> - [<boz>] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[boz];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 5 - (10:0,10)
-        Markup span - Gen<Markup> - [<biz>] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[biz];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (15:0,15)
-        Markup span - Gen<Markup> - [</biz>] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[biz];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (21:0,21)
-        Markup span - Gen<Markup> - [</boz>] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[boz];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (27:0,27)
-        Markup span - Gen<Markup> - [</baz>] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[baz];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..33)::33 - [<baz><boz><biz></biz></boz></baz>]
+    MarkupTagBlock - [0..5)::5 - [<baz>]
+        MarkupTextLiteral - [0..5)::5 - [<baz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[baz];
+            CloseAngle;[>];
+    MarkupTagBlock - [5..10)::5 - [<boz>]
+        MarkupTextLiteral - [5..10)::5 - [<boz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[boz];
+            CloseAngle;[>];
+    MarkupTagBlock - [10..15)::5 - [<biz>]
+        MarkupTextLiteral - [10..15)::5 - [<biz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[biz];
+            CloseAngle;[>];
+    MarkupTagBlock - [15..21)::6 - [</biz>]
+        MarkupTextLiteral - [15..21)::6 - [</biz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[biz];
+            CloseAngle;[>];
+    MarkupTagBlock - [21..27)::6 - [</boz>]
+        MarkupTextLiteral - [21..27)::6 - [</boz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[boz];
+            CloseAngle;[>];
+    MarkupTagBlock - [27..33)::6 - [</baz>]
+        MarkupTextLiteral - [27..33)::6 - [</baz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[baz];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ParsesXMLProcessingInstructionAsEmptyTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ParsesXMLProcessingInstructionAsEmptyTag.stree.txt
index ebcaa78e8f..b416a6b86f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ParsesXMLProcessingInstructionAsEmptyTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ParsesXMLProcessingInstructionAsEmptyTag.stree.txt
@@ -1,24 +1,24 @@
-Markup block - Gen<None> - 30 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<?xml foo bar baz?>] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:11
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.QuestionMark;[?];
-        HtmlTokenType.Text;[xml];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[foo];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[bar];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[baz];
-        HtmlTokenType.QuestionMark;[?];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (24:0,24)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..30)::30 - [<foo><?xml foo bar baz?></foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTextLiteral - [5..24)::19 - [<?xml foo bar baz?>] - Gen<Markup> - SpanEditHandler;Accepts:None
+        OpenAngle;[<];
+        QuestionMark;[?];
+        Text;[xml];
+        Whitespace;[ ];
+        Text;[foo];
+        Whitespace;[ ];
+        Text;[bar];
+        Whitespace;[ ];
+        Text;[baz];
+        QuestionMark;[?];
+        CloseAngle;[>];
+    MarkupTagBlock - [24..30)::6 - [</foo>]
+        MarkupTextLiteral - [24..30)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ProperlyBalancesCommentStartAndEndTags.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ProperlyBalancesCommentStartAndEndTags.cspans.txt
index 5a986cdbba..8bee77b50c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ProperlyBalancesCommentStartAndEndTags.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ProperlyBalancesCommentStartAndEndTags.cspans.txt
@@ -1,3 +1,3 @@
 Markup span at (0:0,0 [4] ) (Accepts:None) - Parent: HtmlComment block at (0:0,0 [18] )
-Markup span at (4:0,4 [11] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (0:0,0 [18] )
+Markup span at (4:0,4 [11] ) (Accepts:Whitespace) - Parent: HtmlComment block at (0:0,0 [18] )
 Markup span at (15:0,15 [3] ) (Accepts:None) - Parent: HtmlComment block at (0:0,0 [18] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ProperlyBalancesCommentStartAndEndTags.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ProperlyBalancesCommentStartAndEndTags.stree.txt
index eae0690509..9a7e052217 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ProperlyBalancesCommentStartAndEndTags.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ProperlyBalancesCommentStartAndEndTags.stree.txt
@@ -1,17 +1,17 @@
-Markup block - Gen<None> - 18 - (0:0,0)
-    HtmlComment block - Gen<None> - 18 - (0:0,0)
-        Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Bang;[!];
-            HtmlTokenType.DoubleHyphen;[--];
-        Markup span - Gen<Markup> - [<foo></bar>] - SpanEditHandler;Accepts:WhiteSpace - (4:0,4) - Tokens:7
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[bar];
-            HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:2
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..18)::18 - [<!--<foo></bar>-->]
+    MarkupCommentBlock - [0..18)::18
+        MarkupTextLiteral - [0..4)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Bang;[!];
+            DoubleHyphen;[--];
+        MarkupTextLiteral - [4..15)::11 - [<foo></bar>] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[bar];
+            CloseAngle;[>];
+        MarkupTextLiteral - [15..18)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+            DoubleHyphen;[--];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ReadsToEndOfLineIfFirstCharacterAfterTransitionIsColon.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ReadsToEndOfLineIfFirstCharacterAfterTransitionIsColon.stree.txt
index 9804bf73fc..1c7838e435 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ReadsToEndOfLineIfFirstCharacterAfterTransitionIsColon.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/ReadsToEndOfLineIfFirstCharacterAfterTransitionIsColon.stree.txt
@@ -1,15 +1,15 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        HtmlTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:1
-        HtmlTokenType.Colon;[:];
-    Markup span - Gen<Markup> - [<li>Foo Bar BazLF] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:9
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Text;[li];
-        HtmlTokenType.CloseAngle;[>];
-        HtmlTokenType.Text;[Foo];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[Bar];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[Baz];
-        HtmlTokenType.NewLine;[LF];
+MarkupBlock - [0..19)::19 - [@:<li>Foo Bar BazLF]
+    MarkupTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+        Colon;[:];
+    MarkupTextLiteral - [2..19)::17 - [<li>Foo Bar BazLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+        OpenAngle;[<];
+        Text;[li];
+        CloseAngle;[>];
+        Text;[Foo];
+        Whitespace;[ ];
+        Text;[Bar];
+        Whitespace;[ ];
+        Text;[Baz];
+        NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/RendersLiteralTextTagIfDoubled.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/RendersLiteralTextTagIfDoubled.stree.txt
index 67c1dde991..ef9daab3af 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/RendersLiteralTextTagIfDoubled.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/RendersLiteralTextTagIfDoubled.stree.txt
@@ -1,36 +1,36 @@
-Markup block - Gen<None> - 43 - (0:0,0)
-    Tag block - Gen<None> - 6 - (0:0,0)
-        Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[text];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (6:0,6)
-        Markup span - Gen<Markup> - [<text>] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[text];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [Foo Bar ] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:4
-        HtmlTokenType.Text;[Foo];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[Bar];
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<None> - 5 - (20:0,20)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ Baz] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:2
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[Baz];
-    Tag block - Gen<None> - 7 - (29:0,29)
-        Markup span - Gen<Markup> - [</text>] - SpanEditHandler;Accepts:None - (29:0,29) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[text];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (36:0,36)
-        Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[text];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..43)::43 - [<text><text>Foo Bar <foo> Baz</text></text>]
+    MarkupTagBlock - [0..6)::6 - [<text>]
+        MarkupTransition - [0..6)::6 - Gen<None> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[text];
+            CloseAngle;[>];
+    MarkupTagBlock - [6..12)::6 - [<text>]
+        MarkupTextLiteral - [6..12)::6 - [<text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[text];
+            CloseAngle;[>];
+    MarkupTextLiteral - [12..20)::8 - [Foo Bar ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Text;[Foo];
+        Whitespace;[ ];
+        Text;[Bar];
+        Whitespace;[ ];
+    MarkupTagBlock - [20..25)::5 - [<foo>]
+        MarkupTextLiteral - [20..25)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTextLiteral - [25..29)::4 - [ Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+        Text;[Baz];
+    MarkupTagBlock - [29..36)::7 - [</text>]
+        MarkupTextLiteral - [29..36)::7 - [</text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[text];
+            CloseAngle;[>];
+    MarkupTagBlock - [36..43)::7 - [</text>]
+        MarkupTransition - [36..43)::7 - Gen<None> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[text];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/StopsAtMatchingCloseTagToStartTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/StopsAtMatchingCloseTagToStartTag.stree.txt
index f4caf3c58d..d70b799bf3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/StopsAtMatchingCloseTagToStartTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/StopsAtMatchingCloseTagToStartTag.stree.txt
@@ -1,23 +1,23 @@
-Markup block - Gen<None> - 14 - (0:0,0)
-    Tag block - Gen<None> - 3 - (0:0,0)
-        Markup span - Gen<Markup> - [<a>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 3 - (3:0,3)
-        Markup span - Gen<Markup> - [<b>] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[b];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 4 - (6:0,6)
-        Markup span - Gen<Markup> - [</b>] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[b];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 4 - (10:0,10)
-        Markup span - Gen<Markup> - [</a>] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[a];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..14)::14 - [<a><b></b></a>]
+    MarkupTagBlock - [0..3)::3 - [<a>]
+        MarkupTextLiteral - [0..3)::3 - [<a>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[a];
+            CloseAngle;[>];
+    MarkupTagBlock - [3..6)::3 - [<b>]
+        MarkupTextLiteral - [3..6)::3 - [<b>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[b];
+            CloseAngle;[>];
+    MarkupTagBlock - [6..10)::4 - [</b>]
+        MarkupTextLiteral - [6..10)::4 - [</b>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[b];
+            CloseAngle;[>];
+    MarkupTagBlock - [10..14)::4 - [</a>]
+        MarkupTextLiteral - [10..14)::4 - [</a>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[a];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingMidEmptyTagIfEOFReached.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingMidEmptyTagIfEOFReached.stree.txt
index dfb0feaf10..6eb28acbc1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingMidEmptyTagIfEOFReached.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingMidEmptyTagIfEOFReached.stree.txt
@@ -1,6 +1,6 @@
-Markup block - Gen<None> - 4 - (0:0,0)
-    Tag block - Gen<None> - 4 - (0:0,0)
-        Markup span - Gen<Markup> - [<br/] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[br];
-            HtmlTokenType.ForwardSlash;[/];
+MarkupBlock - [0..4)::4 - [<br/]
+    MarkupTagBlock - [0..4)::4 - [<br/]
+        MarkupTextLiteral - [0..4)::4 - [<br/] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[br];
+            ForwardSlash;[/];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingSingleLineBlockAtEOFIfNoEOLReached.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingSingleLineBlockAtEOFIfNoEOLReached.stree.txt
index 3b55ba7982..aeba508390 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingSingleLineBlockAtEOFIfNoEOLReached.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/StopsParsingSingleLineBlockAtEOFIfNoEOLReached.stree.txt
@@ -1,9 +1,9 @@
-Markup block - Gen<None> - 9 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        HtmlTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:1
-        HtmlTokenType.Colon;[:];
-    Markup span - Gen<Markup> - [foo bar] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:3
-        HtmlTokenType.Text;[foo];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[bar];
+MarkupBlock - [0..9)::9 - [@:foo bar]
+    MarkupTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+        Colon;[:];
+    MarkupTextLiteral - [2..9)::7 - [foo bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Text;[foo];
+        Whitespace;[ ];
+        Text;[bar];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentAsBlock.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentAsBlock.cspans.txt
index a458c6041a..6fc42f3e7e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentAsBlock.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentAsBlock.cspans.txt
@@ -1,3 +1,3 @@
 Markup span at (0:0,0 [4] ) (Accepts:None) - Parent: HtmlComment block at (0:0,0 [12] )
-Markup span at (4:0,4 [5] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (0:0,0 [12] )
+Markup span at (4:0,4 [5] ) (Accepts:Whitespace) - Parent: HtmlComment block at (0:0,0 [12] )
 Markup span at (9:0,9 [3] ) (Accepts:None) - Parent: HtmlComment block at (0:0,0 [12] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentAsBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentAsBlock.stree.txt
index 48818f2559..d503ae4cc3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentAsBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentAsBlock.stree.txt
@@ -1,13 +1,13 @@
-Markup block - Gen<None> - 12 - (0:0,0)
-    HtmlComment block - Gen<None> - 12 - (0:0,0)
-        Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Bang;[!];
-            HtmlTokenType.DoubleHyphen;[--];
-        Markup span - Gen<Markup> - [ foo ] - SpanEditHandler;Accepts:WhiteSpace - (4:0,4) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.WhiteSpace;[ ];
-        Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:2
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..12)::12 - [<!-- foo -->]
+    MarkupCommentBlock - [0..12)::12
+        MarkupTextLiteral - [0..4)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Bang;[!];
+            DoubleHyphen;[--];
+        MarkupTextLiteral - [4..9)::5 - [ foo ] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+            Whitespace;[ ];
+            Text;[foo];
+            Whitespace;[ ];
+        MarkupTextLiteral - [9..12)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+            DoubleHyphen;[--];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithExtraDashAsBlock.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithExtraDashAsBlock.cspans.txt
index 7ddbbbaed4..347cc6cfa0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithExtraDashAsBlock.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithExtraDashAsBlock.cspans.txt
@@ -1,3 +1,3 @@
 Markup span at (0:0,0 [4] ) (Accepts:None) - Parent: HtmlComment block at (0:0,0 [13] )
-Markup span at (4:0,4 [6] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (0:0,0 [13] )
+Markup span at (4:0,4 [6] ) (Accepts:Whitespace) - Parent: HtmlComment block at (0:0,0 [13] )
 Markup span at (10:0,10 [3] ) (Accepts:None) - Parent: HtmlComment block at (0:0,0 [13] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithExtraDashAsBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithExtraDashAsBlock.stree.txt
index c97b9fa6d8..05979ffa79 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithExtraDashAsBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithExtraDashAsBlock.stree.txt
@@ -1,14 +1,14 @@
-Markup block - Gen<None> - 13 - (0:0,0)
-    HtmlComment block - Gen<None> - 13 - (0:0,0)
-        Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Bang;[!];
-            HtmlTokenType.DoubleHyphen;[--];
-        Markup span - Gen<Markup> - [ foo -] - SpanEditHandler;Accepts:WhiteSpace - (4:0,4) - Tokens:4
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[-];
-        Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:2
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..13)::13 - [<!-- foo --->]
+    MarkupCommentBlock - [0..13)::13
+        MarkupTextLiteral - [0..4)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Bang;[!];
+            DoubleHyphen;[--];
+        MarkupTextLiteral - [4..10)::6 - [ foo -] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+            Whitespace;[ ];
+            Text;[foo];
+            Whitespace;[ ];
+            Text;[-];
+        MarkupTextLiteral - [10..13)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+            DoubleHyphen;[--];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithinBlock.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithinBlock.cspans.txt
index 83f613ff02..0803490a40 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithinBlock.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithinBlock.cspans.txt
@@ -1,7 +1,7 @@
 Markup span at (0:0,0 [5] ) (Accepts:None) - Parent: Tag block at (0:0,0 [5] )
 Markup span at (5:0,5 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
 Markup span at (8:0,8 [4] ) (Accepts:None) - Parent: HtmlComment block at (8:0,8 [13] )
-Markup span at (12:0,12 [6] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (8:0,8 [13] )
+Markup span at (12:0,12 [6] ) (Accepts:Whitespace) - Parent: HtmlComment block at (8:0,8 [13] )
 Markup span at (18:0,18 [3] ) (Accepts:None) - Parent: HtmlComment block at (8:0,8 [13] )
 Markup span at (21:0,21 [3] ) (Accepts:None) - Parent: Markup block at (0:0,0 [30] )
 Markup span at (24:0,24 [6] ) (Accepts:None) - Parent: Tag block at (24:0,24 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithinBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithinBlock.stree.txt
index 57e117ae46..0fb89ab28d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithinBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsCommentWithinBlock.stree.txt
@@ -1,28 +1,28 @@
-Markup block - Gen<None> - 30 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [bar] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:1
-        HtmlTokenType.Text;[bar];
-    HtmlComment block - Gen<None> - 13 - (8:0,8)
-        Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Bang;[!];
-            HtmlTokenType.DoubleHyphen;[--];
-        Markup span - Gen<Markup> - [ zoop ] - SpanEditHandler;Accepts:WhiteSpace - (12:0,12) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[zoop];
-            HtmlTokenType.WhiteSpace;[ ];
-        Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:2
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [baz] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-        HtmlTokenType.Text;[baz];
-    Tag block - Gen<None> - 6 - (24:0,24)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..30)::30 - [<foo>bar<!-- zoop -->baz</foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTextLiteral - [5..8)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Text;[bar];
+    MarkupCommentBlock - [8..21)::13
+        MarkupTextLiteral - [8..12)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Bang;[!];
+            DoubleHyphen;[--];
+        MarkupTextLiteral - [12..18)::6 - [ zoop ] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+            Whitespace;[ ];
+            Text;[zoop];
+            Whitespace;[ ];
+        MarkupTextLiteral - [18..21)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+            DoubleHyphen;[--];
+            CloseAngle;[>];
+    MarkupTextLiteral - [21..24)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:None
+        Text;[baz];
+    MarkupTagBlock - [24..30)::6 - [</foo>]
+        MarkupTextLiteral - [24..30)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithLessThanSignsInThem.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithLessThanSignsInThem.stree.txt
index 197843fea3..5e513098eb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithLessThanSignsInThem.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithLessThanSignsInThem.stree.txt
@@ -1,24 +1,24 @@
-Markup block - Gen<None> - 45 - (0:0,0)
-    Tag block - Gen<None> - 8 - (0:0,0)
-        Markup span - Gen<Markup> - [<script>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [if(foo<bar) { alert("baz");)] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:11
-        HtmlTokenType.Text;[if(foo];
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Text;[bar)];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[alert(];
-        HtmlTokenType.DoubleQuote;["];
-        HtmlTokenType.Text;[baz];
-        HtmlTokenType.DoubleQuote;["];
-        HtmlTokenType.Text;[);)];
-    Tag block - Gen<None> - 9 - (36:0,36)
-        Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..45)::45 - [<script>if(foo<bar) { alert("baz");)</script>]
+    MarkupTagBlock - [0..8)::8 - [<script>]
+        MarkupTextLiteral - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[script];
+            CloseAngle;[>];
+    MarkupTextLiteral - [8..36)::28 - [if(foo<bar) { alert("baz");)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Text;[if(foo];
+        OpenAngle;[<];
+        Text;[bar)];
+        Whitespace;[ ];
+        Text;[{];
+        Whitespace;[ ];
+        Text;[alert(];
+        DoubleQuote;["];
+        Text;[baz];
+        DoubleQuote;["];
+        Text;[);)];
+    MarkupTagBlock - [36..45)::9 - [</script>]
+        MarkupTextLiteral - [36..45)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[script];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithSpacedLessThanSignsInThem.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithSpacedLessThanSignsInThem.stree.txt
index 4ac25d3e0a..dfec739076 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithSpacedLessThanSignsInThem.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsScriptTagsWithSpacedLessThanSignsInThem.stree.txt
@@ -1,26 +1,26 @@
-Markup block - Gen<None> - 47 - (0:0,0)
-    Tag block - Gen<None> - 8 - (0:0,0)
-        Markup span - Gen<Markup> - [<script>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [if(foo < bar) { alert("baz");)] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:13
-        HtmlTokenType.Text;[if(foo];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[bar)];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[alert(];
-        HtmlTokenType.DoubleQuote;["];
-        HtmlTokenType.Text;[baz];
-        HtmlTokenType.DoubleQuote;["];
-        HtmlTokenType.Text;[);)];
-    Tag block - Gen<None> - 9 - (38:0,38)
-        Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..47)::47 - [<script>if(foo < bar) { alert("baz");)</script>]
+    MarkupTagBlock - [0..8)::8 - [<script>]
+        MarkupTextLiteral - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[script];
+            CloseAngle;[>];
+    MarkupTextLiteral - [8..38)::30 - [if(foo < bar) { alert("baz");)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Text;[if(foo];
+        Whitespace;[ ];
+        OpenAngle;[<];
+        Whitespace;[ ];
+        Text;[bar)];
+        Whitespace;[ ];
+        Text;[{];
+        Whitespace;[ ];
+        Text;[alert(];
+        DoubleQuote;["];
+        Text;[baz];
+        DoubleQuote;["];
+        Text;[);)];
+    MarkupTagBlock - [38..47)::9 - [</script>]
+        MarkupTextLiteral - [38..47)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[script];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsTagsWithAttributes.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsTagsWithAttributes.stree.txt
index e4467d2113..3331b95473 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsTagsWithAttributes.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/SupportsTagsWithAttributes.stree.txt
@@ -1,48 +1,55 @@
-Markup block - Gen<None> - 48 - (0:0,0)
-    Tag block - Gen<None> - 15 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-        Markup block - Gen<Attr:bar, bar="@(4:0,4),"@(13:0,13)> - 10 - (4:0,4)
-            Markup span - Gen<None> - [ bar="] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[bar];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<LitAttr:@(10:0,10)> - [baz] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[baz];
-            Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                HtmlTokenType.DoubleQuote;["];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 5 - (15:0,15)
-        Markup span - Gen<Markup> - [<biz>] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[biz];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 16 - (20:0,20)
-        Markup span - Gen<Markup> - [<boz] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[boz];
-        Markup block - Gen<Attr:zoop, zoop=@(24:0,24),@(34:0,34)> - 10 - (24:0,24)
-            Markup span - Gen<None> - [ zoop=] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[zoop];
-                HtmlTokenType.Equals;[=];
-            Markup span - Gen<LitAttr:@(30:0,30)> - [zork] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:1
-                HtmlTokenType.Text;[zork];
-        Markup span - Gen<Markup> - [/>] - SpanEditHandler;Accepts:None - (34:0,34) - Tokens:2
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (36:0,36)
-        Markup span - Gen<Markup> - [</biz>] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[biz];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (42:0,42)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (42:0,42) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..48)::48 - [<foo bar="baz"><biz><boz zoop=zork/></biz></foo>]
+    MarkupTagBlock - [0..15)::15 - [<foo bar="baz">]
+        MarkupTextLiteral - [0..4)::4 - [<foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[foo];
+        MarkupAttributeBlock - [4..14)::10 - [ bar="baz"]
+            MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [5..8)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[bar];
+            Equals;[=];
+            MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                DoubleQuote;["];
+            GenericBlock - [10..13)::3
+                MarkupLiteralAttributeValue - [10..13)::3 - [baz]
+                    MarkupTextLiteral - [10..13)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[baz];
+            MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                DoubleQuote;["];
+        MarkupTextLiteral - [14..15)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            CloseAngle;[>];
+    MarkupTagBlock - [15..20)::5 - [<biz>]
+        MarkupTextLiteral - [15..20)::5 - [<biz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[biz];
+            CloseAngle;[>];
+    MarkupTagBlock - [20..36)::16 - [<boz zoop=zork/>]
+        MarkupTextLiteral - [20..24)::4 - [<boz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[boz];
+        MarkupAttributeBlock - [24..34)::10 - [ zoop=zork]
+            MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [25..29)::4 - [zoop] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[zoop];
+            Equals;[=];
+            GenericBlock - [30..34)::4
+                MarkupLiteralAttributeValue - [30..34)::4 - [zork]
+                    MarkupTextLiteral - [30..34)::4 - [zork] - Gen<None> - SpanEditHandler;Accepts:Any
+                        Text;[zork];
+        MarkupTextLiteral - [34..36)::2 - [/>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            ForwardSlash;[/];
+            CloseAngle;[>];
+    MarkupTagBlock - [36..42)::6 - [</biz>]
+        MarkupTextLiteral - [36..42)::6 - [</biz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[biz];
+            CloseAngle;[>];
+    MarkupTagBlock - [42..48)::6 - [</foo>]
+        MarkupTextLiteral - [42..48)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.stree.txt
index 0154b21226..cc9623a3d9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TagWithoutCloseAngleDoesNotTerminateBlock.stree.txt
@@ -1,7 +1,7 @@
-Markup block - Gen<None> - 28 - (0:0,0)
-    Tag block - Gen<None> - 28 - (0:0,0)
-        Markup span - Gen<Markup> - [<                      LF   ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.WhiteSpace;[                      ];
-            HtmlTokenType.NewLine;[LF];
-            HtmlTokenType.WhiteSpace;[   ];
+MarkupBlock - [0..28)::28 - [<                      LF   ]
+    MarkupTagBlock - [0..28)::28 - [<                      LF   ]
+        MarkupTextLiteral - [0..28)::28 - [<                      LF   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Whitespace;[                      ];
+            NewLine;[LF];
+            Whitespace;[   ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.stree.txt
index e044edf968..6e363fb26d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOF.stree.txt
@@ -1,6 +1,6 @@
-Markup block - Gen<None> - 5 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..5)::5 - [<foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOFWhenParsingComment.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOFWhenParsingComment.stree.txt
index 54a8738e36..cf1cb3ed72 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOFWhenParsingComment.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesAtEOFWhenParsingComment.stree.txt
@@ -1,8 +1,8 @@
-Markup block - Gen<None> - 9 - (0:0,0)
-    Markup span - Gen<Markup> - [<!--<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:6
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Bang;[!];
-        HtmlTokenType.DoubleHyphen;[--];
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Text;[foo];
-        HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..9)::9 - [<!--<foo>]
+    MarkupTextLiteral - [0..9)::9 - [<!--<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+        OpenAngle;[<];
+        Bang;[!];
+        DoubleHyphen;[--];
+        OpenAngle;[<];
+        Text;[foo];
+        CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesCommentAtFirstOccurrenceOfEndSequence.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesCommentAtFirstOccurrenceOfEndSequence.cspans.txt
index 61d140a204..32ea22cd09 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesCommentAtFirstOccurrenceOfEndSequence.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesCommentAtFirstOccurrenceOfEndSequence.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (0:0,0 [5] ) (Accepts:None) - Parent: Tag block at (0:0,0 [5] )
 Markup span at (5:0,5 [4] ) (Accepts:None) - Parent: HtmlComment block at (5:0,5 [17] )
-Markup span at (9:0,9 [10] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (5:0,5 [17] )
+Markup span at (9:0,9 [10] ) (Accepts:Whitespace) - Parent: HtmlComment block at (5:0,5 [17] )
 Markup span at (19:0,19 [3] ) (Accepts:None) - Parent: HtmlComment block at (5:0,5 [17] )
 Markup span at (22:0,22 [3] ) (Accepts:None) - Parent: Markup block at (0:0,0 [31] )
 Markup span at (25:0,25 [6] ) (Accepts:None) - Parent: Tag block at (25:0,25 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesCommentAtFirstOccurrenceOfEndSequence.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesCommentAtFirstOccurrenceOfEndSequence.stree.txt
index 94ece5af28..5a014d4e23 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesCommentAtFirstOccurrenceOfEndSequence.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesCommentAtFirstOccurrenceOfEndSequence.stree.txt
@@ -1,30 +1,30 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    HtmlComment block - Gen<None> - 17 - (5:0,5)
-        Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Bang;[!];
-            HtmlTokenType.DoubleHyphen;[--];
-        Markup span - Gen<Markup> - [<foo></bar] - SpanEditHandler;Accepts:WhiteSpace - (9:0,9) - Tokens:6
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[bar];
-        Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:2
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:2
-        HtmlTokenType.DoubleHyphen;[--];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (25:0,25)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..31)::31 - [<foo><!--<foo></bar-->--></foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupCommentBlock - [5..22)::17
+        MarkupTextLiteral - [5..9)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Bang;[!];
+            DoubleHyphen;[--];
+        MarkupTextLiteral - [9..19)::10 - [<foo></bar] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[bar];
+        MarkupTextLiteral - [19..22)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+            DoubleHyphen;[--];
+            CloseAngle;[>];
+    MarkupTextLiteral - [22..25)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+        DoubleHyphen;[--];
+        CloseAngle;[>];
+    MarkupTagBlock - [25..31)::6 - [</foo>]
+        MarkupTextLiteral - [25..31)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesSGMLDeclarationAtFirstCloseAngle.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesSGMLDeclarationAtFirstCloseAngle.stree.txt
index 33c8368e9d..372a19319b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesSGMLDeclarationAtFirstCloseAngle.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesSGMLDeclarationAtFirstCloseAngle.stree.txt
@@ -1,25 +1,25 @@
-Markup block - Gen<None> - 34 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<!DOCTYPE foo bar>] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:8
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Bang;[!];
-        HtmlTokenType.Text;[DOCTYPE];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[foo];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[bar];
-        HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ baz>] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:3
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[baz];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (28:0,28)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (28:0,28) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..34)::34 - [<foo><!DOCTYPE foo bar> baz></foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTextLiteral - [5..23)::18 - [<!DOCTYPE foo bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
+        OpenAngle;[<];
+        Bang;[!];
+        Text;[DOCTYPE];
+        Whitespace;[ ];
+        Text;[foo];
+        Whitespace;[ ];
+        Text;[bar];
+        CloseAngle;[>];
+    MarkupTextLiteral - [23..28)::5 - [ baz>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+        Text;[baz];
+        CloseAngle;[>];
+    MarkupTagBlock - [28..34)::6 - [</foo>]
+        MarkupTextLiteral - [28..34)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesXMLProcessingInstructionAtQuestionMarkCloseAnglePair.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesXMLProcessingInstructionAtQuestionMarkCloseAnglePair.stree.txt
index 361a387dd0..caf96df474 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesXMLProcessingInstructionAtQuestionMarkCloseAnglePair.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TerminatesXMLProcessingInstructionAtQuestionMarkCloseAnglePair.stree.txt
@@ -1,27 +1,27 @@
-Markup block - Gen<None> - 34 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<?xml foo bar baz?>] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:11
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.QuestionMark;[?];
-        HtmlTokenType.Text;[xml];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[foo];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[bar];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[baz];
-        HtmlTokenType.QuestionMark;[?];
-        HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ baz] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:2
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[baz];
-    Tag block - Gen<None> - 6 - (28:0,28)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (28:0,28) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..34)::34 - [<foo><?xml foo bar baz?> baz</foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTextLiteral - [5..24)::19 - [<?xml foo bar baz?>] - Gen<Markup> - SpanEditHandler;Accepts:None
+        OpenAngle;[<];
+        QuestionMark;[?];
+        Text;[xml];
+        Whitespace;[ ];
+        Text;[foo];
+        Whitespace;[ ];
+        Text;[bar];
+        Whitespace;[ ];
+        Text;[baz];
+        QuestionMark;[?];
+        CloseAngle;[>];
+    MarkupTextLiteral - [24..28)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Whitespace;[ ];
+        Text;[baz];
+    MarkupTagBlock - [28..34)::6 - [</foo>]
+        MarkupTextLiteral - [28..34)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TreatsMalformedTagsAsContent.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TreatsMalformedTagsAsContent.stree.txt
index 5b07f344d4..3ec892f4b0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TreatsMalformedTagsAsContent.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/TreatsMalformedTagsAsContent.stree.txt
@@ -1,17 +1,17 @@
-Markup block - Gen<None> - 18 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 13 - (5:0,5)
-        Markup span - Gen<Markup> - [</!-- bar -->] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:9
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Bang;[!];
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[bar];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..18)::18 - [<foo></!-- bar -->]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTagBlock - [5..18)::13 - [</!-- bar -->]
+        MarkupTextLiteral - [5..18)::13 - [</!-- bar -->] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Bang;[!];
+            DoubleHyphen;[--];
+            Whitespace;[ ];
+            Text;[bar];
+            Whitespace;[ ];
+            DoubleHyphen;[--];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/WithSelfClosingTagJustEmitsTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/WithSelfClosingTagJustEmitsTag.stree.txt
index 6106b4700d..1e2015375d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/WithSelfClosingTagJustEmitsTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlBlockTest/WithSelfClosingTagJustEmitsTag.stree.txt
@@ -1,8 +1,8 @@
-Markup block - Gen<None> - 7 - (0:0,0)
-    Tag block - Gen<None> - 7 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo />] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:5
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..7)::7 - [<foo />]
+    MarkupTagBlock - [0..7)::7 - [<foo />]
+        MarkupTextLiteral - [0..7)::7 - [<foo />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.stree.txt
index 10d8473215..eb62248d23 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.stree.txt
@@ -1,13 +1,14 @@
-Markup block - Gen<None> - 14 - (0:0,0)
-    Markup span - Gen<Markup> - [Foo ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-        HtmlTokenType.Text;[Foo];
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<None> - 6 - (4:0,4)
-        Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ Bar] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:2
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[Bar];
+RazorDocument - [0..14)::14 - [Foo </div> Bar]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..4)::4 - [Foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+            Whitespace;[ ];
+        MarkupTagBlock - [4..10)::6 - [</div>]
+            MarkupTextLiteral - [4..10)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [10..14)::4 - [ Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[Bar];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.cspans.txt
index e84ab7e691..cd03a1193c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.cspans.txt
@@ -1,4 +1,4 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [1] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [1] )
-Code span at (1:0,1 [0] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [1] )
+Code span at (1:0,1 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [1] )
 Markup span at (1:0,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.stree.txt
index 5ab8e43621..1b3a186cb6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.stree.txt
@@ -1,10 +1,14 @@
-Markup block - Gen<None> - 1 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Expression block - Gen<Expr> - 1 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-            CSharpTokenType.Unknown;[];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..1)::1 - [@]
+    MarkupBlock - [0..1)::1
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..1)::1
+            CSharpImplicitExpression - [0..1)::1
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..1)::0
+                    CSharpCodeBlock - [1..1)::0
+                        CSharpExpressionLiteral - [1..1)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Marker;[];
+        MarkupTextLiteral - [1..1)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt
index 9c1abf332f..62726a2899 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt
@@ -1,42 +1,48 @@
-Markup block - Gen<None> - 39 - (0:0,0)
-    Tag block - Gen<None> - 6 - (0:0,0)
-        Markup span - Gen<Markup> - [<div >] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 17 - (6:0,6)
-        Markup span - Gen<Markup> - [<p] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-        Markup block - Gen<Attr:class, class = '@(8:0,8),'@(21:0,21)> - 14 - (8:0,8)
-            Markup span - Gen<None> - [ class = '] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:6
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[class];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(18:0,18)> - [bar] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
-                HtmlTokenType.Text;[bar];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ Foo ] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:3
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[Foo];
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<None> - 4 - (28:0,28)
-        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (32:0,32)
-        Markup span - Gen<Markup> - [</div >] - SpanEditHandler;Accepts:Any - (32:0,32) - Tokens:5
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..39)::39 - [<div ><p class = 'bar'> Foo </p></div >]
+    MarkupBlock - [0..39)::39
+        MarkupTagBlock - [0..6)::6 - [<div >]
+            MarkupTextLiteral - [0..6)::6 - [<div >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                Whitespace;[ ];
+                CloseAngle;[>];
+        MarkupTagBlock - [6..23)::17 - [<p class = 'bar'>]
+            MarkupTextLiteral - [6..8)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+            MarkupAttributeBlock - [8..22)::14 - [ class = 'bar']
+                MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[class];
+                MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                Equals;[=];
+                MarkupTextLiteral - [16..18)::2 - [ '] - Gen<None> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    SingleQuote;['];
+                GenericBlock - [18..21)::3
+                    MarkupLiteralAttributeValue - [18..21)::3 - [bar]
+                        MarkupTextLiteral - [18..21)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[bar];
+                MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupTextLiteral - [22..23)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+        MarkupTextLiteral - [23..28)::5 - [ Foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[Foo];
+            Whitespace;[ ];
+        MarkupTagBlock - [28..32)::4 - [</p>]
+            MarkupTextLiteral - [28..32)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTagBlock - [32..39)::7 - [</div >]
+            MarkupTextLiteral - [32..39)::7 - [</div >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                Whitespace;[ ];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt
index c4571ddfed..0822f48a4e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt
@@ -1,29 +1,30 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<div>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [Foo ] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:2
-        HtmlTokenType.Text;[Foo];
-        HtmlTokenType.WhiteSpace;[ ];
-    Statement block - Gen<None> - 12 - (9:0,9)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Stmt> - [if(true) {}] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:7
-            CSharpTokenType.Keyword;[if];
-            CSharpTokenType.LeftParenthesis;[(];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.RightParenthesis;[)];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.LeftBrace;[{];
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [ Bar] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:2
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[Bar];
-    Tag block - Gen<None> - 6 - (25:0,25)
-        Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..31)::31 - [<div>Foo @if(true) {} Bar</div>]
+    MarkupBlock - [0..31)::31
+        MarkupTagBlock - [0..5)::5 - [<div>]
+            MarkupTextLiteral - [0..5)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [5..9)::4 - [Foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [9..21)::12
+            CSharpTransition - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [10..21)::11 - [if(true) {}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                RightBrace;[}];
+        MarkupTextLiteral - [21..25)::4 - [ Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[Bar];
+        MarkupTagBlock - [25..31)::6 - [</div>]
+            MarkupTextLiteral - [25..31)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.stree.txt
index 5643ab498d..2f8c946bde 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.stree.txt
@@ -1,21 +1,25 @@
-Markup block - Gen<None> - 15 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 5 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (2:0,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (5:1,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 6 - (7:2,0)
-        Markup span - Gen<Markup> - [<html>] - SpanEditHandler;Accepts:Any - (7:2,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[html];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (13:2,6) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
+RazorDocument - [0..15)::15 - [@{LF}LF<html>LF]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..5)::5
+            CSharpStatement - [0..5)::5
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..5)::4
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..4)::2
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                    RazorMetaCode - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [5..7)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTagBlock - [7..13)::6 - [<html>]
+            MarkupTextLiteral - [7..13)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
+        MarkupTextLiteral - [13..15)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.stree.txt
index e8520e5497..da3662cee2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.stree.txt
@@ -1,21 +1,25 @@
-Markup block - Gen<None> - 17 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 5 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (2:0,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [   	] - SpanEditHandler;Accepts:Any - (5:1,1) - Tokens:1
-        HtmlTokenType.WhiteSpace;[   	];
-    Tag block - Gen<None> - 6 - (9:1,5)
-        Markup span - Gen<Markup> - [<html>] - SpanEditHandler;Accepts:Any - (9:1,5) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[html];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (15:1,11) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
+RazorDocument - [0..17)::17 - [@{LF}   	<html>LF]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..5)::5
+            CSharpStatement - [0..5)::5
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..5)::4
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..4)::2
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                    RazorMetaCode - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [5..9)::4 - [   	] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[   	];
+        MarkupTagBlock - [9..15)::6 - [<html>]
+            MarkupTextLiteral - [9..15)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
+        MarkupTextLiteral - [15..17)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.stree.txt
index 3a4c769465..fcbe43d6d3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.stree.txt
@@ -1,19 +1,23 @@
-Markup block - Gen<None> - 13 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 5 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (2:0,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (5:1,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 6 - (7:2,0)
-        Markup span - Gen<Markup> - [<html>] - SpanEditHandler;Accepts:Any - (7:2,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[html];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..13)::13 - [@{LF}LF<html>]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..5)::5
+            CSharpStatement - [0..5)::5
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..5)::4
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..4)::2
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                    RazorMetaCode - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [5..7)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTagBlock - [7..13)::6 - [<html>]
+            MarkupTextLiteral - [7..13)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.stree.txt
index a1456a4655..446309a656 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.stree.txt
@@ -1,20 +1,24 @@
-Markup block - Gen<None> - 15 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 5 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (2:0,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [ 	LF] - SpanEditHandler;Accepts:Any - (5:1,1) - Tokens:2
-        HtmlTokenType.WhiteSpace;[ 	];
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 6 - (9:2,0)
-        Markup span - Gen<Markup> - [<html>] - SpanEditHandler;Accepts:Any - (9:2,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[html];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..15)::15 - [@{LF} 	LF<html>]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..5)::5
+            CSharpStatement - [0..5)::5
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..5)::4
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..4)::2
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                    RazorMetaCode - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [5..9)::4 - [ 	LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            Whitespace;[ 	];
+            NewLine;[LF];
+        MarkupTagBlock - [9..15)::6 - [<html>]
+            MarkupTextLiteral - [9..15)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.stree.txt
index 25cc0c6d9d..99cd6a1e76 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.stree.txt
@@ -1,32 +1,36 @@
-Markup block - Gen<None> - 30 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 24 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 17 - (2:0,2)
-            Tag block - Gen<None> - 6 - (2:0,2)
-                Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Blah] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:1
-                HtmlTokenType.Text;[Blah];
-            Tag block - Gen<None> - 7 - (12:0,12)
-                Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [LFLF] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:2
-            CSharpTokenType.NewLine;[LF];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (23:2,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Tag block - Gen<None> - 6 - (24:2,1)
-        Markup span - Gen<Markup> - [<html>] - SpanEditHandler;Accepts:Any - (24:2,1) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[html];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..30)::30 - [@{<text>Blah</text>LFLF}<html>]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..24)::24
+            CSharpStatement - [0..24)::24
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..24)::23
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..23)::21
+                        MarkupBlock - [2..19)::17
+                            MarkupTagBlock - [2..8)::6 - [<text>]
+                                MarkupTransition - [2..8)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [8..12)::4 - [Blah] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Text;[Blah];
+                            MarkupTagBlock - [12..19)::7 - [</text>]
+                                MarkupTransition - [12..19)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [19..23)::4 - [LFLF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                            NewLine;[LF];
+                    RazorMetaCode - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTagBlock - [24..30)::6 - [<html>]
+            MarkupTextLiteral - [24..30)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.stree.txt
index 57f0097d15..d8bdb6a618 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.stree.txt
@@ -1,29 +1,30 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Markup span - Gen<Markup> - [Foo ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-        HtmlTokenType.Text;[Foo];
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<None> - 5 - (4:0,4)
-        Markup span - Gen<Markup> - [<div>] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 3 - (9:0,9)
-        Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 4 - (12:0,12)
-        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 4 - (16:0,16)
-        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ Baz] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:2
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[Baz];
+RazorDocument - [0..24)::24 - [Foo <div><p></p></p> Baz]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..4)::4 - [Foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+            Whitespace;[ ];
+        MarkupTagBlock - [4..9)::5 - [<div>]
+            MarkupTextLiteral - [4..9)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTagBlock - [9..12)::3 - [<p>]
+            MarkupTextLiteral - [9..12)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTagBlock - [12..16)::4 - [</p>]
+            MarkupTextLiteral - [12..16)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTagBlock - [16..20)::4 - [</p>]
+            MarkupTextLiteral - [16..20)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [20..24)::4 - [ Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[Baz];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt
index 1cd8f8d382..a5bfee0c7f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt
@@ -1,27 +1,32 @@
-Markup block - Gen<None> - 51 - (0:0,0)
-    Tag block - Gen<None> - 39 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:href, href="@(2:0,2),"@(37:0,37)> - 36 - (2:0,2)
-            Markup span - Gen<None> - [ href="] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[href];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<LitAttr:@(9:0,9)> - [mailto:example@microsoft.com] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-                HtmlTokenType.Text;[mailto:example@microsoft.com];
-            Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (37:0,37) - Tokens:1
-                HtmlTokenType.DoubleQuote;["];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (38:0,38) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [Email me] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:3
-        HtmlTokenType.Text;[Email];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[me];
-    Tag block - Gen<None> - 4 - (47:0,47)
-        Markup span - Gen<Markup> - [</a>] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[a];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..51)::51 - [<a href="mailto:example@microsoft.com">Email me</a>]
+    MarkupBlock - [0..51)::51
+        MarkupTagBlock - [0..39)::39 - [<a href="mailto:example@microsoft.com">]
+            MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[a];
+            MarkupAttributeBlock - [2..38)::36 - [ href="mailto:example@microsoft.com"]
+                MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [3..7)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[href];
+                Equals;[=];
+                MarkupTextLiteral - [8..9)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+                GenericBlock - [9..37)::28
+                    MarkupLiteralAttributeValue - [9..37)::28 - [mailto:example@microsoft.com]
+                        MarkupTextLiteral - [9..37)::28 - [mailto:example@microsoft.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[mailto:example@microsoft.com];
+                MarkupTextLiteral - [37..38)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+            MarkupTextLiteral - [38..39)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+        MarkupTextLiteral - [39..47)::8 - [Email me] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Email];
+            Whitespace;[ ];
+            Text;[me];
+        MarkupTagBlock - [47..51)::4 - [</a>]
+            MarkupTextLiteral - [47..51)::4 - [</a>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[a];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.cspans.txt
index ddf2b796d4..88ff154777 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.cspans.txt
@@ -1,4 +1,4 @@
 Markup span at (0:0,0 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [5] )
 Transition span at (4:0,4 [1] ) (Accepts:None) - Parent: Expression block at (4:0,4 [1] )
-Code span at (5:0,5 [0] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (4:0,4 [1] )
+Code span at (5:0,5 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [1] )
 Markup span at (5:0,5 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [5] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.stree.txt
index da42423e68..5f52cafeba 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.stree.txt
@@ -1,11 +1,15 @@
-Markup block - Gen<None> - 5 - (0:0,0)
-    Markup span - Gen<Markup> - [foo ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-        HtmlTokenType.Text;[foo];
-        HtmlTokenType.WhiteSpace;[ ];
-    Expression block - Gen<Expr> - 1 - (4:0,4)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (5:0,5) - Tokens:1
-            CSharpTokenType.Unknown;[];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..5)::5 - [foo @]
+    MarkupBlock - [0..5)::5
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..5)::1
+            CSharpImplicitExpression - [4..5)::1
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..5)::0
+                    CSharpCodeBlock - [5..5)::0
+                        CSharpExpressionLiteral - [5..5)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Marker;[];
+        MarkupTextLiteral - [5..5)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.cspans.txt
index 32e6b39019..490eb4a82f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.cspans.txt
@@ -1,4 +1,4 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [4] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Expression block at (0:0,0 [4] )
-Code span at (1:0,1 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (0:0,0 [4] )
+Code span at (1:0,1 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (0:0,0 [4] )
 Markup span at (4:0,4 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [4] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.stree.txt
index 140b954a9c..14decc3757 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.stree.txt
@@ -1,10 +1,14 @@
-Markup block - Gen<None> - 4 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Expression block - Gen<Expr> - 4 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[bar];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..4)::4 - [@bar]
+    MarkupBlock - [0..4)::4
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..4)::4
+            CSharpImplicitExpression - [0..4)::4
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [1..4)::3
+                    CSharpCodeBlock - [1..4)::3
+                        CSharpExpressionLiteral - [1..4)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[bar];
+        MarkupTextLiteral - [4..4)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.stree.txt
index 22f01c203e..be711bcf29 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.stree.txt
@@ -1,42 +1,46 @@
-Markup block - Gen<None> - 37 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 31 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (2:0,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Statement block - Gen<None> - 13 - (4:1,0)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Stmt> - [if(true){LF}] - SpanEditHandler;Accepts:Any - (5:1,1) - Tokens:7
-                CSharpTokenType.Keyword;[if];
-                CSharpTokenType.LeftParenthesis;[(];
-                CSharpTokenType.Keyword;[true];
-                CSharpTokenType.RightParenthesis;[)];
-                CSharpTokenType.LeftBrace;[{];
-                CSharpTokenType.NewLine;[LF];
-                CSharpTokenType.RightBrace;[}];
-        Code span - Gen<Stmt> - [ LF] - SpanEditHandler;Accepts:Any - (17:2,1) - Tokens:2
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 10 - (20:3,0)
-            Tag block - Gen<None> - 7 - (20:3,0)
-                Markup span - Gen<Markup> - [<input>] - SpanEditHandler;Accepts:None - (20:3,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[input];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ LF] - SpanEditHandler;Accepts:None - (27:3,7) - Tokens:2
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.NewLine;[LF];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (30:4,0) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (30:4,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Tag block - Gen<None> - 6 - (31:4,1)
-        Markup span - Gen<Markup> - [<html>] - SpanEditHandler;Accepts:Any - (31:4,1) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[html];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..37)::37 - [@{LF@if(true){LF} LF<input> LF}<html>]
+    MarkupBlock - [0..37)::37
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..31)::31
+            CSharpStatement - [0..31)::31
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..31)::30
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..30)::28
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        CSharpCodeBlock - [4..17)::13
+                            CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpStatementLiteral - [5..17)::12 - [if(true){LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                Keyword;[if];
+                                LeftParenthesis;[(];
+                                Keyword;[true];
+                                RightParenthesis;[)];
+                                LeftBrace;[{];
+                                NewLine;[LF];
+                                RightBrace;[}];
+                        CSharpStatementLiteral - [17..20)::3 - [ LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            NewLine;[LF];
+                        MarkupBlock - [20..30)::10
+                            MarkupTagBlock - [20..27)::7 - [<input>]
+                                MarkupTextLiteral - [20..27)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [27..30)::3 - [ LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [30..30)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [30..31)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTagBlock - [31..37)::6 - [<html>]
+            MarkupTextLiteral - [31..37)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.stree.txt
index a055204101..b1462eaf29 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.stree.txt
@@ -1,37 +1,41 @@
-Markup block - Gen<None> - 27 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 27 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (2:0,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Statement block - Gen<None> - 13 - (4:1,0)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Stmt> - [if(true){LF}] - SpanEditHandler;Accepts:Any - (5:1,1) - Tokens:7
-                CSharpTokenType.Keyword;[if];
-                CSharpTokenType.LeftParenthesis;[(];
-                CSharpTokenType.Keyword;[true];
-                CSharpTokenType.RightParenthesis;[)];
-                CSharpTokenType.LeftBrace;[{];
-                CSharpTokenType.NewLine;[LF];
-                CSharpTokenType.RightBrace;[}];
-        Markup block - Gen<None> - 9 - (17:2,1)
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (17:2,1) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 7 - (18:2,2)
-                Markup span - Gen<Markup> - [<input>] - SpanEditHandler;Accepts:None - (18:2,2) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[input];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (25:2,9) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (26:2,10) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (26:2,10) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (27:2,11) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..27)::27 - [@{LF@if(true){LF} <input> }]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            CSharpStatement - [0..27)::27
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..27)::26
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..26)::24
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        CSharpCodeBlock - [4..17)::13
+                            CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpStatementLiteral - [5..17)::12 - [if(true){LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                Keyword;[if];
+                                LeftParenthesis;[(];
+                                Keyword;[true];
+                                RightParenthesis;[)];
+                                LeftBrace;[{];
+                                NewLine;[LF];
+                                RightBrace;[}];
+                        MarkupBlock - [17..26)::9
+                            MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [18..25)::7 - [<input>]
+                                MarkupTextLiteral - [18..25)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                        CSharpStatementLiteral - [26..26)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.stree.txt
index 44c8976cf9..8a7ee3056c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.stree.txt
@@ -1,33 +1,37 @@
-Markup block - Gen<None> - 29 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 21 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (2:0,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Statement block - Gen<None> - 13 - (4:1,0)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Stmt> - [if(true){LF}] - SpanEditHandler;Accepts:Any - (5:1,1) - Tokens:7
-                CSharpTokenType.Keyword;[if];
-                CSharpTokenType.LeftParenthesis;[(];
-                CSharpTokenType.Keyword;[true];
-                CSharpTokenType.RightParenthesis;[)];
-                CSharpTokenType.LeftBrace;[{];
-                CSharpTokenType.NewLine;[LF];
-                CSharpTokenType.RightBrace;[}];
-        Code span - Gen<Stmt> - [ LF] - SpanEditHandler;Accepts:Any - (17:2,1) - Tokens:2
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (20:3,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (21:3,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 6 - (23:4,0)
-        Markup span - Gen<Markup> - [<html>] - SpanEditHandler;Accepts:Any - (23:4,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[html];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..29)::29 - [@{LF@if(true){LF} LF}LF<html>]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            CSharpStatement - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..21)::20
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..20)::18
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        CSharpCodeBlock - [4..17)::13
+                            CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpStatementLiteral - [5..17)::12 - [if(true){LF}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                Keyword;[if];
+                                LeftParenthesis;[(];
+                                Keyword;[true];
+                                RightParenthesis;[)];
+                                LeftBrace;[{];
+                                NewLine;[LF];
+                                RightBrace;[}];
+                        CSharpStatementLiteral - [17..20)::3 - [ LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            NewLine;[LF];
+                    RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [21..23)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTagBlock - [23..29)::6 - [<html>]
+            MarkupTextLiteral - [23..29)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.cspans.txt
index 15de5ea30e..55bb03e494 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.cspans.txt
@@ -1,4 +1,4 @@
 Markup span at (0:0,0 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
 Transition span at (4:0,4 [1] ) (Accepts:None) - Parent: Expression block at (4:0,4 [4] )
-Code span at (5:0,5 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (4:0,4 [4] )
+Code span at (5:0,5 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [4] )
 Markup span at (8:0,8 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [12] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.stree.txt
index 03cb84091b..112b5dc463 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.stree.txt
@@ -1,12 +1,16 @@
-Markup block - Gen<None> - 12 - (0:0,0)
-    Markup span - Gen<Markup> - [foo ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-        HtmlTokenType.Text;[foo];
-        HtmlTokenType.WhiteSpace;[ ];
-    Expression block - Gen<Expr> - 4 - (4:0,4)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (5:0,5) - Tokens:1
-            CSharpTokenType.Identifier;[bar];
-    Markup span - Gen<Markup> - [ baz] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:2
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[baz];
+RazorDocument - [0..12)::12 - [foo @bar baz]
+    MarkupBlock - [0..12)::12
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..8)::4
+            CSharpImplicitExpression - [4..8)::4
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..8)::3
+                    CSharpCodeBlock - [5..8)::3
+                        CSharpExpressionLiteral - [5..8)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[bar];
+        MarkupTextLiteral - [8..12)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.cspans.txt
index a439a50583..5d433efd31 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (0:0,0 [8] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [8] )
 Markup span at (8:0,8 [13] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
 Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [4] )
-Code span at (22:0,22 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (21:0,21 [4] )
+Code span at (22:0,22 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [4] )
 Markup span at (25:0,25 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
 Markup span at (27:0,27 [9] ) (Accepts:Any) - Parent: Tag block at (27:0,27 [9] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.stree.txt
index 5461b94364..697d3e5c84 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.stree.txt
@@ -1,28 +1,32 @@
-Markup block - Gen<None> - 36 - (0:0,0)
-    Tag block - Gen<None> - 8 - (0:0,0)
-        Markup span - Gen<Markup> - [<script>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [foo<bar baz='] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:7
-        HtmlTokenType.Text;[foo];
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Text;[bar];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[baz];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.SingleQuote;['];
-    Expression block - Gen<Expr> - 4 - (21:0,21)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [boz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (22:0,22) - Tokens:1
-            CSharpTokenType.Identifier;[boz];
-    Markup span - Gen<Markup> - ['>] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:2
-        HtmlTokenType.SingleQuote;['];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 9 - (27:0,27)
-        Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..36)::36 - [<script>foo<bar baz='@boz'></script>]
+    MarkupBlock - [0..36)::36
+        MarkupTagBlock - [0..8)::8 - [<script>]
+            MarkupTextLiteral - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+        MarkupTextLiteral - [8..21)::13 - [foo<bar baz='] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            OpenAngle;[<];
+            Text;[bar];
+            Whitespace;[ ];
+            Text;[baz];
+            Equals;[=];
+            SingleQuote;['];
+        CSharpCodeBlock - [21..25)::4
+            CSharpImplicitExpression - [21..25)::4
+                CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [22..25)::3
+                    CSharpCodeBlock - [22..25)::3
+                        CSharpExpressionLiteral - [22..25)::3 - [boz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[boz];
+        MarkupTextLiteral - [25..27)::2 - ['>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            SingleQuote;['];
+            CloseAngle;[>];
+        MarkupTagBlock - [27..36)::9 - [</script>]
+            MarkupTextLiteral - [27..36)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.cspans.txt
index 1583f5d924..ae1f1aa184 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.cspans.txt
@@ -7,7 +7,7 @@ Markup span at (25:0,25 [1] ) (Accepts:Any) - Parent: Markup block at (25:0,25 [
 Markup span at (26:0,26 [5] ) (Accepts:None) - Parent: Tag block at (26:0,26 [5] )
 Markup span at (31:0,31 [0] ) (Accepts:Any) - Parent: Markup block at (25:0,25 [24] )
 Transition span at (31:0,31 [1] ) (Accepts:None) - Parent: Expression block at (31:0,31 [10] )
-Code span at (32:0,32 [9] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (31:0,31 [10] )
+Code span at (32:0,32 [9] ) (Accepts:NonWhitespace) - Parent: Expression block at (31:0,31 [10] )
 Markup span at (41:0,41 [1] ) (Accepts:Any) - Parent: Markup block at (25:0,25 [24] )
 Markup span at (42:0,42 [6] ) (Accepts:None) - Parent: Tag block at (42:0,42 [6] )
 Markup span at (48:0,48 [1] ) (Accepts:None) - Parent: Markup block at (25:0,25 [24] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt
index f53563c4fb..ce225dd4a0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt
@@ -1,55 +1,59 @@
-Markup block - Gen<None> - 52 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 52 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Stmt> - [if (true) { ] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:8
-            CSharpTokenType.Keyword;[if];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.LeftParenthesis;[(];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.RightParenthesis;[)];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.LeftBrace;[{];
-            CSharpTokenType.WhiteSpace;[ ];
-        Statement block - Gen<None> - 37 - (13:0,13)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Stmt> - [if(false) {] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:6
-                CSharpTokenType.Keyword;[if];
-                CSharpTokenType.LeftParenthesis;[(];
-                CSharpTokenType.Keyword;[false];
-                CSharpTokenType.RightParenthesis;[)];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.LeftBrace;[{];
-            Markup block - Gen<None> - 24 - (25:0,25)
-                Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-                Tag block - Gen<None> - 5 - (26:0,26)
-                    Markup span - Gen<Markup> - [<div>] - SpanEditHandler;Accepts:None - (26:0,26) - Tokens:3
-                        HtmlTokenType.OpenAngle;[<];
-                        HtmlTokenType.Text;[div];
-                        HtmlTokenType.CloseAngle;[>];
-                Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-                    HtmlTokenType.Unknown;[];
-                Expression block - Gen<Expr> - 10 - (31:0,31)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [something] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (32:0,32) - Tokens:1
-                        CSharpTokenType.Identifier;[something];
-                Markup span - Gen<Markup> - [.] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:1
-                    HtmlTokenType.Text;[.];
-                Tag block - Gen<None> - 6 - (42:0,42)
-                    Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:None - (42:0,42) - Tokens:4
-                        HtmlTokenType.OpenAngle;[<];
-                        HtmlTokenType.ForwardSlash;[/];
-                        HtmlTokenType.Text;[div];
-                        HtmlTokenType.CloseAngle;[>];
-                Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (48:0,48) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-            Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:Any - (49:0,49) - Tokens:1
-                CSharpTokenType.RightBrace;[}];
-        Code span - Gen<Stmt> - [ }] - SpanEditHandler;Accepts:Any - (50:0,50) - Tokens:2
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.RightBrace;[}];
+RazorDocument - [0..52)::52 - [@if (true) { @if(false) { <div>@something.</div> } }]
+    MarkupBlock - [0..52)::52
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..52)::52
+            CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [1..13)::12 - [if (true) { ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[if];
+                Whitespace;[ ];
+                LeftParenthesis;[(];
+                Keyword;[true];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                Whitespace;[ ];
+            CSharpCodeBlock - [13..50)::37
+                CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementLiteral - [14..25)::11 - [if(false) {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Keyword;[if];
+                    LeftParenthesis;[(];
+                    Keyword;[false];
+                    RightParenthesis;[)];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                MarkupBlock - [25..49)::24
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTagBlock - [26..31)::5 - [<div>]
+                        MarkupTextLiteral - [26..31)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            Text;[div];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [31..31)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Marker;[];
+                    CSharpCodeBlock - [31..41)::10
+                        CSharpImplicitExpression - [31..41)::10
+                            CSharpTransition - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            CSharpImplicitExpressionBody - [32..41)::9
+                                CSharpCodeBlock - [32..41)::9
+                                    CSharpExpressionLiteral - [32..41)::9 - [something] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                        Identifier;[something];
+                    MarkupTextLiteral - [41..42)::1 - [.] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[.];
+                    MarkupTagBlock - [42..48)::6 - [</div>]
+                        MarkupTextLiteral - [42..48)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[div];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [48..49)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Whitespace;[ ];
+                CSharpStatementLiteral - [49..50)::1 - [}] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    RightBrace;[}];
+            CSharpStatementLiteral - [50..52)::2 - [ }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                RightBrace;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.stree.txt
index 7be20b9bb1..83a58c80ec 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.stree.txt
@@ -1,14 +1,15 @@
-Markup block - Gen<None> - 17 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [${bar}] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:1
-        HtmlTokenType.Text;[${bar}];
-    Tag block - Gen<None> - 6 - (11:0,11)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..17)::17 - [<foo>${bar}</foo>]
+    MarkupBlock - [0..17)::17
+        MarkupTagBlock - [0..5)::5 - [<foo>]
+            MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+        MarkupTextLiteral - [5..11)::6 - [${bar}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[${bar}];
+        MarkupTagBlock - [11..17)::6 - [</foo>]
+            MarkupTextLiteral - [11..17)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.stree.txt
index 29cb170a6b..dcd6e30919 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.stree.txt
@@ -1,3 +1,4 @@
-Markup block - Gen<None> - 0 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..0)::0 - []
+    MarkupBlock - [0..0)::0
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.stree.txt
index 91d73fe7e7..8ba87c13e5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.stree.txt
@@ -1,3 +1,4 @@
-Markup block - Gen<None> - 10 - (0:0,0)
-    Markup span - Gen<Markup> - [          ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.WhiteSpace;[          ];
+RazorDocument - [0..10)::10 - [          ]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..10)::10 - [          ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[          ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.stree.txt
index 6826f24475..d745d52162 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.stree.txt
@@ -1,3 +1,4 @@
-Markup block - Gen<None> - 21 - (0:0,0)
-    Markup span - Gen<Markup> - [example@microsoft.com] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Text;[example@microsoft.com];
+RazorDocument - [0..21)::21 - [example@microsoft.com]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..21)::21 - [example@microsoft.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[example@microsoft.com];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.cspans.txt
index 8a68f0acb8..d4c9a7712b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.cspans.txt
@@ -1,15 +1,15 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [53] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [53] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [53] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [53] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [53] )
-Markup span at (12:0,12 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [53] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [53] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [53] )
+Markup span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [53] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [53] )
 Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [38] )
 Markup span at (15:0,15 [8] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [8] )
 Markup span at (23:0,23 [13] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [38] )
 Transition span at (36:0,36 [1] ) (Accepts:None) - Parent: Expression block at (36:0,36 [4] )
-Code span at (37:0,37 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (36:0,36 [4] )
+Code span at (37:0,37 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (36:0,36 [4] )
 Markup span at (40:0,40 [2] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [38] )
 Markup span at (42:0,42 [9] ) (Accepts:Any) - Parent: Tag block at (42:0,42 [9] )
 Markup span at (51:0,51 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [38] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.stree.txt
index 4c2dc65b9a..a5e9b293b5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.stree.txt
@@ -1,52 +1,59 @@
-Markup block - Gen<None> - 53 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 53 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [Foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[Foo];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (13:0,13) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 38 - (14:0,14)
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 8 - (15:0,15)
-                Markup span - Gen<Markup> - [<script>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[script];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [foo<bar baz='] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:7
-                HtmlTokenType.Text;[foo];
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[bar];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[baz];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Expression block - Gen<Expr> - 4 - (36:0,36)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [boz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K15 - (37:0,37) - Tokens:1
-                    CSharpTokenType.Identifier;[boz];
-            Markup span - Gen<Markup> - ['>] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:2
-                HtmlTokenType.SingleQuote;['];
-                HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 9 - (42:0,42)
-                Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (42:0,42) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[script];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (51:0,51) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (52:0,52) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (53:0,53) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..53)::53 - [@section Foo { <script>foo<bar baz='@boz'></script> }]
+    MarkupBlock - [0..53)::53
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..53)::53
+            RazorDirective - [0..53)::53 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..53)::52
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..53)::45
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [Foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Foo];
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..52)::38
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [15..23)::8 - [<script>]
+                                MarkupTextLiteral - [15..23)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[script];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [23..36)::13 - [foo<bar baz='] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                                OpenAngle;[<];
+                                Text;[bar];
+                                Whitespace;[ ];
+                                Text;[baz];
+                                Equals;[=];
+                                SingleQuote;['];
+                            CSharpCodeBlock - [36..40)::4
+                                CSharpImplicitExpression - [36..40)::4
+                                    CSharpTransition - [36..37)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [37..40)::3
+                                        CSharpCodeBlock - [37..40)::3
+                                            CSharpExpressionLiteral - [37..40)::3 - [boz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15
+                                                Identifier;[boz];
+                            MarkupTextLiteral - [40..42)::2 - ['>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                SingleQuote;['];
+                                CloseAngle;[>];
+                            MarkupTagBlock - [42..51)::9 - [</script>]
+                                MarkupTextLiteral - [42..51)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[script];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [51..52)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [52..53)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [53..53)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.stree.txt
index cce44ce5ca..30659bb00b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.stree.txt
@@ -1,5 +1,6 @@
-Markup block - Gen<None> - 7 - (0:0,0)
-    Markup span - Gen<Markup> - [foo baz] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-        HtmlTokenType.Text;[foo];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[baz];
+RazorDocument - [0..7)::7 - [foo baz]
+    MarkupBlock - [0..7)::7
+        MarkupTextLiteral - [0..7)::7 - [foo baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.stree.txt
index 4d6eea6ddc..5d23cceb4a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.stree.txt
@@ -1,42 +1,46 @@
-Markup block - Gen<None> - 38 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 32 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 19 - (2:0,2)
-            Tag block - Gen<None> - 6 - (2:0,2)
-                Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Blah] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:1
-                HtmlTokenType.Text;[Blah];
-            Tag block - Gen<None> - 7 - (12:0,12)
-                Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 10 - (21:1,0)
-            Tag block - Gen<None> - 8 - (21:1,0)
-                Markup span - Gen<Markup> - [<input/>] - SpanEditHandler;Accepts:None - (21:1,0) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[input];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (29:1,8) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (31:2,0) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (31:2,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Tag block - Gen<None> - 6 - (32:2,1)
-        Markup span - Gen<Markup> - [<html>] - SpanEditHandler;Accepts:Any - (32:2,1) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[html];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..38)::38 - [@{<text>Blah</text>LF<input/>LF}<html>]
+    MarkupBlock - [0..38)::38
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            CSharpStatement - [0..32)::32
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..32)::31
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..31)::29
+                        MarkupBlock - [2..21)::19
+                            MarkupTagBlock - [2..8)::6 - [<text>]
+                                MarkupTransition - [2..8)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [8..12)::4 - [Blah] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Text;[Blah];
+                            MarkupTagBlock - [12..19)::7 - [</text>]
+                                MarkupTransition - [12..19)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [19..21)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        MarkupBlock - [21..31)::10
+                            MarkupTagBlock - [21..29)::8 - [<input/>]
+                                MarkupTextLiteral - [21..29)::8 - [<input/>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    ForwardSlash;[/];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [29..31)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [31..31)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTagBlock - [32..38)::6 - [<html>]
+            MarkupTextLiteral - [32..38)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.stree.txt
index c71e6077fc..08a1719801 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.stree.txt
@@ -1,42 +1,46 @@
-Markup block - Gen<None> - 37 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 31 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 19 - (2:0,2)
-            Tag block - Gen<None> - 6 - (2:0,2)
-                Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Blah] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:1
-                HtmlTokenType.Text;[Blah];
-            Tag block - Gen<None> - 7 - (12:0,12)
-                Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 9 - (21:1,0)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (21:1,0) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (22:1,1) - Tokens:1
-                HtmlTokenType.Colon;[:];
-            Markup span - Gen<Markup> - [ BlehLF] - SpanEditHandler;Accepts:None - (23:1,2) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[Bleh];
-                HtmlTokenType.NewLine;[LF];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (30:2,0) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (30:2,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Tag block - Gen<None> - 6 - (31:2,1)
-        Markup span - Gen<Markup> - [<html>] - SpanEditHandler;Accepts:Any - (31:2,1) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[html];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..37)::37 - [@{<text>Blah</text>LF@: BlehLF}<html>]
+    MarkupBlock - [0..37)::37
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..31)::31
+            CSharpStatement - [0..31)::31
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..31)::30
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..30)::28
+                        MarkupBlock - [2..21)::19
+                            MarkupTagBlock - [2..8)::6 - [<text>]
+                                MarkupTransition - [2..8)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [8..12)::4 - [Blah] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Text;[Blah];
+                            MarkupTagBlock - [12..19)::7 - [</text>]
+                                MarkupTransition - [12..19)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [19..21)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                NewLine;[LF];
+                        MarkupBlock - [21..30)::9
+                            MarkupTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            RazorMetaCode - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+                                Colon;[:];
+                            MarkupTextLiteral - [23..30)::7 - [ BlehLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                                Text;[Bleh];
+                                NewLine;[LF];
+                        CSharpStatementLiteral - [30..30)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [30..31)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTagBlock - [31..37)::6 - [<html>]
+            MarkupTextLiteral - [31..37)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[html];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.stree.txt
index 6d5fca2bac..760960d472 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.stree.txt
@@ -1,17 +1,18 @@
-Markup block - Gen<None> - 20 - (0:0,0)
-    Markup span - Gen<Markup> - [Foo ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-        HtmlTokenType.Text;[Foo];
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<None> - 6 - (4:0,4)
-        Markup span - Gen<Markup> - [<text>] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[text];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-        HtmlTokenType.Text;[Foo];
-    Tag block - Gen<None> - 7 - (13:0,13)
-        Markup span - Gen<Markup> - [</text>] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[text];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..20)::20 - [Foo <text>Foo</text>]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..4)::4 - [Foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+            Whitespace;[ ];
+        MarkupTagBlock - [4..10)::6 - [<text>]
+            MarkupTextLiteral - [4..10)::6 - [<text>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[text];
+                CloseAngle;[>];
+        MarkupTextLiteral - [10..13)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+        MarkupTagBlock - [13..20)::7 - [</text>]
+            MarkupTextLiteral - [13..20)::7 - [</text>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[text];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.cspans.txt
index ca3ad33966..056f638ae3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (0:0,0 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
 Markup span at (7:0,7 [4] ) (Accepts:None) - Parent: HtmlComment block at (7:0,7 [10] )
-Markup span at (11:0,11 [3] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (7:0,7 [10] )
+Markup span at (11:0,11 [3] ) (Accepts:Whitespace) - Parent: HtmlComment block at (7:0,7 [10] )
 Markup span at (14:0,14 [3] ) (Accepts:None) - Parent: HtmlComment block at (7:0,7 [10] )
 Markup span at (17:0,17 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
 Markup span at (20:0,20 [10] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.stree.txt
index f1408bb267..e9fd31b945 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.stree.txt
@@ -1,25 +1,26 @@
-Markup block - Gen<None> - 30 - (0:0,0)
-    Markup span - Gen<Markup> - [Foo Baz] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-        HtmlTokenType.Text;[Foo];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[Baz];
-    HtmlComment block - Gen<None> - 10 - (7:0,7)
-        Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (7:0,7) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Bang;[!];
-            HtmlTokenType.DoubleHyphen;[--];
-        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:WhiteSpace - (11:0,11) - Tokens:1
-            HtmlTokenType.Text;[Foo];
-        Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:2
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [Bar] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-        HtmlTokenType.Text;[Bar];
-    Markup span - Gen<Markup> - [<!--F> Qux] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:7
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Bang;[!];
-        HtmlTokenType.DoubleHyphen;[--];
-        HtmlTokenType.Text;[F];
-        HtmlTokenType.CloseAngle;[>];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[Qux];
+RazorDocument - [0..30)::30 - [Foo Baz<!--Foo-->Bar<!--F> Qux]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..7)::7 - [Foo Baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+            Whitespace;[ ];
+            Text;[Baz];
+        MarkupCommentBlock - [7..17)::10
+            MarkupTextLiteral - [7..11)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Bang;[!];
+                DoubleHyphen;[--];
+            MarkupTextLiteral - [11..14)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                Text;[Foo];
+            MarkupTextLiteral - [14..17)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                DoubleHyphen;[--];
+                CloseAngle;[>];
+        MarkupTextLiteral - [17..20)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Bar];
+        MarkupTextLiteral - [20..30)::10 - [<!--F> Qux] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Bang;[!];
+            DoubleHyphen;[--];
+            Text;[F];
+            CloseAngle;[>];
+            Whitespace;[ ];
+            Text;[Qux];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
index bff9c7ae0f..03f6f941b0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
@@ -1,28 +1,33 @@
-Markup block - Gen<None> - 22 - (0:0,0)
-    Markup span - Gen<Markup> - [{] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Text;[{];
-    Tag block - Gen<None> - 20 - (1:0,1)
-        Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[span];
-        Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(17:0,17)> - 12 - (6:0,6)
-            Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[foo];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup block - Gen<None> - 2 - (12:0,12)
-                Markup span - Gen<LitAttr:@(12:0,12)> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-                Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-            Markup span - Gen<LitAttr:@(14:0,14)> - [def] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.Text;[def];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-        HtmlTokenType.Text;[}];
+RazorDocument - [0..22)::22 - [{<span foo='@@def' />}]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..1)::1 - [{] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+        MarkupTagBlock - [1..21)::20 - [<span foo='@@def' />]
+            MarkupTextLiteral - [1..6)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+            MarkupAttributeBlock - [6..18)::12 - [ foo='@@def']
+                MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[foo];
+                Equals;[=];
+                MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [12..17)::5
+                    MarkupBlock - [12..14)::2
+                        MarkupTextLiteral - [12..13)::1 - [@] - Gen<LitAttr:@(12:0,12)> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupEphemeralTextLiteral - [13..14)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                    MarkupLiteralAttributeValue - [14..17)::3 - [def]
+                        MarkupTextLiteral - [14..17)::3 - [def] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[def];
+                MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupTextLiteral - [18..21)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [21..22)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
index a1453713fd..ac5d126d19 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
@@ -1,28 +1,33 @@
-Markup block - Gen<None> - 22 - (0:0,0)
-    Markup span - Gen<Markup> - [{] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Text;[{];
-    Tag block - Gen<None> - 20 - (1:0,1)
-        Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[span];
-        Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(17:0,17)> - 12 - (6:0,6)
-            Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[foo];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(12:0,12)> - [abc] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                HtmlTokenType.Text;[abc];
-            Markup block - Gen<None> - 2 - (15:0,15)
-                Markup span - Gen<LitAttr:@(15:0,15)> - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-                Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-        HtmlTokenType.Text;[}];
+RazorDocument - [0..22)::22 - [{<span foo='abc@@' />}]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..1)::1 - [{] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+        MarkupTagBlock - [1..21)::20 - [<span foo='abc@@' />]
+            MarkupTextLiteral - [1..6)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+            MarkupAttributeBlock - [6..18)::12 - [ foo='abc@@']
+                MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[foo];
+                Equals;[=];
+                MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [12..17)::5
+                    MarkupLiteralAttributeValue - [12..15)::3 - [abc]
+                        MarkupTextLiteral - [12..15)::3 - [abc] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[abc];
+                    MarkupBlock - [15..17)::2
+                        MarkupTextLiteral - [15..16)::1 - [@] - Gen<LitAttr:@(15:0,15)> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupEphemeralTextLiteral - [16..17)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupTextLiteral - [18..21)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [21..22)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
index 91b73cd1f5..68c7fba330 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
@@ -1,32 +1,39 @@
-Markup block - Gen<None> - 27 - (0:0,0)
-    Markup span - Gen<Markup> - [{] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Text;[{];
-    Tag block - Gen<None> - 25 - (1:0,1)
-        Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[span];
-        Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(22:0,22)> - 17 - (6:0,6)
-            Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[foo];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(12:0,12)> - [abc] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                HtmlTokenType.Text;[abc];
-            Markup block - Gen<None> - 3 - (15:0,15)
-                Markup span - Gen<LitAttr: @(15:0,15)> - [ @] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Transition;[@];
-                Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-            Markup span - Gen<LitAttr: @(18:0,18)> - [ def] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:2
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[def];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:1
-        HtmlTokenType.Text;[}];
+RazorDocument - [0..27)::27 - [{<span foo='abc @@ def' />}]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..1)::1 - [{] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+        MarkupTagBlock - [1..26)::25 - [<span foo='abc @@ def' />]
+            MarkupTextLiteral - [1..6)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+            MarkupAttributeBlock - [6..23)::17 - [ foo='abc @@ def']
+                MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[foo];
+                Equals;[=];
+                MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [12..22)::10
+                    MarkupLiteralAttributeValue - [12..15)::3 - [abc]
+                        MarkupTextLiteral - [12..15)::3 - [abc] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[abc];
+                    MarkupBlock - [15..18)::3
+                        MarkupTextLiteral - [15..17)::2 - [ @] - Gen<LitAttr: @(15:0,15)> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                            Transition;[@];
+                        MarkupEphemeralTextLiteral - [17..18)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                    MarkupLiteralAttributeValue - [18..22)::4 - [ def]
+                        MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [19..22)::3 - [def] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[def];
+                MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupTextLiteral - [23..26)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [26..27)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
index 1252329f97..92a82643e7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
@@ -1,26 +1,30 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Markup span - Gen<Markup> - [{] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Text;[{];
-    Tag block - Gen<None> - 17 - (1:0,1)
-        Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[span];
-        Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(14:0,14)> - 9 - (6:0,6)
-            Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[foo];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup block - Gen<None> - 2 - (12:0,12)
-                Markup span - Gen<LitAttr:@(12:0,12)> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-                Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
-        HtmlTokenType.Text;[}];
+RazorDocument - [0..19)::19 - [{<span foo='@@' />}]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..1)::1 - [{] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+        MarkupTagBlock - [1..18)::17 - [<span foo='@@' />]
+            MarkupTextLiteral - [1..6)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+            MarkupAttributeBlock - [6..15)::9 - [ foo='@@']
+                MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[foo];
+                Equals;[=];
+                MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [12..14)::2
+                    MarkupBlock - [12..14)::2
+                        MarkupTextLiteral - [12..13)::1 - [@] - Gen<LitAttr:@(12:0,12)> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupEphemeralTextLiteral - [13..14)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupTextLiteral - [15..18)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [18..19)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
index 1e30d5959f..f4e7c4098c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
@@ -1,39 +1,47 @@
-Markup block - Gen<None> - 44 - (0:0,0)
-    Markup span - Gen<Markup> - [{] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Text;[{];
-    Tag block - Gen<None> - 42 - (1:0,1)
-        Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[span];
-        Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(39:0,39)> - 34 - (6:0,6)
-            Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[foo];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(12:0,12)> - [abc@def.com] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                HtmlTokenType.Text;[abc@def.com];
-            Markup span - Gen<LitAttr: @(23:0,23)> - [ abc] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:2
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[abc];
-            Markup block - Gen<None> - 2 - (27:0,27)
-                Markup span - Gen<LitAttr:@(27:0,27)> - [@] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-                Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (28:0,28) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-            Markup span - Gen<LitAttr:@(29:0,29)> - [def.com] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:1
-                HtmlTokenType.Text;[def.com];
-            Markup block - Gen<None> - 3 - (36:0,36)
-                Markup span - Gen<LitAttr: @(36:0,36)> - [ @] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Transition;[@];
-                Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:1
-        HtmlTokenType.Text;[}];
+RazorDocument - [0..44)::44 - [{<span foo='abc@def.com abc@@def.com @@' />}]
+    MarkupBlock - [0..44)::44
+        MarkupTextLiteral - [0..1)::1 - [{] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+        MarkupTagBlock - [1..43)::42 - [<span foo='abc@def.com abc@@def.com @@' />]
+            MarkupTextLiteral - [1..6)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+            MarkupAttributeBlock - [6..40)::34 - [ foo='abc@def.com abc@@def.com @@']
+                MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[foo];
+                Equals;[=];
+                MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [12..39)::27
+                    MarkupLiteralAttributeValue - [12..23)::11 - [abc@def.com]
+                        MarkupTextLiteral - [12..23)::11 - [abc@def.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[abc@def.com];
+                    MarkupLiteralAttributeValue - [23..27)::4 - [ abc]
+                        MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [24..27)::3 - [abc] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[abc];
+                    MarkupBlock - [27..29)::2
+                        MarkupTextLiteral - [27..28)::1 - [@] - Gen<LitAttr:@(27:0,27)> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupEphemeralTextLiteral - [28..29)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                    MarkupLiteralAttributeValue - [29..36)::7 - [def.com]
+                        MarkupTextLiteral - [29..36)::7 - [def.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[def.com];
+                    MarkupBlock - [36..39)::3
+                        MarkupTextLiteral - [36..38)::2 - [ @] - Gen<LitAttr: @(36:0,36)> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                            Transition;[@];
+                        MarkupEphemeralTextLiteral - [38..39)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupTextLiteral - [40..43)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [43..44)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
index fd20cebd73..fce7daaceb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
@@ -1,72 +1,78 @@
-Markup block - Gen<None> - 117 - (0:0,0)
-    Markup span - Gen<Markup> - [{] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Text;[{];
-    Tag block - Gen<None> - 115 - (1:0,1)
-        Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[span];
-        Markup block - Gen<Attr:foo, foo="@(6:0,6),"@(112:0,112)> - 107 - (6:0,6)
-            Markup span - Gen<None> - [ foo="] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[foo];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<LitAttr:@(12:0,12)> - [/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:14
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[^];
-                HtmlTokenType.LeftBracket;[[];
-                HtmlTokenType.Text;[a-z0-9];
-                HtmlTokenType.Bang;[!];
-                HtmlTokenType.Text;[#$%&];
-                HtmlTokenType.SingleQuote;['];
-                HtmlTokenType.Text;[*+\];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.QuestionMark;[?];
-                HtmlTokenType.Text;[^_`{|}~.-];
-                HtmlTokenType.RightBracket;[]];
-                HtmlTokenType.Text;[+];
-            Markup block - Gen<None> - 2 - (44:0,44)
-                Markup span - Gen<LitAttr:@(44:0,44)> - [@] - SpanEditHandler;Accepts:None - (44:0,44) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-                Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (45:0,45) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-            Markup span - Gen<LitAttr:@(46:0,46)> - [[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:30
-                HtmlTokenType.LeftBracket;[[];
-                HtmlTokenType.Text;[a-z0-9];
-                HtmlTokenType.RightBracket;[]];
-                HtmlTokenType.Text;[(];
-                HtmlTokenType.LeftBracket;[[];
-                HtmlTokenType.Text;[a-z0-9-];
-                HtmlTokenType.RightBracket;[]];
-                HtmlTokenType.Text;[*];
-                HtmlTokenType.LeftBracket;[[];
-                HtmlTokenType.Text;[a-z0-9];
-                HtmlTokenType.RightBracket;[]];
-                HtmlTokenType.Text;[)];
-                HtmlTokenType.QuestionMark;[?];
-                HtmlTokenType.Text;[\.(];
-                HtmlTokenType.LeftBracket;[[];
-                HtmlTokenType.Text;[a-z0-9];
-                HtmlTokenType.RightBracket;[]];
-                HtmlTokenType.Text;[(];
-                HtmlTokenType.LeftBracket;[[];
-                HtmlTokenType.Text;[a-z0-9-];
-                HtmlTokenType.RightBracket;[]];
-                HtmlTokenType.Text;[*];
-                HtmlTokenType.LeftBracket;[[];
-                HtmlTokenType.Text;[a-z0-9];
-                HtmlTokenType.RightBracket;[]];
-                HtmlTokenType.Text;[)];
-                HtmlTokenType.QuestionMark;[?];
-                HtmlTokenType.Text;[)*$];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[i];
-            Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (112:0,112) - Tokens:1
-                HtmlTokenType.DoubleQuote;["];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:Any - (113:0,113) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (116:0,116) - Tokens:1
-        HtmlTokenType.Text;[}];
+RazorDocument - [0..117)::117 - [{<span foo="/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i" />}]
+    MarkupBlock - [0..117)::117
+        MarkupTextLiteral - [0..1)::1 - [{] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+        MarkupTagBlock - [1..116)::115 - [<span foo="/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i" />]
+            MarkupTextLiteral - [1..6)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+            MarkupAttributeBlock - [6..113)::107 - [ foo="/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@@[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i"]
+                MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[foo];
+                Equals;[=];
+                MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+                GenericBlock - [12..112)::100
+                    MarkupLiteralAttributeValue - [12..44)::32 - [/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+]
+                        MarkupTextLiteral - [12..44)::32 - [/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            ForwardSlash;[/];
+                            Text;[^];
+                            LeftBracket;[[];
+                            Text;[a-z0-9];
+                            Bang;[!];
+                            Text;[#$%&];
+                            SingleQuote;['];
+                            Text;[*+\];
+                            ForwardSlash;[/];
+                            Equals;[=];
+                            QuestionMark;[?];
+                            Text;[^_`{|}~.-];
+                            RightBracket;[]];
+                            Text;[+];
+                    MarkupBlock - [44..46)::2
+                        MarkupTextLiteral - [44..45)::1 - [@] - Gen<LitAttr:@(44:0,44)> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupEphemeralTextLiteral - [45..46)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                    MarkupLiteralAttributeValue - [46..112)::66 - [[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i]
+                        MarkupTextLiteral - [46..112)::66 - [[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            LeftBracket;[[];
+                            Text;[a-z0-9];
+                            RightBracket;[]];
+                            Text;[(];
+                            LeftBracket;[[];
+                            Text;[a-z0-9-];
+                            RightBracket;[]];
+                            Text;[*];
+                            LeftBracket;[[];
+                            Text;[a-z0-9];
+                            RightBracket;[]];
+                            Text;[)];
+                            QuestionMark;[?];
+                            Text;[\.(];
+                            LeftBracket;[[];
+                            Text;[a-z0-9];
+                            RightBracket;[]];
+                            Text;[(];
+                            LeftBracket;[[];
+                            Text;[a-z0-9-];
+                            RightBracket;[]];
+                            Text;[*];
+                            LeftBracket;[[];
+                            Text;[a-z0-9];
+                            RightBracket;[]];
+                            Text;[)];
+                            QuestionMark;[?];
+                            Text;[)*$];
+                            ForwardSlash;[/];
+                            Text;[i];
+                MarkupTextLiteral - [112..113)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+            MarkupTextLiteral - [113..116)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [116..117)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.cspans.txt
index 8096973325..c9dd807814 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.cspans.txt
@@ -18,17 +18,17 @@ Markup span at (33:0,33 [1] ) (Accepts:None) - Parent: Markup block at (33:0,33
 Markup span at (34:0,34 [1] ) (Accepts:None) - Parent: Markup block at (33:0,33 [2] )
 Markup span at (35:0,35 [0] ) (Accepts:Any) - Parent: Markup block at (35:0,35 [13] )
 Transition span at (35:0,35 [1] ) (Accepts:None) - Parent: Expression block at (35:0,35 [13] )
-Code span at (36:0,36 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (35:0,35 [13] )
+Code span at (36:0,36 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (35:0,35 [13] )
 Markup span at (48:0,48 [1] ) (Accepts:Any) - Parent: Markup block at (21:0,21 [28] )
 Markup span at (49:0,49 [6] ) (Accepts:Any) - Parent: Markup block at (49:0,49 [22] )
 Transition span at (55:0,55 [1] ) (Accepts:None) - Parent: Expression block at (55:0,55 [13] )
-Code span at (56:0,56 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (55:0,55 [13] )
+Code span at (56:0,56 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (55:0,55 [13] )
 Markup span at (68:0,68 [1] ) (Accepts:None) - Parent: Markup block at (68:0,68 [2] )
 Markup span at (69:0,69 [1] ) (Accepts:None) - Parent: Markup block at (68:0,68 [2] )
 Markup span at (70:0,70 [1] ) (Accepts:Any) - Parent: Markup block at (49:0,49 [22] )
 Markup span at (71:0,71 [6] ) (Accepts:Any) - Parent: Markup block at (71:0,71 [23] )
 Transition span at (77:0,77 [1] ) (Accepts:None) - Parent: Expression block at (77:0,77 [13] )
-Code span at (78:0,78 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (77:0,77 [13] )
+Code span at (78:0,78 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (77:0,77 [13] )
 Markup span at (90:0,90 [2] ) (Accepts:None) - Parent: Markup block at (90:0,90 [3] )
 Markup span at (92:0,92 [1] ) (Accepts:None) - Parent: Markup block at (90:0,90 [3] )
 Markup span at (93:0,93 [1] ) (Accepts:Any) - Parent: Markup block at (71:0,71 [23] )
@@ -37,7 +37,7 @@ Markup span at (100:0,100 [1] ) (Accepts:None) - Parent: Markup block at (100:0,
 Markup span at (101:0,101 [1] ) (Accepts:None) - Parent: Markup block at (100:0,100 [2] )
 Markup span at (102:0,102 [0] ) (Accepts:Any) - Parent: Markup block at (102:0,102 [13] )
 Transition span at (102:0,102 [1] ) (Accepts:None) - Parent: Expression block at (102:0,102 [13] )
-Code span at (103:0,103 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (102:0,102 [13] )
+Code span at (103:0,103 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (102:0,102 [13] )
 Markup span at (115:0,115 [1] ) (Accepts:Any) - Parent: Markup block at (94:0,94 [22] )
 Markup span at (116:0,116 [3] ) (Accepts:Any) - Parent: Tag block at (1:0,1 [118] )
 Markup span at (119:0,119 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [120] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
index 21f9cdf3f3..389c5da4e5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
@@ -1,141 +1,181 @@
-Markup block - Gen<None> - 120 - (0:0,0)
-    Markup span - Gen<Markup> - [{] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Text;[{];
-    Tag block - Gen<None> - 118 - (1:0,1)
-        Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[span];
-        Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(20:0,20)> - 15 - (6:0,6)
-            Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[foo];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup block - Gen<None> - 2 - (12:0,12)
-                Markup span - Gen<LitAttr:@(12:0,12)> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-                Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-            Markup block - Gen<DynAttr:@(14:0,14)> - 6 - (14:0,14)
-                Markup span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                    HtmlTokenType.Unknown;[];
-                Expression block - Gen<Expr> - 6 - (14:0,14)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-                        CSharpTokenType.LeftParenthesis;[(];
-                    Code span - Gen<Expr> - [2+3] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:3
-                        CSharpTokenType.IntegerLiteral;[2];
-                        CSharpTokenType.Plus;[+];
-                        CSharpTokenType.IntegerLiteral;[3];
-                    MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:1
-                        CSharpTokenType.RightParenthesis;[)];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:bar, bar='@(21:0,21),'@(48:0,48)> - 28 - (21:0,21)
-            Markup span - Gen<None> - [ bar='] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[bar];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup block - Gen<DynAttr:@(27:0,27)> - 6 - (27:0,27)
-                Expression block - Gen<Expr> - 6 - (27:0,27)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    MetaCode span - Gen<None> - [(] - SpanEditHandler;Accepts:None - (28:0,28) - Tokens:1
-                        CSharpTokenType.LeftParenthesis;[(];
-                    Code span - Gen<Expr> - [2+3] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:3
-                        CSharpTokenType.IntegerLiteral;[2];
-                        CSharpTokenType.Plus;[+];
-                        CSharpTokenType.IntegerLiteral;[3];
-                    MetaCode span - Gen<None> - [)] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:1
-                        CSharpTokenType.RightParenthesis;[)];
-            Markup block - Gen<None> - 2 - (33:0,33)
-                Markup span - Gen<LitAttr:@(33:0,33)> - [@] - SpanEditHandler;Accepts:None - (33:0,33) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-                Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (34:0,34) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-            Markup block - Gen<DynAttr:@(35:0,35)> - 13 - (35:0,35)
-                Markup span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1
-                    HtmlTokenType.Unknown;[];
-                Expression block - Gen<Expr> - 13 - (35:0,35)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (35:0,35) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (36:0,36) - Tokens:3
-                        CSharpTokenType.Identifier;[DateTime];
-                        CSharpTokenType.Dot;[.];
-                        CSharpTokenType.Identifier;[Now];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (48:0,48) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:baz, baz='@(49:0,49),'@(70:0,70)> - 22 - (49:0,49)
-            Markup span - Gen<None> - [ baz='] - SpanEditHandler;Accepts:Any - (49:0,49) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[baz];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup block - Gen<DynAttr:@(55:0,55)> - 13 - (55:0,55)
-                Expression block - Gen<Expr> - 13 - (55:0,55)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (55:0,55) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (56:0,56) - Tokens:3
-                        CSharpTokenType.Identifier;[DateTime];
-                        CSharpTokenType.Dot;[.];
-                        CSharpTokenType.Identifier;[Now];
-            Markup block - Gen<None> - 2 - (68:0,68)
-                Markup span - Gen<LitAttr:@(68:0,68)> - [@] - SpanEditHandler;Accepts:None - (68:0,68) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-                Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (69:0,69) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (70:0,70) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:bat, bat='@(71:0,71),'@(93:0,93)> - 23 - (71:0,71)
-            Markup span - Gen<None> - [ bat='] - SpanEditHandler;Accepts:Any - (71:0,71) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[bat];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup block - Gen<DynAttr:@(77:0,77)> - 13 - (77:0,77)
-                Expression block - Gen<Expr> - 13 - (77:0,77)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (77:0,77) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (78:0,78) - Tokens:3
-                        CSharpTokenType.Identifier;[DateTime];
-                        CSharpTokenType.Dot;[.];
-                        CSharpTokenType.Identifier;[Now];
-            Markup block - Gen<None> - 3 - (90:0,90)
-                Markup span - Gen<LitAttr: @(90:0,90)> - [ @] - SpanEditHandler;Accepts:None - (90:0,90) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Transition;[@];
-                Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (92:0,92) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (93:0,93) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:zoo, zoo='@(94:0,94),'@(115:0,115)> - 22 - (94:0,94)
-            Markup span - Gen<None> - [ zoo='] - SpanEditHandler;Accepts:Any - (94:0,94) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[zoo];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup block - Gen<None> - 2 - (100:0,100)
-                Markup span - Gen<LitAttr:@(100:0,100)> - [@] - SpanEditHandler;Accepts:None - (100:0,100) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-                Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (101:0,101) - Tokens:1
-                    HtmlTokenType.Transition;[@];
-            Markup block - Gen<DynAttr:@(102:0,102)> - 13 - (102:0,102)
-                Markup span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (102:0,102) - Tokens:1
-                    HtmlTokenType.Unknown;[];
-                Expression block - Gen<Expr> - 13 - (102:0,102)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (102:0,102) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (103:0,103) - Tokens:3
-                        CSharpTokenType.Identifier;[DateTime];
-                        CSharpTokenType.Dot;[.];
-                        CSharpTokenType.Identifier;[Now];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (115:0,115) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:Any - (116:0,116) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (119:0,119) - Tokens:1
-        HtmlTokenType.Text;[}];
+RazorDocument - [0..120)::120 - [{<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.Now' baz='@DateTime.Now@@' bat='@DateTime.Now @@' zoo='@@@DateTime.Now' />}]
+    MarkupBlock - [0..120)::120
+        MarkupTextLiteral - [0..1)::1 - [{] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+        MarkupTagBlock - [1..119)::118 - [<span foo='@@@(2+3)' bar='@(2+3)@@@DateTime.Now' baz='@DateTime.Now@@' bat='@DateTime.Now @@' zoo='@@@DateTime.Now' />]
+            MarkupTextLiteral - [1..6)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+            MarkupAttributeBlock - [6..21)::15 - [ foo='@@@(2+3)']
+                MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [7..10)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[foo];
+                Equals;[=];
+                MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [12..20)::8
+                    MarkupBlock - [12..14)::2
+                        MarkupTextLiteral - [12..13)::1 - [@] - Gen<LitAttr:@(12:0,12)> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupEphemeralTextLiteral - [13..14)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                    MarkupDynamicAttributeValue - [14..20)::6 - [@(2+3)]
+                        GenericBlock - [14..20)::6
+                            MarkupTextLiteral - [14..14)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Marker;[];
+                            CSharpCodeBlock - [14..20)::6
+                                CSharpExplicitExpression - [14..20)::6
+                                    CSharpTransition - [14..15)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpExplicitExpressionBody - [15..20)::5
+                                        RazorMetaCode - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            LeftParenthesis;[(];
+                                        CSharpCodeBlock - [16..19)::3
+                                            CSharpExpressionLiteral - [16..19)::3 - [2+3] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                                                IntegerLiteral;[2];
+                                                Plus;[+];
+                                                IntegerLiteral;[3];
+                                        RazorMetaCode - [19..20)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            RightParenthesis;[)];
+                MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupAttributeBlock - [21..49)::28 - [ bar='@(2+3)@@@DateTime.Now']
+                MarkupTextLiteral - [21..22)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [22..25)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[bar];
+                Equals;[=];
+                MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [27..48)::21
+                    MarkupDynamicAttributeValue - [27..33)::6 - [@(2+3)]
+                        GenericBlock - [27..33)::6
+                            CSharpCodeBlock - [27..33)::6
+                                CSharpExplicitExpression - [27..33)::6
+                                    CSharpTransition - [27..28)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpExplicitExpressionBody - [28..33)::5
+                                        RazorMetaCode - [28..29)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            LeftParenthesis;[(];
+                                        CSharpCodeBlock - [29..32)::3
+                                            CSharpExpressionLiteral - [29..32)::3 - [2+3] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                                                IntegerLiteral;[2];
+                                                Plus;[+];
+                                                IntegerLiteral;[3];
+                                        RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            RightParenthesis;[)];
+                    MarkupBlock - [33..35)::2
+                        MarkupTextLiteral - [33..34)::1 - [@] - Gen<LitAttr:@(33:0,33)> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupEphemeralTextLiteral - [34..35)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                    MarkupDynamicAttributeValue - [35..48)::13 - [@DateTime.Now]
+                        GenericBlock - [35..48)::13
+                            MarkupTextLiteral - [35..35)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Marker;[];
+                            CSharpCodeBlock - [35..48)::13
+                                CSharpImplicitExpression - [35..48)::13
+                                    CSharpTransition - [35..36)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [36..48)::12
+                                        CSharpCodeBlock - [36..48)::12
+                                            CSharpExpressionLiteral - [36..48)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                MarkupTextLiteral - [48..49)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupAttributeBlock - [49..71)::22 - [ baz='@DateTime.Now@@']
+                MarkupTextLiteral - [49..50)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [50..53)::3 - [baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[baz];
+                Equals;[=];
+                MarkupTextLiteral - [54..55)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [55..70)::15
+                    MarkupDynamicAttributeValue - [55..68)::13 - [@DateTime.Now]
+                        GenericBlock - [55..68)::13
+                            CSharpCodeBlock - [55..68)::13
+                                CSharpImplicitExpression - [55..68)::13
+                                    CSharpTransition - [55..56)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [56..68)::12
+                                        CSharpCodeBlock - [56..68)::12
+                                            CSharpExpressionLiteral - [56..68)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                    MarkupBlock - [68..70)::2
+                        MarkupTextLiteral - [68..69)::1 - [@] - Gen<LitAttr:@(68:0,68)> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupEphemeralTextLiteral - [69..70)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                MarkupTextLiteral - [70..71)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupAttributeBlock - [71..94)::23 - [ bat='@DateTime.Now @@']
+                MarkupTextLiteral - [71..72)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [72..75)::3 - [bat] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[bat];
+                Equals;[=];
+                MarkupTextLiteral - [76..77)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [77..93)::16
+                    MarkupDynamicAttributeValue - [77..90)::13 - [@DateTime.Now]
+                        GenericBlock - [77..90)::13
+                            CSharpCodeBlock - [77..90)::13
+                                CSharpImplicitExpression - [77..90)::13
+                                    CSharpTransition - [77..78)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [78..90)::12
+                                        CSharpCodeBlock - [78..90)::12
+                                            CSharpExpressionLiteral - [78..90)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                    MarkupBlock - [90..93)::3
+                        MarkupTextLiteral - [90..92)::2 - [ @] - Gen<LitAttr: @(90:0,90)> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                            Transition;[@];
+                        MarkupEphemeralTextLiteral - [92..93)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                MarkupTextLiteral - [93..94)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupAttributeBlock - [94..116)::22 - [ zoo='@@@DateTime.Now']
+                MarkupTextLiteral - [94..95)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [95..98)::3 - [zoo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[zoo];
+                Equals;[=];
+                MarkupTextLiteral - [99..100)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [100..115)::15
+                    MarkupBlock - [100..102)::2
+                        MarkupTextLiteral - [100..101)::1 - [@] - Gen<LitAttr:@(100:0,100)> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        MarkupEphemeralTextLiteral - [101..102)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                    MarkupDynamicAttributeValue - [102..115)::13 - [@DateTime.Now]
+                        GenericBlock - [102..115)::13
+                            MarkupTextLiteral - [102..102)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Marker;[];
+                            CSharpCodeBlock - [102..115)::13
+                                CSharpImplicitExpression - [102..115)::13
+                                    CSharpTransition - [102..103)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [103..115)::12
+                                        CSharpCodeBlock - [103..115)::12
+                                            CSharpExpressionLiteral - [103..115)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                MarkupTextLiteral - [115..116)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupTextLiteral - [116..119)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+        MarkupTextLiteral - [119..120)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.cspans.txt
index 1480a52ffa..e749e6a3f0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.cspans.txt
@@ -1,9 +1,9 @@
 Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [18] )
 Markup span at (5:0,5 [6] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [10] )
 Transition span at (11:0,11 [1] ) (Accepts:None) - Parent: Expression block at (11:0,11 [1] )
-Code span at (12:0,12 [0] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (11:0,11 [1] )
+Code span at (12:0,12 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (11:0,11 [1] )
 Markup span at (12:0,12 [1] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [2] )
 Transition span at (13:0,13 [1] ) (Accepts:None) - Parent: Expression block at (13:0,13 [1] )
-Code span at (14:0,14 [0] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (13:0,13 [1] )
+Code span at (14:0,14 [0] ) (Accepts:NonWhitespace) - Parent: Expression block at (13:0,13 [1] )
 Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [10] )
 Markup span at (15:0,15 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [18] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
index 0fde94ef3e..9a9b532a82 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
@@ -1,31 +1,43 @@
-Markup block - Gen<None> - 18 - (0:0,0)
-    Tag block - Gen<None> - 18 - (0:0,0)
-        Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[span];
-        Markup block - Gen<Attr:foo, foo='@(5:0,5),'@(14:0,14)> - 10 - (5:0,5)
-            Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[foo];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup block - Gen<DynAttr:@(11:0,11)> - 1 - (11:0,11)
-                Expression block - Gen<Expr> - 1 - (11:0,11)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (11:0,11) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (12:0,12) - Tokens:1
-                        CSharpTokenType.Unknown;[];
-            Markup block - Gen<DynAttr: @(12:0,12)> - 2 - (12:0,12)
-                Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-                Expression block - Gen<Expr> - 1 - (13:0,13)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (14:0,14) - Tokens:1
-                        CSharpTokenType.Unknown;[];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..18)::18 - [<span foo='@ @' />]
+    MarkupBlock - [0..18)::18
+        MarkupTagBlock - [0..18)::18 - [<span foo='@ @' />]
+            MarkupTextLiteral - [0..5)::5 - [<span] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+            MarkupAttributeBlock - [5..15)::10 - [ foo='@ @']
+                MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [6..9)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[foo];
+                Equals;[=];
+                MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [11..14)::3
+                    MarkupDynamicAttributeValue - [11..12)::1 - [@]
+                        GenericBlock - [11..12)::1
+                            CSharpCodeBlock - [11..12)::1
+                                CSharpImplicitExpression - [11..12)::1
+                                    CSharpTransition - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [12..12)::0
+                                        CSharpCodeBlock - [12..12)::0
+                                            CSharpExpressionLiteral - [12..12)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                Marker;[];
+                    MarkupDynamicAttributeValue - [12..14)::2 - [ @]
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        GenericBlock - [13..14)::1
+                            CSharpCodeBlock - [13..14)::1
+                                CSharpImplicitExpression - [13..14)::1
+                                    CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [14..14)::0
+                                        CSharpCodeBlock - [14..14)::0
+                                            CSharpExpressionLiteral - [14..14)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                Marker;[];
+                MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupTextLiteral - [15..18)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithinSectionDoesNotCreateDocumentLevelSpan.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithinSectionDoesNotCreateDocumentLevelSpan.cspans.txt
index 1aeba0ca42..5c34fc9131 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithinSectionDoesNotCreateDocumentLevelSpan.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithinSectionDoesNotCreateDocumentLevelSpan.cspans.txt
@@ -1,9 +1,9 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [36] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [36] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [36] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [36] )
-Markup span at (12:0,12 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [36] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [36] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [36] )
+Markup span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [36] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [36] )
 Markup span at (14:0,14 [6] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [21] )
 Markup span at (20:1,4 [6] ) (Accepts:Any) - Parent: Tag block at (20:1,4 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithinSectionDoesNotCreateDocumentLevelSpan.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithinSectionDoesNotCreateDocumentLevelSpan.stree.txt
index 4023f444a3..1234b0dbeb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithinSectionDoesNotCreateDocumentLevelSpan.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/WithinSectionDoesNotCreateDocumentLevelSpan.stree.txt
@@ -1,37 +1,41 @@
-Markup block - Gen<None> - 36 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 36 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [Foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[Foo];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (13:0,13) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 21 - (14:0,14)
-            Markup span - Gen<Markup> - [LF    ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:2
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.WhiteSpace;[    ];
-            Tag block - Gen<None> - 6 - (20:1,4)
-                Markup span - Gen<Markup> - [<html>] - SpanEditHandler;Accepts:Any - (20:1,4) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[html];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 7 - (26:1,10)
-                Markup span - Gen<Markup> - [</html>] - SpanEditHandler;Accepts:Any - (26:1,10) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[html];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (33:1,17) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (35:2,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (36:2,1) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..36)::36 - [@section Foo {LF    <html></html>LF}]
+    MarkupBlock - [0..36)::36
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..36)::36
+            RazorDirective - [0..36)::36 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..36)::35
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..36)::28
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [Foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Foo];
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..35)::21
+                            MarkupTextLiteral - [14..20)::6 - [LF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                            MarkupTagBlock - [20..26)::6 - [<html>]
+                                MarkupTextLiteral - [20..26)::6 - [<html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[html];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [26..33)::7 - [</html>]
+                                MarkupTextLiteral - [26..33)::7 - [</html>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[html];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [33..35)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                        RazorMetaCode - [35..36)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [36..36)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/AllowsInvalidTagNamesAsLongAsParserCanIdentifyEndTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/AllowsInvalidTagNamesAsLongAsParserCanIdentifyEndTag.stree.txt
index 2104aa8190..dfe21ba582 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/AllowsInvalidTagNamesAsLongAsParserCanIdentifyEndTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/AllowsInvalidTagNamesAsLongAsParserCanIdentifyEndTag.stree.txt
@@ -1,14 +1,14 @@
-Markup block - Gen<None> - 26 - (0:0,0)
-    Tag block - Gen<None> - 11 - (0:0,0)
-        Markup span - Gen<Markup> - [<1-foo+bar>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[1-foo+bar];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [foo] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-        HtmlTokenType.Text;[foo];
-    Tag block - Gen<None> - 12 - (14:0,14)
-        Markup span - Gen<Markup> - [</1-foo+bar>] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[1-foo+bar];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..26)::26 - [<1-foo+bar>foo</1-foo+bar>]
+    MarkupTagBlock - [0..11)::11 - [<1-foo+bar>]
+        MarkupTextLiteral - [0..11)::11 - [<1-foo+bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[1-foo+bar];
+            CloseAngle;[>];
+    MarkupTextLiteral - [11..14)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Text;[foo];
+    MarkupTagBlock - [14..26)::12 - [</1-foo+bar>]
+        MarkupTextLiteral - [14..26)::12 - [</1-foo+bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[1-foo+bar];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/StartingWithEndTagErrorsThenOutputsMarkupSegmentAndEndsBlock.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/StartingWithEndTagErrorsThenOutputsMarkupSegmentAndEndsBlock.stree.txt
index 6a18e4353d..9ed9c10997 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/StartingWithEndTagErrorsThenOutputsMarkupSegmentAndEndsBlock.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/StartingWithEndTagErrorsThenOutputsMarkupSegmentAndEndsBlock.stree.txt
@@ -1,9 +1,9 @@
-Markup block - Gen<None> - 7 - (0:0,0)
-    Tag block - Gen<None> - 6 - (0:0,0)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
+MarkupBlock - [0..7)::7 - [</foo> ]
+    MarkupTagBlock - [0..6)::6 - [</foo>]
+        MarkupTextLiteral - [0..6)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/ThrowsErrorIfEndTextTagContainsTextAfterName.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/ThrowsErrorIfEndTextTagContainsTextAfterName.stree.txt
index cd09a957af..d69632231c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/ThrowsErrorIfEndTextTagContainsTextAfterName.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/ThrowsErrorIfEndTextTagContainsTextAfterName.stree.txt
@@ -1,16 +1,16 @@
-Markup block - Gen<None> - 21 - (0:0,0)
-    Tag block - Gen<None> - 6 - (0:0,0)
-        Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[text];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 15 - (6:0,6)
-        Transition span - Gen<None> - [</text foo bar>] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:8
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[text];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[bar];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..21)::21 - [<text></text foo bar>]
+    MarkupTagBlock - [0..6)::6 - [<text>]
+        MarkupTransition - [0..6)::6 - Gen<None> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[text];
+            CloseAngle;[>];
+    MarkupTagBlock - [6..21)::15 - [</text foo bar>]
+        MarkupTransition - [6..21)::15 - Gen<None> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[text];
+            Whitespace;[ ];
+            Text;[foo];
+            Whitespace;[ ];
+            Text;[bar];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/ThrowsErrorIfStartTextTagContainsTextAfterName.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/ThrowsErrorIfStartTextTagContainsTextAfterName.stree.txt
index 2611872007..f8f40edfbe 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/ThrowsErrorIfStartTextTagContainsTextAfterName.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/ThrowsErrorIfStartTextTagContainsTextAfterName.stree.txt
@@ -1,16 +1,16 @@
-Markup block - Gen<None> - 21 - (0:0,0)
-    Tag block - Gen<None> - 14 - (0:0,0)
-        Transition span - Gen<None> - [<text foo bar>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:7
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[text];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[bar];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (14:0,14)
-        Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[text];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..21)::21 - [<text foo bar></text>]
+    MarkupTagBlock - [0..14)::14 - [<text foo bar>]
+        MarkupTransition - [0..14)::14 - Gen<None> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[text];
+            Whitespace;[ ];
+            Text;[foo];
+            Whitespace;[ ];
+            Text;[bar];
+            CloseAngle;[>];
+    MarkupTagBlock - [14..21)::7 - [</text>]
+        MarkupTransition - [14..21)::7 - Gen<None> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[text];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/ThrowsExceptionIfBlockDoesNotStartWithTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/ThrowsExceptionIfBlockDoesNotStartWithTag.stree.txt
index 2817f30307..a2e6827340 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/ThrowsExceptionIfBlockDoesNotStartWithTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/ThrowsExceptionIfBlockDoesNotStartWithTag.stree.txt
@@ -1 +1 @@
-Markup block - Gen<None> - 0 - (0:0,0)
+MarkupBlock - [0..0)::0 - []
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFThrowsMissingEndTagException.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFThrowsMissingEndTagException.stree.txt
index 3473f8236d..94982bdc60 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFThrowsMissingEndTagException.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTagAtEOFThrowsMissingEndTagException.stree.txt
@@ -1,16 +1,16 @@
-Markup block - Gen<None> - 29 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [blah blah blah blah blah] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:9
-        HtmlTokenType.Text;[blah];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[blah];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[blah];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[blah];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[blah];
+MarkupBlock - [0..29)::29 - [<foo>blah blah blah blah blah]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTextLiteral - [5..29)::24 - [blah blah blah blah blah] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Text;[blah];
+        Whitespace;[ ];
+        Text;[blah];
+        Whitespace;[ ];
+        Text;[blah];
+        Whitespace;[ ];
+        Text;[blah];
+        Whitespace;[ ];
+        Text;[blah];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTopLevelTagThrowsOnOutermostUnclosedTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTopLevelTagThrowsOnOutermostUnclosedTag.stree.txt
index effb7ecc30..891cb8a911 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTopLevelTagThrowsOnOutermostUnclosedTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/WithUnclosedTopLevelTagThrowsOnOutermostUnclosedTag.stree.txt
@@ -1,17 +1,17 @@
-Markup block - Gen<None> - 14 - (0:0,0)
-    Tag block - Gen<None> - 3 - (0:0,0)
-        Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 5 - (3:0,3)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (8:0,8)
-        Markup span - Gen<Markup> - [</bar>] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[bar];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..14)::14 - [<p><foo></bar>]
+    MarkupTagBlock - [0..3)::3 - [<p>]
+        MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[p];
+            CloseAngle;[>];
+    MarkupTagBlock - [3..8)::5 - [<foo>]
+        MarkupTextLiteral - [3..8)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTagBlock - [8..14)::6 - [</bar>]
+        MarkupTextLiteral - [8..14)::6 - [</bar>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[bar];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFThrowsIncompleteTagException.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFThrowsIncompleteTagException.stree.txt
index e57cc6f1d2..0ccf897e93 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFThrowsIncompleteTagException.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlErrorTest/WithUnfinishedTagAtEOFThrowsIncompleteTagException.stree.txt
@@ -1,12 +1,15 @@
-Markup block - Gen<None> - 12 - (0:0,0)
-    Tag block - Gen<None> - 12 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-        Markup block - Gen<Attr:bar, bar=@(4:0,4),@(12:0,12)> - 8 - (4:0,4)
-            Markup span - Gen<None> - [ bar=] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[bar];
-                HtmlTokenType.Equals;[=];
-            Markup span - Gen<LitAttr:@(9:0,9)> - [baz] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-                HtmlTokenType.Text;[baz];
+MarkupBlock - [0..12)::12 - [<foo bar=baz]
+    MarkupTagBlock - [0..12)::12 - [<foo bar=baz]
+        MarkupTextLiteral - [0..4)::4 - [<foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[foo];
+        MarkupAttributeBlock - [4..12)::8 - [ bar=baz]
+            MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [5..8)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[bar];
+            Equals;[=];
+            GenericBlock - [9..12)::3
+                MarkupLiteralAttributeValue - [9..12)::3 - [baz]
+                    MarkupTextLiteral - [9..12)::3 - [baz] - Gen<None> - SpanEditHandler;Accepts:Any
+                        Text;[baz];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/CDataTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/CDataTag.stree.txt
index 00388e8095..6bb87cce3e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/CDataTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/CDataTag.stree.txt
@@ -1,13 +1,13 @@
-Markup block - Gen<None> - 16 - (0:0,0)
-    Markup span - Gen<Markup> - [<![CDATA[Foo]]>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:9
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Bang;[!];
-        HtmlTokenType.LeftBracket;[[];
-        HtmlTokenType.Text;[CDATA];
-        HtmlTokenType.LeftBracket;[[];
-        HtmlTokenType.Text;[Foo];
-        HtmlTokenType.RightBracket;[]];
-        HtmlTokenType.RightBracket;[]];
-        HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
+MarkupBlock - [0..16)::16 - [<![CDATA[Foo]]> ]
+    MarkupTextLiteral - [0..15)::15 - [<![CDATA[Foo]]>] - Gen<Markup> - SpanEditHandler;Accepts:None
+        OpenAngle;[<];
+        Bang;[!];
+        LeftBracket;[[];
+        Text;[CDATA];
+        LeftBracket;[[];
+        Text;[Foo];
+        RightBracket;[]];
+        RightBracket;[]];
+        CloseAngle;[>];
+    MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/CommentTag.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/CommentTag.cspans.txt
index 7276483bb4..6bc808c7e3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/CommentTag.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/CommentTag.cspans.txt
@@ -1,4 +1,4 @@
 Markup span at (0:0,0 [4] ) (Accepts:None) - Parent: HtmlComment block at (0:0,0 [10] )
-Markup span at (4:0,4 [3] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (0:0,0 [10] )
+Markup span at (4:0,4 [3] ) (Accepts:Whitespace) - Parent: HtmlComment block at (0:0,0 [10] )
 Markup span at (7:0,7 [3] ) (Accepts:None) - Parent: HtmlComment block at (0:0,0 [10] )
 Markup span at (10:0,10 [1] ) (Accepts:None) - Parent: Markup block at (0:0,0 [11] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/CommentTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/CommentTag.stree.txt
index d4ca1fb4d8..3b8b289539 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/CommentTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/CommentTag.stree.txt
@@ -1,13 +1,13 @@
-Markup block - Gen<None> - 11 - (0:0,0)
-    HtmlComment block - Gen<None> - 10 - (0:0,0)
-        Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Bang;[!];
-            HtmlTokenType.DoubleHyphen;[--];
-        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:WhiteSpace - (4:0,4) - Tokens:1
-            HtmlTokenType.Text;[Foo];
-        Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (7:0,7) - Tokens:2
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
+MarkupBlock - [0..11)::11 - [<!--Foo--> ]
+    MarkupCommentBlock - [0..10)::10
+        MarkupTextLiteral - [0..4)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Bang;[!];
+            DoubleHyphen;[--];
+        MarkupTextLiteral - [4..7)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+            Text;[Foo];
+        MarkupTextLiteral - [7..10)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+            DoubleHyphen;[--];
+            CloseAngle;[>];
+    MarkupTextLiteral - [10..11)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/DocTypeTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/DocTypeTag.stree.txt
index f1a3b59fff..c2e81cdca7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/DocTypeTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/DocTypeTag.stree.txt
@@ -1,10 +1,10 @@
-Markup block - Gen<None> - 16 - (0:0,0)
-    Markup span - Gen<Markup> - [<!DOCTYPE html>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:6
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Bang;[!];
-        HtmlTokenType.Text;[DOCTYPE];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[html];
-        HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
+MarkupBlock - [0..16)::16 - [<!DOCTYPE html> ]
+    MarkupTextLiteral - [0..15)::15 - [<!DOCTYPE html>] - Gen<Markup> - SpanEditHandler;Accepts:None
+        OpenAngle;[<];
+        Bang;[!];
+        Text;[DOCTYPE];
+        Whitespace;[ ];
+        Text;[html];
+        CloseAngle;[>];
+    MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ElementTags.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ElementTags.stree.txt
index 301a7a09bb..595d9b8449 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ElementTags.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ElementTags.stree.txt
@@ -1,16 +1,16 @@
-Markup block - Gen<None> - 11 - (0:0,0)
-    Tag block - Gen<None> - 3 - (0:0,0)
-        Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
-        HtmlTokenType.Text;[Foo];
-    Tag block - Gen<None> - 4 - (6:0,6)
-        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
+MarkupBlock - [0..11)::11 - [<p>Foo</p> ]
+    MarkupTagBlock - [0..3)::3 - [<p>]
+        MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[p];
+            CloseAngle;[>];
+    MarkupTextLiteral - [3..6)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Text;[Foo];
+    MarkupTagBlock - [6..10)::4 - [</p>]
+        MarkupTextLiteral - [6..10)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[p];
+            CloseAngle;[>];
+    MarkupTextLiteral - [10..11)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/EmptyTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/EmptyTag.stree.txt
index 8ed7b2b7fb..54c9c3aaa3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/EmptyTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/EmptyTag.stree.txt
@@ -1,12 +1,12 @@
-Markup block - Gen<None> - 6 - (0:0,0)
-    Tag block - Gen<None> - 2 - (0:0,0)
-        Markup span - Gen<Markup> - [<>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 3 - (2:0,2)
-        Markup span - Gen<Markup> - [</>] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
+MarkupBlock - [0..6)::6 - [<></> ]
+    MarkupTagBlock - [0..2)::2 - [<>]
+        MarkupTextLiteral - [0..2)::2 - [<>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            CloseAngle;[>];
+    MarkupTagBlock - [2..5)::3 - [</>]
+        MarkupTextLiteral - [2..5)::3 - [</>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            CloseAngle;[>];
+    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/EmptyTagNestsLikeNormalTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/EmptyTagNestsLikeNormalTag.stree.txt
index 4aa436bf10..10e4bae77c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/EmptyTagNestsLikeNormalTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/EmptyTagNestsLikeNormalTag.stree.txt
@@ -1,13 +1,13 @@
-Markup block - Gen<None> - 7 - (0:0,0)
-    Tag block - Gen<None> - 3 - (0:0,0)
-        Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 3 - (3:0,3)
-        Markup span - Gen<Markup> - [</>] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
+MarkupBlock - [0..7)::7 - [<p></> ]
+    MarkupTagBlock - [0..3)::3 - [<p>]
+        MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[p];
+            CloseAngle;[>];
+    MarkupTagBlock - [3..6)::3 - [</>]
+        MarkupTextLiteral - [3..6)::3 - [</>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            CloseAngle;[>];
+    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/IncompleteVoidElementEndTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/IncompleteVoidElementEndTag.stree.txt
index 1fd04b7663..19dd914fa3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/IncompleteVoidElementEndTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/IncompleteVoidElementEndTag.stree.txt
@@ -1,279 +1,285 @@
-Markup block - Gen<None> - 344 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 344 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (2:0,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 21 - (4:1,0)
-            Tag block - Gen<None> - 6 - (4:1,0)
-                Markup span - Gen<Markup> - [<area>] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[area];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 15 - (10:1,6)
-                Markup span - Gen<Markup> - [</areaLF}LF@{LF] - SpanEditHandler;Accepts:Any - (10:1,6) - Tokens:9
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[area];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Text;[}];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Transition;[@];
-                    HtmlTokenType.Text;[{];
-                    HtmlTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 21 - (25:4,0)
-            Tag block - Gen<None> - 6 - (25:4,0)
-                Markup span - Gen<Markup> - [<base>] - SpanEditHandler;Accepts:None - (25:4,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[base];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 15 - (31:4,6)
-                Markup span - Gen<Markup> - [</baseLF}LF@{LF] - SpanEditHandler;Accepts:Any - (31:4,6) - Tokens:9
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[base];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Text;[}];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Transition;[@];
-                    HtmlTokenType.Text;[{];
-                    HtmlTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 17 - (46:7,0)
-            Tag block - Gen<None> - 4 - (46:7,0)
-                Markup span - Gen<Markup> - [<br>] - SpanEditHandler;Accepts:None - (46:7,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[br];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 13 - (50:7,4)
-                Markup span - Gen<Markup> - [</brLF}LF@{LF] - SpanEditHandler;Accepts:Any - (50:7,4) - Tokens:9
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[br];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Text;[}];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Transition;[@];
-                    HtmlTokenType.Text;[{];
-                    HtmlTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 19 - (63:10,0)
-            Tag block - Gen<None> - 5 - (63:10,0)
-                Markup span - Gen<Markup> - [<col>] - SpanEditHandler;Accepts:None - (63:10,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[col];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 14 - (68:10,5)
-                Markup span - Gen<Markup> - [</colLF}LF@{LF] - SpanEditHandler;Accepts:Any - (68:10,5) - Tokens:9
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[col];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Text;[}];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Transition;[@];
-                    HtmlTokenType.Text;[{];
-                    HtmlTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 27 - (82:13,0)
-            Tag block - Gen<None> - 9 - (82:13,0)
-                Markup span - Gen<Markup> - [<command>] - SpanEditHandler;Accepts:None - (82:13,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[command];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 18 - (91:13,9)
-                Markup span - Gen<Markup> - [</commandLF}LF@{LF] - SpanEditHandler;Accepts:Any - (91:13,9) - Tokens:9
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[command];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Text;[}];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Transition;[@];
-                    HtmlTokenType.Text;[{];
-                    HtmlTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 23 - (109:16,0)
-            Tag block - Gen<None> - 7 - (109:16,0)
-                Markup span - Gen<Markup> - [<embed>] - SpanEditHandler;Accepts:None - (109:16,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[embed];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 16 - (116:16,7)
-                Markup span - Gen<Markup> - [</embedLF}LF@{LF] - SpanEditHandler;Accepts:Any - (116:16,7) - Tokens:9
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[embed];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Text;[}];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Transition;[@];
-                    HtmlTokenType.Text;[{];
-                    HtmlTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 17 - (132:19,0)
-            Tag block - Gen<None> - 4 - (132:19,0)
-                Markup span - Gen<Markup> - [<hr>] - SpanEditHandler;Accepts:None - (132:19,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[hr];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 13 - (136:19,4)
-                Markup span - Gen<Markup> - [</hrLF}LF@{LF] - SpanEditHandler;Accepts:Any - (136:19,4) - Tokens:9
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[hr];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Text;[}];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Transition;[@];
-                    HtmlTokenType.Text;[{];
-                    HtmlTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 19 - (149:22,0)
-            Tag block - Gen<None> - 5 - (149:22,0)
-                Markup span - Gen<Markup> - [<img>] - SpanEditHandler;Accepts:None - (149:22,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[img];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 14 - (154:22,5)
-                Markup span - Gen<Markup> - [</imgLF}LF@{LF] - SpanEditHandler;Accepts:Any - (154:22,5) - Tokens:9
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[img];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Text;[}];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Transition;[@];
-                    HtmlTokenType.Text;[{];
-                    HtmlTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 23 - (168:25,0)
-            Tag block - Gen<None> - 7 - (168:25,0)
-                Markup span - Gen<Markup> - [<input>] - SpanEditHandler;Accepts:None - (168:25,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[input];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 16 - (175:25,7)
-                Markup span - Gen<Markup> - [</inputLF}LF@{LF] - SpanEditHandler;Accepts:Any - (175:25,7) - Tokens:9
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[input];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Text;[}];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Transition;[@];
-                    HtmlTokenType.Text;[{];
-                    HtmlTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 25 - (191:28,0)
-            Tag block - Gen<None> - 8 - (191:28,0)
-                Markup span - Gen<Markup> - [<keygen>] - SpanEditHandler;Accepts:None - (191:28,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[keygen];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 17 - (199:28,8)
-                Markup span - Gen<Markup> - [</keygenLF}LF@{LF] - SpanEditHandler;Accepts:Any - (199:28,8) - Tokens:9
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[keygen];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Text;[}];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Transition;[@];
-                    HtmlTokenType.Text;[{];
-                    HtmlTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 21 - (216:31,0)
-            Tag block - Gen<None> - 6 - (216:31,0)
-                Markup span - Gen<Markup> - [<link>] - SpanEditHandler;Accepts:None - (216:31,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[link];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 15 - (222:31,6)
-                Markup span - Gen<Markup> - [</linkLF}LF@{LF] - SpanEditHandler;Accepts:Any - (222:31,6) - Tokens:9
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[link];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Text;[}];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Transition;[@];
-                    HtmlTokenType.Text;[{];
-                    HtmlTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 21 - (237:34,0)
-            Tag block - Gen<None> - 6 - (237:34,0)
-                Markup span - Gen<Markup> - [<meta>] - SpanEditHandler;Accepts:None - (237:34,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[meta];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 15 - (243:34,6)
-                Markup span - Gen<Markup> - [</metaLF}LF@{LF] - SpanEditHandler;Accepts:Any - (243:34,6) - Tokens:9
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[meta];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Text;[}];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Transition;[@];
-                    HtmlTokenType.Text;[{];
-                    HtmlTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 23 - (258:37,0)
-            Tag block - Gen<None> - 7 - (258:37,0)
-                Markup span - Gen<Markup> - [<param>] - SpanEditHandler;Accepts:None - (258:37,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[param];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 16 - (265:37,7)
-                Markup span - Gen<Markup> - [</paramLF}LF@{LF] - SpanEditHandler;Accepts:Any - (265:37,7) - Tokens:9
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[param];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Text;[}];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Transition;[@];
-                    HtmlTokenType.Text;[{];
-                    HtmlTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 25 - (281:40,0)
-            Tag block - Gen<None> - 8 - (281:40,0)
-                Markup span - Gen<Markup> - [<source>] - SpanEditHandler;Accepts:None - (281:40,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[source];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 17 - (289:40,8)
-                Markup span - Gen<Markup> - [</sourceLF}LF@{LF] - SpanEditHandler;Accepts:Any - (289:40,8) - Tokens:9
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[source];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Text;[}];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Transition;[@];
-                    HtmlTokenType.Text;[{];
-                    HtmlTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 23 - (306:43,0)
-            Tag block - Gen<None> - 7 - (306:43,0)
-                Markup span - Gen<Markup> - [<track>] - SpanEditHandler;Accepts:None - (306:43,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[track];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 16 - (313:43,7)
-                Markup span - Gen<Markup> - [</trackLF}LF@{LF] - SpanEditHandler;Accepts:Any - (313:43,7) - Tokens:9
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[track];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Text;[}];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Transition;[@];
-                    HtmlTokenType.Text;[{];
-                    HtmlTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 15 - (329:46,0)
-            Tag block - Gen<None> - 5 - (329:46,0)
-                Markup span - Gen<Markup> - [<wbr>] - SpanEditHandler;Accepts:None - (329:46,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[wbr];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 10 - (334:46,5)
-                Markup span - Gen<Markup> - [</wbrLF}LF] - SpanEditHandler;Accepts:Any - (334:46,5) - Tokens:6
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[wbr];
-                    HtmlTokenType.NewLine;[LF];
-                    HtmlTokenType.Text;[}];
-                    HtmlTokenType.NewLine;[LF];
+RazorDocument - [0..344)::344 - [@{LF<area></areaLF}LF@{LF<base></baseLF}LF@{LF<br></brLF}LF@{LF<col></colLF}LF@{LF<command></commandLF}LF@{LF<embed></embedLF}LF@{LF<hr></hrLF}LF@{LF<img></imgLF}LF@{LF<input></inputLF}LF@{LF<keygen></keygenLF}LF@{LF<link></linkLF}LF@{LF<meta></metaLF}LF@{LF<param></paramLF}LF@{LF<source></sourceLF}LF@{LF<track></trackLF}LF@{LF<wbr></wbrLF}LF]
+    MarkupBlock - [0..344)::344
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..344)::344
+            CSharpStatement - [0..344)::344
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..344)::343
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..344)::342
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [4..25)::21
+                            MarkupTagBlock - [4..10)::6 - [<area>]
+                                MarkupTextLiteral - [4..10)::6 - [<area>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[area];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [10..25)::15 - [</areaLF}LF@{LF]
+                                MarkupTextLiteral - [10..25)::15 - [</areaLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[area];
+                                    NewLine;[LF];
+                                    Text;[}];
+                                    NewLine;[LF];
+                                    Transition;[@];
+                                    Text;[{];
+                                    NewLine;[LF];
+                        MarkupBlock - [25..46)::21
+                            MarkupTagBlock - [25..31)::6 - [<base>]
+                                MarkupTextLiteral - [25..31)::6 - [<base>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[base];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [31..46)::15 - [</baseLF}LF@{LF]
+                                MarkupTextLiteral - [31..46)::15 - [</baseLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[base];
+                                    NewLine;[LF];
+                                    Text;[}];
+                                    NewLine;[LF];
+                                    Transition;[@];
+                                    Text;[{];
+                                    NewLine;[LF];
+                        MarkupBlock - [46..63)::17
+                            MarkupTagBlock - [46..50)::4 - [<br>]
+                                MarkupTextLiteral - [46..50)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[br];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [50..63)::13 - [</brLF}LF@{LF]
+                                MarkupTextLiteral - [50..63)::13 - [</brLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[br];
+                                    NewLine;[LF];
+                                    Text;[}];
+                                    NewLine;[LF];
+                                    Transition;[@];
+                                    Text;[{];
+                                    NewLine;[LF];
+                        MarkupBlock - [63..82)::19
+                            MarkupTagBlock - [63..68)::5 - [<col>]
+                                MarkupTextLiteral - [63..68)::5 - [<col>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[col];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [68..82)::14 - [</colLF}LF@{LF]
+                                MarkupTextLiteral - [68..82)::14 - [</colLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[col];
+                                    NewLine;[LF];
+                                    Text;[}];
+                                    NewLine;[LF];
+                                    Transition;[@];
+                                    Text;[{];
+                                    NewLine;[LF];
+                        MarkupBlock - [82..109)::27
+                            MarkupTagBlock - [82..91)::9 - [<command>]
+                                MarkupTextLiteral - [82..91)::9 - [<command>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[command];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [91..109)::18 - [</commandLF}LF@{LF]
+                                MarkupTextLiteral - [91..109)::18 - [</commandLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[command];
+                                    NewLine;[LF];
+                                    Text;[}];
+                                    NewLine;[LF];
+                                    Transition;[@];
+                                    Text;[{];
+                                    NewLine;[LF];
+                        MarkupBlock - [109..132)::23
+                            MarkupTagBlock - [109..116)::7 - [<embed>]
+                                MarkupTextLiteral - [109..116)::7 - [<embed>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[embed];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [116..132)::16 - [</embedLF}LF@{LF]
+                                MarkupTextLiteral - [116..132)::16 - [</embedLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[embed];
+                                    NewLine;[LF];
+                                    Text;[}];
+                                    NewLine;[LF];
+                                    Transition;[@];
+                                    Text;[{];
+                                    NewLine;[LF];
+                        MarkupBlock - [132..149)::17
+                            MarkupTagBlock - [132..136)::4 - [<hr>]
+                                MarkupTextLiteral - [132..136)::4 - [<hr>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[hr];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [136..149)::13 - [</hrLF}LF@{LF]
+                                MarkupTextLiteral - [136..149)::13 - [</hrLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[hr];
+                                    NewLine;[LF];
+                                    Text;[}];
+                                    NewLine;[LF];
+                                    Transition;[@];
+                                    Text;[{];
+                                    NewLine;[LF];
+                        MarkupBlock - [149..168)::19
+                            MarkupTagBlock - [149..154)::5 - [<img>]
+                                MarkupTextLiteral - [149..154)::5 - [<img>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[img];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [154..168)::14 - [</imgLF}LF@{LF]
+                                MarkupTextLiteral - [154..168)::14 - [</imgLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[img];
+                                    NewLine;[LF];
+                                    Text;[}];
+                                    NewLine;[LF];
+                                    Transition;[@];
+                                    Text;[{];
+                                    NewLine;[LF];
+                        MarkupBlock - [168..191)::23
+                            MarkupTagBlock - [168..175)::7 - [<input>]
+                                MarkupTextLiteral - [168..175)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [175..191)::16 - [</inputLF}LF@{LF]
+                                MarkupTextLiteral - [175..191)::16 - [</inputLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[input];
+                                    NewLine;[LF];
+                                    Text;[}];
+                                    NewLine;[LF];
+                                    Transition;[@];
+                                    Text;[{];
+                                    NewLine;[LF];
+                        MarkupBlock - [191..216)::25
+                            MarkupTagBlock - [191..199)::8 - [<keygen>]
+                                MarkupTextLiteral - [191..199)::8 - [<keygen>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[keygen];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [199..216)::17 - [</keygenLF}LF@{LF]
+                                MarkupTextLiteral - [199..216)::17 - [</keygenLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[keygen];
+                                    NewLine;[LF];
+                                    Text;[}];
+                                    NewLine;[LF];
+                                    Transition;[@];
+                                    Text;[{];
+                                    NewLine;[LF];
+                        MarkupBlock - [216..237)::21
+                            MarkupTagBlock - [216..222)::6 - [<link>]
+                                MarkupTextLiteral - [216..222)::6 - [<link>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[link];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [222..237)::15 - [</linkLF}LF@{LF]
+                                MarkupTextLiteral - [222..237)::15 - [</linkLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[link];
+                                    NewLine;[LF];
+                                    Text;[}];
+                                    NewLine;[LF];
+                                    Transition;[@];
+                                    Text;[{];
+                                    NewLine;[LF];
+                        MarkupBlock - [237..258)::21
+                            MarkupTagBlock - [237..243)::6 - [<meta>]
+                                MarkupTextLiteral - [237..243)::6 - [<meta>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[meta];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [243..258)::15 - [</metaLF}LF@{LF]
+                                MarkupTextLiteral - [243..258)::15 - [</metaLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[meta];
+                                    NewLine;[LF];
+                                    Text;[}];
+                                    NewLine;[LF];
+                                    Transition;[@];
+                                    Text;[{];
+                                    NewLine;[LF];
+                        MarkupBlock - [258..281)::23
+                            MarkupTagBlock - [258..265)::7 - [<param>]
+                                MarkupTextLiteral - [258..265)::7 - [<param>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[param];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [265..281)::16 - [</paramLF}LF@{LF]
+                                MarkupTextLiteral - [265..281)::16 - [</paramLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[param];
+                                    NewLine;[LF];
+                                    Text;[}];
+                                    NewLine;[LF];
+                                    Transition;[@];
+                                    Text;[{];
+                                    NewLine;[LF];
+                        MarkupBlock - [281..306)::25
+                            MarkupTagBlock - [281..289)::8 - [<source>]
+                                MarkupTextLiteral - [281..289)::8 - [<source>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[source];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [289..306)::17 - [</sourceLF}LF@{LF]
+                                MarkupTextLiteral - [289..306)::17 - [</sourceLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[source];
+                                    NewLine;[LF];
+                                    Text;[}];
+                                    NewLine;[LF];
+                                    Transition;[@];
+                                    Text;[{];
+                                    NewLine;[LF];
+                        MarkupBlock - [306..329)::23
+                            MarkupTagBlock - [306..313)::7 - [<track>]
+                                MarkupTextLiteral - [306..313)::7 - [<track>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[track];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [313..329)::16 - [</trackLF}LF@{LF]
+                                MarkupTextLiteral - [313..329)::16 - [</trackLF}LF@{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[track];
+                                    NewLine;[LF];
+                                    Text;[}];
+                                    NewLine;[LF];
+                                    Transition;[@];
+                                    Text;[{];
+                                    NewLine;[LF];
+                        MarkupBlock - [329..344)::15
+                            MarkupTagBlock - [329..334)::5 - [<wbr>]
+                                MarkupTextLiteral - [329..334)::5 - [<wbr>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[wbr];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [334..344)::10 - [</wbrLF}LF]
+                                MarkupTextLiteral - [334..344)::10 - [</wbrLF}LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[wbr];
+                                    NewLine;[LF];
+                                    Text;[}];
+                                    NewLine;[LF];
+                    RazorMetaCode - [344..344)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ProcessingInstructionTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ProcessingInstructionTag.stree.txt
index 7d66b5c3a9..e239ffba00 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ProcessingInstructionTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ProcessingInstructionTag.stree.txt
@@ -1,16 +1,16 @@
-Markup block - Gen<None> - 23 - (0:0,0)
-    Markup span - Gen<Markup> - [<?xml version="1.0" ?>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:12
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.QuestionMark;[?];
-        HtmlTokenType.Text;[xml];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[version];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.DoubleQuote;["];
-        HtmlTokenType.Text;[1.0];
-        HtmlTokenType.DoubleQuote;["];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.QuestionMark;[?];
-        HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
+MarkupBlock - [0..23)::23 - [<?xml version="1.0" ?> ]
+    MarkupTextLiteral - [0..22)::22 - [<?xml version="1.0" ?>] - Gen<Markup> - SpanEditHandler;Accepts:None
+        OpenAngle;[<];
+        QuestionMark;[?];
+        Text;[xml];
+        Whitespace;[ ];
+        Text;[version];
+        Equals;[=];
+        DoubleQuote;["];
+        Text;[1.0];
+        DoubleQuote;["];
+        Whitespace;[ ];
+        QuestionMark;[?];
+        CloseAngle;[>];
+    MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag.stree.txt
index ed254562aa..7f99f00f9a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag.stree.txt
@@ -1,28 +1,29 @@
-Markup block - Gen<None> - 68 - (0:0,0)
-    Tag block - Gen<None> - 8 - (0:0,0)
-        Markup span - Gen<Markup> - [<script>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [foo < bar && quantity.toString() !== orderQty.val()] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:15
-        HtmlTokenType.Text;[foo];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[bar];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[&&];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[quantity.toString()];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Bang;[!];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[orderQty.val()];
-    Tag block - Gen<None> - 9 - (59:0,59)
-        Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (59:0,59) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..68)::68 - [<script>foo < bar && quantity.toString() !== orderQty.val()</script>]
+    MarkupBlock - [0..68)::68
+        MarkupTagBlock - [0..8)::8 - [<script>]
+            MarkupTextLiteral - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+        MarkupTextLiteral - [8..59)::51 - [foo < bar && quantity.toString() !== orderQty.val()] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+            OpenAngle;[<];
+            Whitespace;[ ];
+            Text;[bar];
+            Whitespace;[ ];
+            Text;[&&];
+            Whitespace;[ ];
+            Text;[quantity.toString()];
+            Whitespace;[ ];
+            Bang;[!];
+            Equals;[=];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[orderQty.val()];
+        MarkupTagBlock - [59..68)::9 - [</script>]
+            MarkupTextLiteral - [59..68)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedBeginTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedBeginTag.stree.txt
index 3e94718dc5..56d08090e9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedBeginTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedBeginTag.stree.txt
@@ -1,16 +1,17 @@
-Markup block - Gen<None> - 20 - (0:0,0)
-    Tag block - Gen<None> - 8 - (0:0,0)
-        Markup span - Gen<Markup> - [<script>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:3
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Text;[p];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 9 - (11:0,11)
-        Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..20)::20 - [<script><p></script>]
+    MarkupBlock - [0..20)::20
+        MarkupTagBlock - [0..8)::8 - [<script>]
+            MarkupTextLiteral - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+        MarkupTextLiteral - [8..11)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[p];
+            CloseAngle;[>];
+        MarkupTagBlock - [11..20)::9 - [</script>]
+            MarkupTextLiteral - [11..20)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedEndTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedEndTag.stree.txt
index 97b4a1304e..24eda177d7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedEndTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedEndTag.stree.txt
@@ -1,17 +1,18 @@
-Markup block - Gen<None> - 21 - (0:0,0)
-    Tag block - Gen<None> - 8 - (0:0,0)
-        Markup span - Gen<Markup> - [<script>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:4
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.ForwardSlash;[/];
-        HtmlTokenType.Text;[p];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 9 - (12:0,12)
-        Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..21)::21 - [<script></p></script>]
+    MarkupBlock - [0..21)::21
+        MarkupTagBlock - [0..8)::8 - [<script>]
+            MarkupTextLiteral - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+        MarkupTextLiteral - [8..12)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[p];
+            CloseAngle;[>];
+        MarkupTagBlock - [12..21)::9 - [</script>]
+            MarkupTextLiteral - [12..21)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedMalformedTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedMalformedTag.stree.txt
index a5cd73d797..9652a8ea75 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedMalformedTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedMalformedTag.stree.txt
@@ -1,29 +1,30 @@
-Markup block - Gen<None> - 39 - (0:0,0)
-    Tag block - Gen<None> - 8 - (0:0,0)
-        Markup span - Gen<Markup> - [<script>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [var four = 4; /* </ */] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:16
-        HtmlTokenType.Text;[var];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[four];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[4;];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.ForwardSlash;[/];
-        HtmlTokenType.Text;[*];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.ForwardSlash;[/];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[*];
-        HtmlTokenType.ForwardSlash;[/];
-    Tag block - Gen<None> - 9 - (30:0,30)
-        Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..39)::39 - [<script>var four = 4; /* </ */</script>]
+    MarkupBlock - [0..39)::39
+        MarkupTagBlock - [0..8)::8 - [<script>]
+            MarkupTextLiteral - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+        MarkupTextLiteral - [8..30)::22 - [var four = 4; /* </ */] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[var];
+            Whitespace;[ ];
+            Text;[four];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[4;];
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            Text;[*];
+            Whitespace;[ ];
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Whitespace;[ ];
+            Text;[*];
+            ForwardSlash;[/];
+        MarkupTagBlock - [30..39)::9 - [</script>]
+            MarkupTextLiteral - [30..39)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedTag.stree.txt
index bb1ed4f76a..161404efd2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/ScriptTag_WithNestedTag.stree.txt
@@ -1,20 +1,21 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Tag block - Gen<None> - 8 - (0:0,0)
-        Markup span - Gen<Markup> - [<script>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<p></p>] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:7
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Text;[p];
-        HtmlTokenType.CloseAngle;[>];
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.ForwardSlash;[/];
-        HtmlTokenType.Text;[p];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 9 - (15:0,15)
-        Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..24)::24 - [<script><p></p></script>]
+    MarkupBlock - [0..24)::24
+        MarkupTagBlock - [0..8)::8 - [<script>]
+            MarkupTextLiteral - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+        MarkupTextLiteral - [8..15)::7 - [<p></p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[p];
+            CloseAngle;[>];
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[p];
+            CloseAngle;[>];
+        MarkupTagBlock - [15..24)::9 - [</script>]
+            MarkupTextLiteral - [15..24)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/TextTags.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/TextTags.stree.txt
index e1a2c4922d..7c6e8f6fdd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/TextTags.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/TextTags.stree.txt
@@ -1,14 +1,14 @@
-Markup block - Gen<None> - 16 - (0:0,0)
-    Tag block - Gen<None> - 6 - (0:0,0)
-        Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[text];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:1
-        HtmlTokenType.Text;[Foo];
-    Tag block - Gen<None> - 7 - (9:0,9)
-        Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[text];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..16)::16 - [<text>Foo</text>]
+    MarkupTagBlock - [0..6)::6 - [<text>]
+        MarkupTransition - [0..6)::6 - Gen<None> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[text];
+            CloseAngle;[>];
+    MarkupTextLiteral - [6..9)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:None
+        Text;[Foo];
+    MarkupTagBlock - [9..16)::7 - [</text>]
+        MarkupTransition - [9..16)::7 - Gen<None> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[text];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByCloseTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByCloseTag.stree.txt
index fa0a355fa5..205e42d6a6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByCloseTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByCloseTag.stree.txt
@@ -1,563 +1,612 @@
-Markup block - Gen<None> - 584 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 34 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (2:0,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 14 - (4:1,0)
-            Tag block - Gen<None> - 6 - (4:1,0)
-                Markup span - Gen<Markup> - [<area>] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[area];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (10:1,6) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 7 - (11:1,7)
-                Markup span - Gen<Markup> - [</area>] - SpanEditHandler;Accepts:None - (11:1,7) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[area];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (18:1,14) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (33:2,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (34:2,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 34 - (36:3,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (36:3,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (37:3,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (38:3,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 14 - (40:4,0)
-            Tag block - Gen<None> - 6 - (40:4,0)
-                Markup span - Gen<Markup> - [<base>] - SpanEditHandler;Accepts:None - (40:4,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[base];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (46:4,6) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 7 - (47:4,7)
-                Markup span - Gen<Markup> - [</base>] - SpanEditHandler;Accepts:None - (47:4,7) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[base];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (54:4,14) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (69:5,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (70:5,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 30 - (72:6,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (72:6,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (73:6,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (74:6,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 10 - (76:7,0)
-            Tag block - Gen<None> - 4 - (76:7,0)
-                Markup span - Gen<Markup> - [<br>] - SpanEditHandler;Accepts:None - (76:7,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[br];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (80:7,4) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 5 - (81:7,5)
-                Markup span - Gen<Markup> - [</br>] - SpanEditHandler;Accepts:None - (81:7,5) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[br];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (86:7,10) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (101:8,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (102:8,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 32 - (104:9,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (104:9,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (105:9,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (106:9,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 12 - (108:10,0)
-            Tag block - Gen<None> - 5 - (108:10,0)
-                Markup span - Gen<Markup> - [<col>] - SpanEditHandler;Accepts:None - (108:10,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[col];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (113:10,5) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 6 - (114:10,6)
-                Markup span - Gen<Markup> - [</col>] - SpanEditHandler;Accepts:None - (114:10,6) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[col];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (120:10,12) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (135:11,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (136:11,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 40 - (138:12,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (138:12,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (139:12,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (140:12,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 20 - (142:13,0)
-            Tag block - Gen<None> - 9 - (142:13,0)
-                Markup span - Gen<Markup> - [<command>] - SpanEditHandler;Accepts:None - (142:13,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[command];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (151:13,9) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 10 - (152:13,10)
-                Markup span - Gen<Markup> - [</command>] - SpanEditHandler;Accepts:None - (152:13,10) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[command];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (162:13,20) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (177:14,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (178:14,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 36 - (180:15,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (180:15,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (181:15,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (182:15,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 16 - (184:16,0)
-            Tag block - Gen<None> - 7 - (184:16,0)
-                Markup span - Gen<Markup> - [<embed>] - SpanEditHandler;Accepts:None - (184:16,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[embed];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (191:16,7) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 8 - (192:16,8)
-                Markup span - Gen<Markup> - [</embed>] - SpanEditHandler;Accepts:None - (192:16,8) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[embed];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (200:16,16) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (215:17,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (216:17,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 30 - (218:18,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (218:18,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (219:18,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (220:18,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 10 - (222:19,0)
-            Tag block - Gen<None> - 4 - (222:19,0)
-                Markup span - Gen<Markup> - [<hr>] - SpanEditHandler;Accepts:None - (222:19,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[hr];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (226:19,4) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 5 - (227:19,5)
-                Markup span - Gen<Markup> - [</hr>] - SpanEditHandler;Accepts:None - (227:19,5) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[hr];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (232:19,10) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (247:20,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (248:20,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 32 - (250:21,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (250:21,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (251:21,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (252:21,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 12 - (254:22,0)
-            Tag block - Gen<None> - 5 - (254:22,0)
-                Markup span - Gen<Markup> - [<img>] - SpanEditHandler;Accepts:None - (254:22,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[img];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (259:22,5) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 6 - (260:22,6)
-                Markup span - Gen<Markup> - [</img>] - SpanEditHandler;Accepts:None - (260:22,6) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[img];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (266:22,12) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (281:23,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (282:23,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 36 - (284:24,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (284:24,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (285:24,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (286:24,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 16 - (288:25,0)
-            Tag block - Gen<None> - 7 - (288:25,0)
-                Markup span - Gen<Markup> - [<input>] - SpanEditHandler;Accepts:None - (288:25,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[input];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (295:25,7) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 8 - (296:25,8)
-                Markup span - Gen<Markup> - [</input>] - SpanEditHandler;Accepts:None - (296:25,8) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[input];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (304:25,16) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (319:26,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (320:26,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 38 - (322:27,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (322:27,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (323:27,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (324:27,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 18 - (326:28,0)
-            Tag block - Gen<None> - 8 - (326:28,0)
-                Markup span - Gen<Markup> - [<keygen>] - SpanEditHandler;Accepts:None - (326:28,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[keygen];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (334:28,8) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 9 - (335:28,9)
-                Markup span - Gen<Markup> - [</keygen>] - SpanEditHandler;Accepts:None - (335:28,9) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[keygen];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (344:28,18) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (359:29,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (360:29,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 34 - (362:30,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (362:30,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (363:30,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (364:30,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 14 - (366:31,0)
-            Tag block - Gen<None> - 6 - (366:31,0)
-                Markup span - Gen<Markup> - [<link>] - SpanEditHandler;Accepts:None - (366:31,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[link];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (372:31,6) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 7 - (373:31,7)
-                Markup span - Gen<Markup> - [</link>] - SpanEditHandler;Accepts:None - (373:31,7) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[link];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (380:31,14) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (395:32,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (396:32,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 34 - (398:33,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (398:33,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (399:33,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (400:33,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 14 - (402:34,0)
-            Tag block - Gen<None> - 6 - (402:34,0)
-                Markup span - Gen<Markup> - [<meta>] - SpanEditHandler;Accepts:None - (402:34,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[meta];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (408:34,6) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 7 - (409:34,7)
-                Markup span - Gen<Markup> - [</meta>] - SpanEditHandler;Accepts:None - (409:34,7) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[meta];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (416:34,14) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (431:35,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (432:35,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 36 - (434:36,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (434:36,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (435:36,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (436:36,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 16 - (438:37,0)
-            Tag block - Gen<None> - 7 - (438:37,0)
-                Markup span - Gen<Markup> - [<param>] - SpanEditHandler;Accepts:None - (438:37,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[param];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (445:37,7) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 8 - (446:37,8)
-                Markup span - Gen<Markup> - [</param>] - SpanEditHandler;Accepts:None - (446:37,8) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[param];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (454:37,16) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (469:38,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (470:38,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 38 - (472:39,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (472:39,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (473:39,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (474:39,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 18 - (476:40,0)
-            Tag block - Gen<None> - 8 - (476:40,0)
-                Markup span - Gen<Markup> - [<source>] - SpanEditHandler;Accepts:None - (476:40,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[source];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (484:40,8) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 9 - (485:40,9)
-                Markup span - Gen<Markup> - [</source>] - SpanEditHandler;Accepts:None - (485:40,9) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[source];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (494:40,18) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (509:41,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (510:41,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 36 - (512:42,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (512:42,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (513:42,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (514:42,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 16 - (516:43,0)
-            Tag block - Gen<None> - 7 - (516:43,0)
-                Markup span - Gen<Markup> - [<track>] - SpanEditHandler;Accepts:None - (516:43,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[track];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (523:43,7) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 8 - (524:43,8)
-                Markup span - Gen<Markup> - [</track>] - SpanEditHandler;Accepts:None - (524:43,8) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[track];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (532:43,16) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (547:44,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (548:44,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 32 - (550:45,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (550:45,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (551:45,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (552:45,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 12 - (554:46,0)
-            Tag block - Gen<None> - 5 - (554:46,0)
-                Markup span - Gen<Markup> - [<wbr>] - SpanEditHandler;Accepts:None - (554:46,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[wbr];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (559:46,5) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 6 - (560:46,6)
-                Markup span - Gen<Markup> - [</wbr>] - SpanEditHandler;Accepts:None - (560:46,6) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[wbr];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (566:46,12) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (581:47,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (582:47,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
+RazorDocument - [0..584)::584 - [@{LF<area> </area>var x = true;LF}LF@{LF<base> </base>var x = true;LF}LF@{LF<br> </br>var x = true;LF}LF@{LF<col> </col>var x = true;LF}LF@{LF<command> </command>var x = true;LF}LF@{LF<embed> </embed>var x = true;LF}LF@{LF<hr> </hr>var x = true;LF}LF@{LF<img> </img>var x = true;LF}LF@{LF<input> </input>var x = true;LF}LF@{LF<keygen> </keygen>var x = true;LF}LF@{LF<link> </link>var x = true;LF}LF@{LF<meta> </meta>var x = true;LF}LF@{LF<param> </param>var x = true;LF}LF@{LF<source> </source>var x = true;LF}LF@{LF<track> </track>var x = true;LF}LF@{LF<wbr> </wbr>var x = true;LF}LF]
+    MarkupBlock - [0..584)::584
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [4..18)::14
+                            MarkupTagBlock - [4..10)::6 - [<area>]
+                                MarkupTextLiteral - [4..10)::6 - [<area>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[area];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [10..11)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [11..18)::7 - [</area>]
+                                MarkupTextLiteral - [11..18)::7 - [</area>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[area];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [18..33)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [34..36)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [36..70)::34
+            CSharpStatement - [36..70)::34
+                CSharpTransition - [36..37)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [37..70)::33
+                    RazorMetaCode - [37..38)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [38..69)::31
+                        CSharpStatementLiteral - [38..40)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [40..54)::14
+                            MarkupTagBlock - [40..46)::6 - [<base>]
+                                MarkupTextLiteral - [40..46)::6 - [<base>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[base];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [46..47)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [47..54)::7 - [</base>]
+                                MarkupTextLiteral - [47..54)::7 - [</base>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[base];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [54..69)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [69..70)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [70..72)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [72..102)::30
+            CSharpStatement - [72..102)::30
+                CSharpTransition - [72..73)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [73..102)::29
+                    RazorMetaCode - [73..74)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [74..101)::27
+                        CSharpStatementLiteral - [74..76)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [76..86)::10
+                            MarkupTagBlock - [76..80)::4 - [<br>]
+                                MarkupTextLiteral - [76..80)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[br];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [80..81)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [81..86)::5 - [</br>]
+                                MarkupTextLiteral - [81..86)::5 - [</br>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[br];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [86..101)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [101..102)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [102..104)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [104..136)::32
+            CSharpStatement - [104..136)::32
+                CSharpTransition - [104..105)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [105..136)::31
+                    RazorMetaCode - [105..106)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [106..135)::29
+                        CSharpStatementLiteral - [106..108)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [108..120)::12
+                            MarkupTagBlock - [108..113)::5 - [<col>]
+                                MarkupTextLiteral - [108..113)::5 - [<col>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[col];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [113..114)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [114..120)::6 - [</col>]
+                                MarkupTextLiteral - [114..120)::6 - [</col>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[col];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [120..135)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [135..136)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [136..138)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [138..178)::40
+            CSharpStatement - [138..178)::40
+                CSharpTransition - [138..139)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [139..178)::39
+                    RazorMetaCode - [139..140)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [140..177)::37
+                        CSharpStatementLiteral - [140..142)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [142..162)::20
+                            MarkupTagBlock - [142..151)::9 - [<command>]
+                                MarkupTextLiteral - [142..151)::9 - [<command>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[command];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [151..152)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [152..162)::10 - [</command>]
+                                MarkupTextLiteral - [152..162)::10 - [</command>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[command];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [162..177)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [177..178)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [178..180)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [180..216)::36
+            CSharpStatement - [180..216)::36
+                CSharpTransition - [180..181)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [181..216)::35
+                    RazorMetaCode - [181..182)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [182..215)::33
+                        CSharpStatementLiteral - [182..184)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [184..200)::16
+                            MarkupTagBlock - [184..191)::7 - [<embed>]
+                                MarkupTextLiteral - [184..191)::7 - [<embed>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[embed];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [191..192)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [192..200)::8 - [</embed>]
+                                MarkupTextLiteral - [192..200)::8 - [</embed>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[embed];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [200..215)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [215..216)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [216..218)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [218..248)::30
+            CSharpStatement - [218..248)::30
+                CSharpTransition - [218..219)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [219..248)::29
+                    RazorMetaCode - [219..220)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [220..247)::27
+                        CSharpStatementLiteral - [220..222)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [222..232)::10
+                            MarkupTagBlock - [222..226)::4 - [<hr>]
+                                MarkupTextLiteral - [222..226)::4 - [<hr>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[hr];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [226..227)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [227..232)::5 - [</hr>]
+                                MarkupTextLiteral - [227..232)::5 - [</hr>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[hr];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [232..247)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [247..248)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [248..250)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [250..282)::32
+            CSharpStatement - [250..282)::32
+                CSharpTransition - [250..251)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [251..282)::31
+                    RazorMetaCode - [251..252)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [252..281)::29
+                        CSharpStatementLiteral - [252..254)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [254..266)::12
+                            MarkupTagBlock - [254..259)::5 - [<img>]
+                                MarkupTextLiteral - [254..259)::5 - [<img>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[img];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [259..260)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [260..266)::6 - [</img>]
+                                MarkupTextLiteral - [260..266)::6 - [</img>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[img];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [266..281)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [281..282)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [282..284)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [284..320)::36
+            CSharpStatement - [284..320)::36
+                CSharpTransition - [284..285)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [285..320)::35
+                    RazorMetaCode - [285..286)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [286..319)::33
+                        CSharpStatementLiteral - [286..288)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [288..304)::16
+                            MarkupTagBlock - [288..295)::7 - [<input>]
+                                MarkupTextLiteral - [288..295)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [295..296)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [296..304)::8 - [</input>]
+                                MarkupTextLiteral - [296..304)::8 - [</input>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[input];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [304..319)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [319..320)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [320..322)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [322..360)::38
+            CSharpStatement - [322..360)::38
+                CSharpTransition - [322..323)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [323..360)::37
+                    RazorMetaCode - [323..324)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [324..359)::35
+                        CSharpStatementLiteral - [324..326)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [326..344)::18
+                            MarkupTagBlock - [326..334)::8 - [<keygen>]
+                                MarkupTextLiteral - [326..334)::8 - [<keygen>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[keygen];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [334..335)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [335..344)::9 - [</keygen>]
+                                MarkupTextLiteral - [335..344)::9 - [</keygen>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[keygen];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [344..359)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [359..360)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [360..362)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [362..396)::34
+            CSharpStatement - [362..396)::34
+                CSharpTransition - [362..363)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [363..396)::33
+                    RazorMetaCode - [363..364)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [364..395)::31
+                        CSharpStatementLiteral - [364..366)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [366..380)::14
+                            MarkupTagBlock - [366..372)::6 - [<link>]
+                                MarkupTextLiteral - [366..372)::6 - [<link>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[link];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [372..373)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [373..380)::7 - [</link>]
+                                MarkupTextLiteral - [373..380)::7 - [</link>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[link];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [380..395)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [395..396)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [396..398)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [398..432)::34
+            CSharpStatement - [398..432)::34
+                CSharpTransition - [398..399)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [399..432)::33
+                    RazorMetaCode - [399..400)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [400..431)::31
+                        CSharpStatementLiteral - [400..402)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [402..416)::14
+                            MarkupTagBlock - [402..408)::6 - [<meta>]
+                                MarkupTextLiteral - [402..408)::6 - [<meta>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[meta];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [408..409)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [409..416)::7 - [</meta>]
+                                MarkupTextLiteral - [409..416)::7 - [</meta>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[meta];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [416..431)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [431..432)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [432..434)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [434..470)::36
+            CSharpStatement - [434..470)::36
+                CSharpTransition - [434..435)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [435..470)::35
+                    RazorMetaCode - [435..436)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [436..469)::33
+                        CSharpStatementLiteral - [436..438)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [438..454)::16
+                            MarkupTagBlock - [438..445)::7 - [<param>]
+                                MarkupTextLiteral - [438..445)::7 - [<param>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[param];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [445..446)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [446..454)::8 - [</param>]
+                                MarkupTextLiteral - [446..454)::8 - [</param>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[param];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [454..469)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [469..470)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [470..472)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [472..510)::38
+            CSharpStatement - [472..510)::38
+                CSharpTransition - [472..473)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [473..510)::37
+                    RazorMetaCode - [473..474)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [474..509)::35
+                        CSharpStatementLiteral - [474..476)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [476..494)::18
+                            MarkupTagBlock - [476..484)::8 - [<source>]
+                                MarkupTextLiteral - [476..484)::8 - [<source>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[source];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [484..485)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [485..494)::9 - [</source>]
+                                MarkupTextLiteral - [485..494)::9 - [</source>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[source];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [494..509)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [509..510)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [510..512)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [512..548)::36
+            CSharpStatement - [512..548)::36
+                CSharpTransition - [512..513)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [513..548)::35
+                    RazorMetaCode - [513..514)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [514..547)::33
+                        CSharpStatementLiteral - [514..516)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [516..532)::16
+                            MarkupTagBlock - [516..523)::7 - [<track>]
+                                MarkupTextLiteral - [516..523)::7 - [<track>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[track];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [523..524)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [524..532)::8 - [</track>]
+                                MarkupTextLiteral - [524..532)::8 - [</track>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[track];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [532..547)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [547..548)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [548..550)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [550..582)::32
+            CSharpStatement - [550..582)::32
+                CSharpTransition - [550..551)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [551..582)::31
+                    RazorMetaCode - [551..552)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [552..581)::29
+                        CSharpStatementLiteral - [552..554)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [554..566)::12
+                            MarkupTagBlock - [554..559)::5 - [<wbr>]
+                                MarkupTextLiteral - [554..559)::5 - [<wbr>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[wbr];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [559..560)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [560..566)::6 - [</wbr>]
+                                MarkupTextLiteral - [560..566)::6 - [</wbr>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[wbr];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [566..581)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [581..582)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [582..584)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByContent.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByContent.stree.txt
index 9a2a5df9c2..216fe622ff 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByContent.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByContent.stree.txt
@@ -1,435 +1,484 @@
-Markup block - Gen<None> - 452 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 26 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (2:0,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 6 - (4:1,0)
-            Tag block - Gen<None> - 6 - (4:1,0)
-                Markup span - Gen<Markup> - [<area>] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[area];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (10:1,6) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (25:2,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (26:2,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 26 - (28:3,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (28:3,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (29:3,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (30:3,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 6 - (32:4,0)
-            Tag block - Gen<None> - 6 - (32:4,0)
-                Markup span - Gen<Markup> - [<base>] - SpanEditHandler;Accepts:None - (32:4,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[base];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (38:4,6) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (53:5,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (54:5,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 24 - (56:6,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (56:6,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (57:6,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (58:6,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 4 - (60:7,0)
-            Tag block - Gen<None> - 4 - (60:7,0)
-                Markup span - Gen<Markup> - [<br>] - SpanEditHandler;Accepts:None - (60:7,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[br];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (64:7,4) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (79:8,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (80:8,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 25 - (82:9,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (82:9,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (83:9,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (84:9,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 5 - (86:10,0)
-            Tag block - Gen<None> - 5 - (86:10,0)
-                Markup span - Gen<Markup> - [<col>] - SpanEditHandler;Accepts:None - (86:10,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[col];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (91:10,5) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (106:11,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (107:11,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 29 - (109:12,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (109:12,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (110:12,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (111:12,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 9 - (113:13,0)
-            Tag block - Gen<None> - 9 - (113:13,0)
-                Markup span - Gen<Markup> - [<command>] - SpanEditHandler;Accepts:None - (113:13,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[command];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (122:13,9) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (137:14,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (138:14,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 27 - (140:15,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (140:15,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (141:15,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (142:15,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 7 - (144:16,0)
-            Tag block - Gen<None> - 7 - (144:16,0)
-                Markup span - Gen<Markup> - [<embed>] - SpanEditHandler;Accepts:None - (144:16,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[embed];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (151:16,7) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (166:17,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (167:17,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 24 - (169:18,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (169:18,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (170:18,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (171:18,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 4 - (173:19,0)
-            Tag block - Gen<None> - 4 - (173:19,0)
-                Markup span - Gen<Markup> - [<hr>] - SpanEditHandler;Accepts:None - (173:19,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[hr];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (177:19,4) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (192:20,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (193:20,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 25 - (195:21,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (195:21,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (196:21,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (197:21,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 5 - (199:22,0)
-            Tag block - Gen<None> - 5 - (199:22,0)
-                Markup span - Gen<Markup> - [<img>] - SpanEditHandler;Accepts:None - (199:22,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[img];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (204:22,5) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (219:23,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (220:23,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 27 - (222:24,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (222:24,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (223:24,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (224:24,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 7 - (226:25,0)
-            Tag block - Gen<None> - 7 - (226:25,0)
-                Markup span - Gen<Markup> - [<input>] - SpanEditHandler;Accepts:None - (226:25,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[input];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (233:25,7) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (248:26,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (249:26,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 28 - (251:27,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (251:27,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (252:27,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (253:27,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 8 - (255:28,0)
-            Tag block - Gen<None> - 8 - (255:28,0)
-                Markup span - Gen<Markup> - [<keygen>] - SpanEditHandler;Accepts:None - (255:28,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[keygen];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (263:28,8) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (278:29,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (279:29,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 26 - (281:30,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (281:30,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (282:30,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (283:30,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 6 - (285:31,0)
-            Tag block - Gen<None> - 6 - (285:31,0)
-                Markup span - Gen<Markup> - [<link>] - SpanEditHandler;Accepts:None - (285:31,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[link];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (291:31,6) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (306:32,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (307:32,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 26 - (309:33,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (309:33,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (310:33,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (311:33,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 6 - (313:34,0)
-            Tag block - Gen<None> - 6 - (313:34,0)
-                Markup span - Gen<Markup> - [<meta>] - SpanEditHandler;Accepts:None - (313:34,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[meta];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (319:34,6) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (334:35,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (335:35,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 27 - (337:36,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (337:36,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (338:36,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (339:36,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 7 - (341:37,0)
-            Tag block - Gen<None> - 7 - (341:37,0)
-                Markup span - Gen<Markup> - [<param>] - SpanEditHandler;Accepts:None - (341:37,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[param];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (348:37,7) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (363:38,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (364:38,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 28 - (366:39,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (366:39,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (367:39,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (368:39,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 8 - (370:40,0)
-            Tag block - Gen<None> - 8 - (370:40,0)
-                Markup span - Gen<Markup> - [<source>] - SpanEditHandler;Accepts:None - (370:40,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[source];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (378:40,8) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (393:41,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (394:41,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 27 - (396:42,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (396:42,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (397:42,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (398:42,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 7 - (400:43,0)
-            Tag block - Gen<None> - 7 - (400:43,0)
-                Markup span - Gen<Markup> - [<track>] - SpanEditHandler;Accepts:None - (400:43,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[track];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (407:43,7) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (422:44,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (423:44,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 25 - (425:45,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (425:45,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (426:45,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Code span - Gen<Stmt> - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (427:45,2) - Tokens:1
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 5 - (429:46,0)
-            Tag block - Gen<None> - 5 - (429:46,0)
-                Markup span - Gen<Markup> - [<wbr>] - SpanEditHandler;Accepts:None - (429:46,0) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[wbr];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [var x = true;LF] - SpanEditHandler;Accepts:Any - (434:46,5) - Tokens:9
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[x];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Assign;[=];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[true];
-            CSharpTokenType.Semicolon;[;];
-            CSharpTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (449:47,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (450:47,1) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
+RazorDocument - [0..452)::452 - [@{LF<area>var x = true;LF}LF@{LF<base>var x = true;LF}LF@{LF<br>var x = true;LF}LF@{LF<col>var x = true;LF}LF@{LF<command>var x = true;LF}LF@{LF<embed>var x = true;LF}LF@{LF<hr>var x = true;LF}LF@{LF<img>var x = true;LF}LF@{LF<input>var x = true;LF}LF@{LF<keygen>var x = true;LF}LF@{LF<link>var x = true;LF}LF@{LF<meta>var x = true;LF}LF@{LF<param>var x = true;LF}LF@{LF<source>var x = true;LF}LF@{LF<track>var x = true;LF}LF@{LF<wbr>var x = true;LF}LF]
+    MarkupBlock - [0..452)::452
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            CSharpStatement - [0..26)::26
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..26)::25
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..25)::23
+                        CSharpStatementLiteral - [2..4)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [4..10)::6
+                            MarkupTagBlock - [4..10)::6 - [<area>]
+                                MarkupTextLiteral - [4..10)::6 - [<area>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[area];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [10..25)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [26..28)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [28..54)::26
+            CSharpStatement - [28..54)::26
+                CSharpTransition - [28..29)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [29..54)::25
+                    RazorMetaCode - [29..30)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [30..53)::23
+                        CSharpStatementLiteral - [30..32)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [32..38)::6
+                            MarkupTagBlock - [32..38)::6 - [<base>]
+                                MarkupTextLiteral - [32..38)::6 - [<base>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[base];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [38..53)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [53..54)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [54..56)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [56..80)::24
+            CSharpStatement - [56..80)::24
+                CSharpTransition - [56..57)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [57..80)::23
+                    RazorMetaCode - [57..58)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [58..79)::21
+                        CSharpStatementLiteral - [58..60)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [60..64)::4
+                            MarkupTagBlock - [60..64)::4 - [<br>]
+                                MarkupTextLiteral - [60..64)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[br];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [64..79)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [79..80)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [80..82)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [82..107)::25
+            CSharpStatement - [82..107)::25
+                CSharpTransition - [82..83)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [83..107)::24
+                    RazorMetaCode - [83..84)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [84..106)::22
+                        CSharpStatementLiteral - [84..86)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [86..91)::5
+                            MarkupTagBlock - [86..91)::5 - [<col>]
+                                MarkupTextLiteral - [86..91)::5 - [<col>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[col];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [91..106)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [106..107)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [107..109)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [109..138)::29
+            CSharpStatement - [109..138)::29
+                CSharpTransition - [109..110)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [110..138)::28
+                    RazorMetaCode - [110..111)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [111..137)::26
+                        CSharpStatementLiteral - [111..113)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [113..122)::9
+                            MarkupTagBlock - [113..122)::9 - [<command>]
+                                MarkupTextLiteral - [113..122)::9 - [<command>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[command];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [122..137)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [137..138)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [138..140)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [140..167)::27
+            CSharpStatement - [140..167)::27
+                CSharpTransition - [140..141)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [141..167)::26
+                    RazorMetaCode - [141..142)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [142..166)::24
+                        CSharpStatementLiteral - [142..144)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [144..151)::7
+                            MarkupTagBlock - [144..151)::7 - [<embed>]
+                                MarkupTextLiteral - [144..151)::7 - [<embed>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[embed];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [151..166)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [166..167)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [167..169)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [169..193)::24
+            CSharpStatement - [169..193)::24
+                CSharpTransition - [169..170)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [170..193)::23
+                    RazorMetaCode - [170..171)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [171..192)::21
+                        CSharpStatementLiteral - [171..173)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [173..177)::4
+                            MarkupTagBlock - [173..177)::4 - [<hr>]
+                                MarkupTextLiteral - [173..177)::4 - [<hr>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[hr];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [177..192)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [192..193)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [193..195)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [195..220)::25
+            CSharpStatement - [195..220)::25
+                CSharpTransition - [195..196)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [196..220)::24
+                    RazorMetaCode - [196..197)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [197..219)::22
+                        CSharpStatementLiteral - [197..199)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [199..204)::5
+                            MarkupTagBlock - [199..204)::5 - [<img>]
+                                MarkupTextLiteral - [199..204)::5 - [<img>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[img];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [204..219)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [219..220)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [220..222)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [222..249)::27
+            CSharpStatement - [222..249)::27
+                CSharpTransition - [222..223)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [223..249)::26
+                    RazorMetaCode - [223..224)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [224..248)::24
+                        CSharpStatementLiteral - [224..226)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [226..233)::7
+                            MarkupTagBlock - [226..233)::7 - [<input>]
+                                MarkupTextLiteral - [226..233)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[input];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [233..248)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [248..249)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [249..251)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [251..279)::28
+            CSharpStatement - [251..279)::28
+                CSharpTransition - [251..252)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [252..279)::27
+                    RazorMetaCode - [252..253)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [253..278)::25
+                        CSharpStatementLiteral - [253..255)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [255..263)::8
+                            MarkupTagBlock - [255..263)::8 - [<keygen>]
+                                MarkupTextLiteral - [255..263)::8 - [<keygen>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[keygen];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [263..278)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [278..279)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [279..281)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [281..307)::26
+            CSharpStatement - [281..307)::26
+                CSharpTransition - [281..282)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [282..307)::25
+                    RazorMetaCode - [282..283)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [283..306)::23
+                        CSharpStatementLiteral - [283..285)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [285..291)::6
+                            MarkupTagBlock - [285..291)::6 - [<link>]
+                                MarkupTextLiteral - [285..291)::6 - [<link>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[link];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [291..306)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [306..307)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [307..309)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [309..335)::26
+            CSharpStatement - [309..335)::26
+                CSharpTransition - [309..310)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [310..335)::25
+                    RazorMetaCode - [310..311)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [311..334)::23
+                        CSharpStatementLiteral - [311..313)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [313..319)::6
+                            MarkupTagBlock - [313..319)::6 - [<meta>]
+                                MarkupTextLiteral - [313..319)::6 - [<meta>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[meta];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [319..334)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [334..335)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [335..337)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [337..364)::27
+            CSharpStatement - [337..364)::27
+                CSharpTransition - [337..338)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [338..364)::26
+                    RazorMetaCode - [338..339)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [339..363)::24
+                        CSharpStatementLiteral - [339..341)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [341..348)::7
+                            MarkupTagBlock - [341..348)::7 - [<param>]
+                                MarkupTextLiteral - [341..348)::7 - [<param>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[param];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [348..363)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [363..364)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [364..366)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [366..394)::28
+            CSharpStatement - [366..394)::28
+                CSharpTransition - [366..367)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [367..394)::27
+                    RazorMetaCode - [367..368)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [368..393)::25
+                        CSharpStatementLiteral - [368..370)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [370..378)::8
+                            MarkupTagBlock - [370..378)::8 - [<source>]
+                                MarkupTextLiteral - [370..378)::8 - [<source>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[source];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [378..393)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [393..394)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [394..396)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [396..423)::27
+            CSharpStatement - [396..423)::27
+                CSharpTransition - [396..397)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [397..423)::26
+                    RazorMetaCode - [397..398)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [398..422)::24
+                        CSharpStatementLiteral - [398..400)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [400..407)::7
+                            MarkupTagBlock - [400..407)::7 - [<track>]
+                                MarkupTextLiteral - [400..407)::7 - [<track>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[track];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [407..422)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [422..423)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [423..425)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [425..450)::25
+            CSharpStatement - [425..450)::25
+                CSharpTransition - [425..426)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [426..450)::24
+                    RazorMetaCode - [426..427)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [427..449)::22
+                        CSharpStatementLiteral - [427..429)::2 - [LF] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                        MarkupBlock - [429..434)::5
+                            MarkupTagBlock - [429..434)::5 - [<wbr>]
+                                MarkupTextLiteral - [429..434)::5 - [<wbr>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[wbr];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [434..449)::15 - [var x = true;LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Identifier;[var];
+                            Whitespace;[ ];
+                            Identifier;[x];
+                            Whitespace;[ ];
+                            Assign;[=];
+                            Whitespace;[ ];
+                            Keyword;[true];
+                            Semicolon;[;];
+                            NewLine;[LF];
+                    RazorMetaCode - [449..450)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupEphemeralTextLiteral - [450..452)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByOtherTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByOtherTag.stree.txt
index ff1e45cbe0..dec1f7732b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByOtherTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlTagsTest/VoidElementFollowedByOtherTag.stree.txt
@@ -1,386 +1,387 @@
-Markup block - Gen<None> - 564 - (0:0,0)
-    Markup span - Gen<Markup> - [{LF] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 6 - (3:1,0)
-        Markup span - Gen<Markup> - [<area>] - SpanEditHandler;Accepts:Any - (3:1,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[area];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (9:1,6)
-        Markup span - Gen<Markup> - [<other>] - SpanEditHandler;Accepts:Any - (9:1,6) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[other];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ var x = true;LF}LF{LF] - SpanEditHandler;Accepts:Any - (16:1,13) - Tokens:13
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[var];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[x];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[true;];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[}];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 6 - (38:4,0)
-        Markup span - Gen<Markup> - [<base>] - SpanEditHandler;Accepts:Any - (38:4,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[base];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (44:4,6)
-        Markup span - Gen<Markup> - [<other>] - SpanEditHandler;Accepts:Any - (44:4,6) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[other];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ var x = true;LF}LF{LF] - SpanEditHandler;Accepts:Any - (51:4,13) - Tokens:13
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[var];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[x];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[true;];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[}];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 4 - (73:7,0)
-        Markup span - Gen<Markup> - [<br>] - SpanEditHandler;Accepts:Any - (73:7,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[br];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (77:7,4)
-        Markup span - Gen<Markup> - [<other>] - SpanEditHandler;Accepts:Any - (77:7,4) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[other];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ var x = true;LF}LF{LF] - SpanEditHandler;Accepts:Any - (84:7,11) - Tokens:13
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[var];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[x];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[true;];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[}];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 5 - (106:10,0)
-        Markup span - Gen<Markup> - [<col>] - SpanEditHandler;Accepts:Any - (106:10,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[col];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (111:10,5)
-        Markup span - Gen<Markup> - [<other>] - SpanEditHandler;Accepts:Any - (111:10,5) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[other];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ var x = true;LF}LF{LF] - SpanEditHandler;Accepts:Any - (118:10,12) - Tokens:13
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[var];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[x];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[true;];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[}];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 9 - (140:13,0)
-        Markup span - Gen<Markup> - [<command>] - SpanEditHandler;Accepts:Any - (140:13,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[command];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (149:13,9)
-        Markup span - Gen<Markup> - [<other>] - SpanEditHandler;Accepts:Any - (149:13,9) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[other];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ var x = true;LF}LF{LF] - SpanEditHandler;Accepts:Any - (156:13,16) - Tokens:13
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[var];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[x];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[true;];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[}];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 7 - (178:16,0)
-        Markup span - Gen<Markup> - [<embed>] - SpanEditHandler;Accepts:Any - (178:16,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[embed];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (185:16,7)
-        Markup span - Gen<Markup> - [<other>] - SpanEditHandler;Accepts:Any - (185:16,7) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[other];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ var x = true;LF}LF{LF] - SpanEditHandler;Accepts:Any - (192:16,14) - Tokens:13
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[var];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[x];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[true;];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[}];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 4 - (214:19,0)
-        Markup span - Gen<Markup> - [<hr>] - SpanEditHandler;Accepts:Any - (214:19,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[hr];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (218:19,4)
-        Markup span - Gen<Markup> - [<other>] - SpanEditHandler;Accepts:Any - (218:19,4) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[other];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ var x = true;LF}LF{LF] - SpanEditHandler;Accepts:Any - (225:19,11) - Tokens:13
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[var];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[x];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[true;];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[}];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 5 - (247:22,0)
-        Markup span - Gen<Markup> - [<img>] - SpanEditHandler;Accepts:Any - (247:22,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[img];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (252:22,5)
-        Markup span - Gen<Markup> - [<other>] - SpanEditHandler;Accepts:Any - (252:22,5) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[other];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ var x = true;LF}LF{LF] - SpanEditHandler;Accepts:Any - (259:22,12) - Tokens:13
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[var];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[x];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[true;];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[}];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 7 - (281:25,0)
-        Markup span - Gen<Markup> - [<input>] - SpanEditHandler;Accepts:Any - (281:25,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[input];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (288:25,7)
-        Markup span - Gen<Markup> - [<other>] - SpanEditHandler;Accepts:Any - (288:25,7) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[other];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ var x = true;LF}LF{LF] - SpanEditHandler;Accepts:Any - (295:25,14) - Tokens:13
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[var];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[x];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[true;];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[}];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 8 - (317:28,0)
-        Markup span - Gen<Markup> - [<keygen>] - SpanEditHandler;Accepts:Any - (317:28,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[keygen];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (325:28,8)
-        Markup span - Gen<Markup> - [<other>] - SpanEditHandler;Accepts:Any - (325:28,8) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[other];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ var x = true;LF}LF{LF] - SpanEditHandler;Accepts:Any - (332:28,15) - Tokens:13
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[var];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[x];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[true;];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[}];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 6 - (354:31,0)
-        Markup span - Gen<Markup> - [<link>] - SpanEditHandler;Accepts:Any - (354:31,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[link];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (360:31,6)
-        Markup span - Gen<Markup> - [<other>] - SpanEditHandler;Accepts:Any - (360:31,6) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[other];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ var x = true;LF}LF{LF] - SpanEditHandler;Accepts:Any - (367:31,13) - Tokens:13
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[var];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[x];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[true;];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[}];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 6 - (389:34,0)
-        Markup span - Gen<Markup> - [<meta>] - SpanEditHandler;Accepts:Any - (389:34,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[meta];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (395:34,6)
-        Markup span - Gen<Markup> - [<other>] - SpanEditHandler;Accepts:Any - (395:34,6) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[other];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ var x = true;LF}LF{LF] - SpanEditHandler;Accepts:Any - (402:34,13) - Tokens:13
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[var];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[x];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[true;];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[}];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 7 - (424:37,0)
-        Markup span - Gen<Markup> - [<param>] - SpanEditHandler;Accepts:Any - (424:37,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[param];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (431:37,7)
-        Markup span - Gen<Markup> - [<other>] - SpanEditHandler;Accepts:Any - (431:37,7) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[other];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ var x = true;LF}LF{LF] - SpanEditHandler;Accepts:Any - (438:37,14) - Tokens:13
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[var];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[x];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[true;];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[}];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 8 - (460:40,0)
-        Markup span - Gen<Markup> - [<source>] - SpanEditHandler;Accepts:Any - (460:40,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[source];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (468:40,8)
-        Markup span - Gen<Markup> - [<other>] - SpanEditHandler;Accepts:Any - (468:40,8) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[other];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ var x = true;LF}LF{LF] - SpanEditHandler;Accepts:Any - (475:40,15) - Tokens:13
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[var];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[x];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[true;];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[}];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 7 - (497:43,0)
-        Markup span - Gen<Markup> - [<track>] - SpanEditHandler;Accepts:Any - (497:43,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[track];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (504:43,7)
-        Markup span - Gen<Markup> - [<other>] - SpanEditHandler;Accepts:Any - (504:43,7) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[other];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ var x = true;LF}LF{LF] - SpanEditHandler;Accepts:Any - (511:43,14) - Tokens:13
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[var];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[x];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[true;];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[}];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[{];
-        HtmlTokenType.NewLine;[LF];
-    Tag block - Gen<None> - 5 - (533:46,0)
-        Markup span - Gen<Markup> - [<wbr>] - SpanEditHandler;Accepts:Any - (533:46,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[wbr];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 7 - (538:46,5)
-        Markup span - Gen<Markup> - [<other>] - SpanEditHandler;Accepts:Any - (538:46,5) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[other];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ var x = true;LF}LF] - SpanEditHandler;Accepts:Any - (545:46,12) - Tokens:11
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[var];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[x];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[true;];
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.Text;[}];
-        HtmlTokenType.NewLine;[LF];
+RazorDocument - [0..564)::564 - [{LF<area><other> var x = true;LF}LF{LF<base><other> var x = true;LF}LF{LF<br><other> var x = true;LF}LF{LF<col><other> var x = true;LF}LF{LF<command><other> var x = true;LF}LF{LF<embed><other> var x = true;LF}LF{LF<hr><other> var x = true;LF}LF{LF<img><other> var x = true;LF}LF{LF<input><other> var x = true;LF}LF{LF<keygen><other> var x = true;LF}LF{LF<link><other> var x = true;LF}LF{LF<meta><other> var x = true;LF}LF{LF<param><other> var x = true;LF}LF{LF<source><other> var x = true;LF}LF{LF<track><other> var x = true;LF}LF{LF<wbr><other> var x = true;LF}LF]
+    MarkupBlock - [0..564)::564
+        MarkupTextLiteral - [0..3)::3 - [{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+            NewLine;[LF];
+        MarkupTagBlock - [3..9)::6 - [<area>]
+            MarkupTextLiteral - [3..9)::6 - [<area>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[area];
+                CloseAngle;[>];
+        MarkupTagBlock - [9..16)::7 - [<other>]
+            MarkupTextLiteral - [9..16)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[other];
+                CloseAngle;[>];
+        MarkupTextLiteral - [16..38)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[var];
+            Whitespace;[ ];
+            Text;[x];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[true;];
+            NewLine;[LF];
+            Text;[}];
+            NewLine;[LF];
+            Text;[{];
+            NewLine;[LF];
+        MarkupTagBlock - [38..44)::6 - [<base>]
+            MarkupTextLiteral - [38..44)::6 - [<base>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[base];
+                CloseAngle;[>];
+        MarkupTagBlock - [44..51)::7 - [<other>]
+            MarkupTextLiteral - [44..51)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[other];
+                CloseAngle;[>];
+        MarkupTextLiteral - [51..73)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[var];
+            Whitespace;[ ];
+            Text;[x];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[true;];
+            NewLine;[LF];
+            Text;[}];
+            NewLine;[LF];
+            Text;[{];
+            NewLine;[LF];
+        MarkupTagBlock - [73..77)::4 - [<br>]
+            MarkupTextLiteral - [73..77)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[br];
+                CloseAngle;[>];
+        MarkupTagBlock - [77..84)::7 - [<other>]
+            MarkupTextLiteral - [77..84)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[other];
+                CloseAngle;[>];
+        MarkupTextLiteral - [84..106)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[var];
+            Whitespace;[ ];
+            Text;[x];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[true;];
+            NewLine;[LF];
+            Text;[}];
+            NewLine;[LF];
+            Text;[{];
+            NewLine;[LF];
+        MarkupTagBlock - [106..111)::5 - [<col>]
+            MarkupTextLiteral - [106..111)::5 - [<col>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[col];
+                CloseAngle;[>];
+        MarkupTagBlock - [111..118)::7 - [<other>]
+            MarkupTextLiteral - [111..118)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[other];
+                CloseAngle;[>];
+        MarkupTextLiteral - [118..140)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[var];
+            Whitespace;[ ];
+            Text;[x];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[true;];
+            NewLine;[LF];
+            Text;[}];
+            NewLine;[LF];
+            Text;[{];
+            NewLine;[LF];
+        MarkupTagBlock - [140..149)::9 - [<command>]
+            MarkupTextLiteral - [140..149)::9 - [<command>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[command];
+                CloseAngle;[>];
+        MarkupTagBlock - [149..156)::7 - [<other>]
+            MarkupTextLiteral - [149..156)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[other];
+                CloseAngle;[>];
+        MarkupTextLiteral - [156..178)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[var];
+            Whitespace;[ ];
+            Text;[x];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[true;];
+            NewLine;[LF];
+            Text;[}];
+            NewLine;[LF];
+            Text;[{];
+            NewLine;[LF];
+        MarkupTagBlock - [178..185)::7 - [<embed>]
+            MarkupTextLiteral - [178..185)::7 - [<embed>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[embed];
+                CloseAngle;[>];
+        MarkupTagBlock - [185..192)::7 - [<other>]
+            MarkupTextLiteral - [185..192)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[other];
+                CloseAngle;[>];
+        MarkupTextLiteral - [192..214)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[var];
+            Whitespace;[ ];
+            Text;[x];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[true;];
+            NewLine;[LF];
+            Text;[}];
+            NewLine;[LF];
+            Text;[{];
+            NewLine;[LF];
+        MarkupTagBlock - [214..218)::4 - [<hr>]
+            MarkupTextLiteral - [214..218)::4 - [<hr>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[hr];
+                CloseAngle;[>];
+        MarkupTagBlock - [218..225)::7 - [<other>]
+            MarkupTextLiteral - [218..225)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[other];
+                CloseAngle;[>];
+        MarkupTextLiteral - [225..247)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[var];
+            Whitespace;[ ];
+            Text;[x];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[true;];
+            NewLine;[LF];
+            Text;[}];
+            NewLine;[LF];
+            Text;[{];
+            NewLine;[LF];
+        MarkupTagBlock - [247..252)::5 - [<img>]
+            MarkupTextLiteral - [247..252)::5 - [<img>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[img];
+                CloseAngle;[>];
+        MarkupTagBlock - [252..259)::7 - [<other>]
+            MarkupTextLiteral - [252..259)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[other];
+                CloseAngle;[>];
+        MarkupTextLiteral - [259..281)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[var];
+            Whitespace;[ ];
+            Text;[x];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[true;];
+            NewLine;[LF];
+            Text;[}];
+            NewLine;[LF];
+            Text;[{];
+            NewLine;[LF];
+        MarkupTagBlock - [281..288)::7 - [<input>]
+            MarkupTextLiteral - [281..288)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                CloseAngle;[>];
+        MarkupTagBlock - [288..295)::7 - [<other>]
+            MarkupTextLiteral - [288..295)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[other];
+                CloseAngle;[>];
+        MarkupTextLiteral - [295..317)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[var];
+            Whitespace;[ ];
+            Text;[x];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[true;];
+            NewLine;[LF];
+            Text;[}];
+            NewLine;[LF];
+            Text;[{];
+            NewLine;[LF];
+        MarkupTagBlock - [317..325)::8 - [<keygen>]
+            MarkupTextLiteral - [317..325)::8 - [<keygen>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[keygen];
+                CloseAngle;[>];
+        MarkupTagBlock - [325..332)::7 - [<other>]
+            MarkupTextLiteral - [325..332)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[other];
+                CloseAngle;[>];
+        MarkupTextLiteral - [332..354)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[var];
+            Whitespace;[ ];
+            Text;[x];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[true;];
+            NewLine;[LF];
+            Text;[}];
+            NewLine;[LF];
+            Text;[{];
+            NewLine;[LF];
+        MarkupTagBlock - [354..360)::6 - [<link>]
+            MarkupTextLiteral - [354..360)::6 - [<link>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[link];
+                CloseAngle;[>];
+        MarkupTagBlock - [360..367)::7 - [<other>]
+            MarkupTextLiteral - [360..367)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[other];
+                CloseAngle;[>];
+        MarkupTextLiteral - [367..389)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[var];
+            Whitespace;[ ];
+            Text;[x];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[true;];
+            NewLine;[LF];
+            Text;[}];
+            NewLine;[LF];
+            Text;[{];
+            NewLine;[LF];
+        MarkupTagBlock - [389..395)::6 - [<meta>]
+            MarkupTextLiteral - [389..395)::6 - [<meta>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[meta];
+                CloseAngle;[>];
+        MarkupTagBlock - [395..402)::7 - [<other>]
+            MarkupTextLiteral - [395..402)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[other];
+                CloseAngle;[>];
+        MarkupTextLiteral - [402..424)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[var];
+            Whitespace;[ ];
+            Text;[x];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[true;];
+            NewLine;[LF];
+            Text;[}];
+            NewLine;[LF];
+            Text;[{];
+            NewLine;[LF];
+        MarkupTagBlock - [424..431)::7 - [<param>]
+            MarkupTextLiteral - [424..431)::7 - [<param>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[param];
+                CloseAngle;[>];
+        MarkupTagBlock - [431..438)::7 - [<other>]
+            MarkupTextLiteral - [431..438)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[other];
+                CloseAngle;[>];
+        MarkupTextLiteral - [438..460)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[var];
+            Whitespace;[ ];
+            Text;[x];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[true;];
+            NewLine;[LF];
+            Text;[}];
+            NewLine;[LF];
+            Text;[{];
+            NewLine;[LF];
+        MarkupTagBlock - [460..468)::8 - [<source>]
+            MarkupTextLiteral - [460..468)::8 - [<source>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[source];
+                CloseAngle;[>];
+        MarkupTagBlock - [468..475)::7 - [<other>]
+            MarkupTextLiteral - [468..475)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[other];
+                CloseAngle;[>];
+        MarkupTextLiteral - [475..497)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[var];
+            Whitespace;[ ];
+            Text;[x];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[true;];
+            NewLine;[LF];
+            Text;[}];
+            NewLine;[LF];
+            Text;[{];
+            NewLine;[LF];
+        MarkupTagBlock - [497..504)::7 - [<track>]
+            MarkupTextLiteral - [497..504)::7 - [<track>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[track];
+                CloseAngle;[>];
+        MarkupTagBlock - [504..511)::7 - [<other>]
+            MarkupTextLiteral - [504..511)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[other];
+                CloseAngle;[>];
+        MarkupTextLiteral - [511..533)::22 - [ var x = true;LF}LF{LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[var];
+            Whitespace;[ ];
+            Text;[x];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[true;];
+            NewLine;[LF];
+            Text;[}];
+            NewLine;[LF];
+            Text;[{];
+            NewLine;[LF];
+        MarkupTagBlock - [533..538)::5 - [<wbr>]
+            MarkupTextLiteral - [533..538)::5 - [<wbr>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[wbr];
+                CloseAngle;[>];
+        MarkupTagBlock - [538..545)::7 - [<other>]
+            MarkupTextLiteral - [538..545)::7 - [<other>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[other];
+                CloseAngle;[>];
+        MarkupTextLiteral - [545..564)::19 - [ var x = true;LF}LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[var];
+            Whitespace;[ ];
+            Text;[x];
+            Whitespace;[ ];
+            Equals;[=];
+            Whitespace;[ ];
+            Text;[true;];
+            NewLine;[LF];
+            Text;[}];
+            NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/CSharpCodeParserDoesNotAcceptLeadingOrTrailingWhitespaceInDesignMode.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/CSharpCodeParserDoesNotAcceptLeadingOrTrailingWhitespaceInDesignMode.cspans.txt
index a7c8b3d2d2..08b1a5bf02 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/CSharpCodeParserDoesNotAcceptLeadingOrTrailingWhitespaceInDesignMode.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/CSharpCodeParserDoesNotAcceptLeadingOrTrailingWhitespaceInDesignMode.cspans.txt
@@ -6,7 +6,7 @@ Code span at (14:1,5 [38] ) (Accepts:Any) - Parent: Statement block at (13:1,4 [
 Markup span at (52:2,8 [4] ) (Accepts:None) - Parent: Tag block at (52:2,8 [4] )
 Markup span at (56:2,12 [9] ) (Accepts:Any) - Parent: Markup block at (52:2,8 [25] )
 Transition span at (65:2,21 [1] ) (Accepts:None) - Parent: Expression block at (65:2,21 [7] )
-Code span at (66:2,22 [6] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (65:2,21 [7] )
+Code span at (66:2,22 [6] ) (Accepts:NonWhitespace) - Parent: Expression block at (65:2,21 [7] )
 Markup span at (72:2,28 [5] ) (Accepts:None) - Parent: Tag block at (72:2,28 [5] )
 Code span at (77:2,33 [7] ) (Accepts:None) - Parent: Statement block at (13:1,4 [71] )
 Markup span at (84:3,5 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [95] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/CSharpCodeParserDoesNotAcceptLeadingOrTrailingWhitespaceInDesignMode.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/CSharpCodeParserDoesNotAcceptLeadingOrTrailingWhitespaceInDesignMode.stree.txt
index e7a97699c4..df63ae3237 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/CSharpCodeParserDoesNotAcceptLeadingOrTrailingWhitespaceInDesignMode.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/CSharpCodeParserDoesNotAcceptLeadingOrTrailingWhitespaceInDesignMode.stree.txt
@@ -1,64 +1,67 @@
-Markup block - Gen<None> - 95 - (0:0,0)
-    Markup span - Gen<Markup> - [   ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.WhiteSpace;[   ];
-    Tag block - Gen<None> - 4 - (3:0,3)
-        Markup span - Gen<Markup> - [<ul>] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[ul];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [LF    ] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:2
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.WhiteSpace;[    ];
-    Statement block - Gen<None> - 71 - (13:1,4)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (13:1,4) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Stmt> - [foreach(var p in Products) {LF        ] - SpanEditHandler;Accepts:Any - (14:1,5) - Tokens:14
-            CSharpTokenType.Keyword;[foreach];
-            CSharpTokenType.LeftParenthesis;[(];
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[p];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[in];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[Products];
-            CSharpTokenType.RightParenthesis;[)];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.LeftBrace;[{];
-            CSharpTokenType.NewLine;[LF];
-            CSharpTokenType.WhiteSpace;[        ];
-        Markup block - Gen<None> - 25 - (52:2,8)
-            Tag block - Gen<None> - 4 - (52:2,8)
-                Markup span - Gen<Markup> - [<li>] - SpanEditHandler;Accepts:None - (52:2,8) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[li];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Product: ] - SpanEditHandler;Accepts:Any - (56:2,12) - Tokens:2
-                HtmlTokenType.Text;[Product:];
-                HtmlTokenType.WhiteSpace;[ ];
-            Expression block - Gen<Expr> - 7 - (65:2,21)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (65:2,21) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [p.Name] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (66:2,22) - Tokens:3
-                    CSharpTokenType.Identifier;[p];
-                    CSharpTokenType.Dot;[.];
-                    CSharpTokenType.Identifier;[Name];
-            Tag block - Gen<None> - 5 - (72:2,28)
-                Markup span - Gen<Markup> - [</li>] - SpanEditHandler;Accepts:None - (72:2,28) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[li];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [LF    }] - SpanEditHandler;Accepts:None - (77:2,33) - Tokens:3
-            CSharpTokenType.NewLine;[LF];
-            CSharpTokenType.WhiteSpace;[    ];
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [LF    ] - SpanEditHandler;Accepts:Any - (84:3,5) - Tokens:2
-        HtmlTokenType.NewLine;[LF];
-        HtmlTokenType.WhiteSpace;[    ];
-    Tag block - Gen<None> - 5 - (90:4,4)
-        Markup span - Gen<Markup> - [</ul>] - SpanEditHandler;Accepts:None - (90:4,4) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[ul];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..95)::95 - [   <ul>LF    @foreach(var p in Products) {LF        <li>Product: @p.Name</li>LF    }LF    </ul>]
+    MarkupTextLiteral - [0..3)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Whitespace;[   ];
+    MarkupTagBlock - [3..7)::4 - [<ul>]
+        MarkupTextLiteral - [3..7)::4 - [<ul>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[ul];
+            CloseAngle;[>];
+    MarkupTextLiteral - [7..13)::6 - [LF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        NewLine;[LF];
+        Whitespace;[    ];
+    CSharpCodeBlock - [13..84)::71
+        CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpStatementLiteral - [14..52)::38 - [foreach(var p in Products) {LF        ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+            Keyword;[foreach];
+            LeftParenthesis;[(];
+            Identifier;[var];
+            Whitespace;[ ];
+            Identifier;[p];
+            Whitespace;[ ];
+            Keyword;[in];
+            Whitespace;[ ];
+            Identifier;[Products];
+            RightParenthesis;[)];
+            Whitespace;[ ];
+            LeftBrace;[{];
+            NewLine;[LF];
+            Whitespace;[        ];
+        MarkupBlock - [52..77)::25
+            MarkupTagBlock - [52..56)::4 - [<li>]
+                MarkupTextLiteral - [52..56)::4 - [<li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Text;[li];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [56..65)::9 - [Product: ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Product:];
+                Whitespace;[ ];
+            CSharpCodeBlock - [65..72)::7
+                CSharpImplicitExpression - [65..72)::7
+                    CSharpTransition - [65..66)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [66..72)::6
+                        CSharpCodeBlock - [66..72)::6
+                            CSharpExpressionLiteral - [66..72)::6 - [p.Name] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[p];
+                                Dot;[.];
+                                Identifier;[Name];
+            MarkupTagBlock - [72..77)::5 - [</li>]
+                MarkupTextLiteral - [72..77)::5 - [</li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[li];
+                    CloseAngle;[>];
+        CSharpStatementLiteral - [77..84)::7 - [LF    }] - Gen<Stmt> - SpanEditHandler;Accepts:None
+            NewLine;[LF];
+            Whitespace;[    ];
+            RightBrace;[}];
+    MarkupTextLiteral - [84..90)::6 - [LF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        NewLine;[LF];
+        Whitespace;[    ];
+    MarkupTagBlock - [90..95)::5 - [</ul>]
+        MarkupTextLiteral - [90..95)::5 - [</ul>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[ul];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt
index c6a8fd1c9b..c886711920 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt
@@ -1,27 +1,31 @@
-Markup block - Gen<None> - 50 - (0:0,0)
-    Tag block - Gen<None> - 38 - (0:0,0)
-        Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[a];
-        Markup block - Gen<Attr:href, href="@(2:0,2),"@(36:0,36)> - 35 - (2:0,2)
-            Markup span - Gen<None> - [ href="] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[href];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<LitAttr:@(9:0,9)> - [mailto:anurse@microsoft.com] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-                HtmlTokenType.Text;[mailto:anurse@microsoft.com];
-            Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:1
-                HtmlTokenType.DoubleQuote;["];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (37:0,37) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [Email me] - SpanEditHandler;Accepts:Any - (38:0,38) - Tokens:3
-        HtmlTokenType.Text;[Email];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[me];
-    Tag block - Gen<None> - 4 - (46:0,46)
-        Markup span - Gen<Markup> - [</a>] - SpanEditHandler;Accepts:None - (46:0,46) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[a];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..50)::50 - [<a href="mailto:anurse@microsoft.com">Email me</a>]
+    MarkupTagBlock - [0..38)::38 - [<a href="mailto:anurse@microsoft.com">]
+        MarkupTextLiteral - [0..2)::2 - [<a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[a];
+        MarkupAttributeBlock - [2..37)::35 - [ href="mailto:anurse@microsoft.com"]
+            MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [3..7)::4 - [href] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[href];
+            Equals;[=];
+            MarkupTextLiteral - [8..9)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                DoubleQuote;["];
+            GenericBlock - [9..36)::27
+                MarkupLiteralAttributeValue - [9..36)::27 - [mailto:anurse@microsoft.com]
+                    MarkupTextLiteral - [9..36)::27 - [mailto:anurse@microsoft.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[mailto:anurse@microsoft.com];
+            MarkupTextLiteral - [36..37)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                DoubleQuote;["];
+        MarkupTextLiteral - [37..38)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            CloseAngle;[>];
+    MarkupTextLiteral - [38..46)::8 - [Email me] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Text;[Email];
+        Whitespace;[ ];
+        Text;[me];
+    MarkupTagBlock - [46..50)::4 - [</a>]
+        MarkupTextLiteral - [46..50)::4 - [</a>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[a];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/GivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/GivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.cspans.txt
index 7c693194d5..c1b3c96989 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/GivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/GivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.cspans.txt
@@ -8,7 +8,7 @@ Markup span at (44:2,0 [8] ) (Accepts:Any) - Parent: Markup block at (44:2,0 [35
 Markup span at (52:2,8 [4] ) (Accepts:None) - Parent: Tag block at (52:2,8 [4] )
 Markup span at (56:2,12 [9] ) (Accepts:Any) - Parent: Markup block at (44:2,0 [35] )
 Transition span at (65:2,21 [1] ) (Accepts:None) - Parent: Expression block at (65:2,21 [7] )
-Code span at (66:2,22 [6] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (65:2,21 [7] )
+Code span at (66:2,22 [6] ) (Accepts:NonWhitespace) - Parent: Expression block at (65:2,21 [7] )
 Markup span at (72:2,28 [5] ) (Accepts:None) - Parent: Tag block at (72:2,28 [5] )
 Markup span at (77:2,33 [2] ) (Accepts:None) - Parent: Markup block at (44:2,0 [35] )
 Code span at (79:3,0 [7] ) (Accepts:None) - Parent: Statement block at (9:1,0 [77] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/GivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/GivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.stree.txt
index 72cd019ef8..64d90e5693 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/GivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/GivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.stree.txt
@@ -1,67 +1,70 @@
-Markup block - Gen<None> - 95 - (0:0,0)
-    Markup span - Gen<Markup> - [   ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.WhiteSpace;[   ];
-    Tag block - Gen<None> - 4 - (3:0,3)
-        Markup span - Gen<Markup> - [<ul>] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[ul];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 77 - (9:1,0)
-        Code span - Gen<Stmt> - [    ] - SpanEditHandler;Accepts:Any - (9:1,0) - Tokens:1
-            CSharpTokenType.WhiteSpace;[    ];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (13:1,4) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Stmt> - [foreach(var p in Products) {LF] - SpanEditHandler;Accepts:Any - (14:1,5) - Tokens:13
-            CSharpTokenType.Keyword;[foreach];
-            CSharpTokenType.LeftParenthesis;[(];
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[p];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[in];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[Products];
-            CSharpTokenType.RightParenthesis;[)];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.LeftBrace;[{];
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 35 - (44:2,0)
-            Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (44:2,0) - Tokens:1
-                HtmlTokenType.WhiteSpace;[        ];
-            Tag block - Gen<None> - 4 - (52:2,8)
-                Markup span - Gen<Markup> - [<li>] - SpanEditHandler;Accepts:None - (52:2,8) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[li];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Product: ] - SpanEditHandler;Accepts:Any - (56:2,12) - Tokens:2
-                HtmlTokenType.Text;[Product:];
-                HtmlTokenType.WhiteSpace;[ ];
-            Expression block - Gen<Expr> - 7 - (65:2,21)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (65:2,21) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [p.Name] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (66:2,22) - Tokens:3
-                    CSharpTokenType.Identifier;[p];
-                    CSharpTokenType.Dot;[.];
-                    CSharpTokenType.Identifier;[Name];
-            Tag block - Gen<None> - 5 - (72:2,28)
-                Markup span - Gen<Markup> - [</li>] - SpanEditHandler;Accepts:None - (72:2,28) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[li];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (77:2,33) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
-        Code span - Gen<Stmt> - [    }LF] - SpanEditHandler;Accepts:None - (79:3,0) - Tokens:3
-            CSharpTokenType.WhiteSpace;[    ];
-            CSharpTokenType.RightBrace;[}];
-            CSharpTokenType.NewLine;[LF];
-    Markup span - Gen<Markup> - [    ] - SpanEditHandler;Accepts:Any - (86:4,0) - Tokens:1
-        HtmlTokenType.WhiteSpace;[    ];
-    Tag block - Gen<None> - 5 - (90:4,4)
-        Markup span - Gen<Markup> - [</ul>] - SpanEditHandler;Accepts:None - (90:4,4) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[ul];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..95)::95 - [   <ul>LF    @foreach(var p in Products) {LF        <li>Product: @p.Name</li>LF    }LF    </ul>]
+    MarkupTextLiteral - [0..3)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Whitespace;[   ];
+    MarkupTagBlock - [3..7)::4 - [<ul>]
+        MarkupTextLiteral - [3..7)::4 - [<ul>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[ul];
+            CloseAngle;[>];
+    MarkupTextLiteral - [7..9)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        NewLine;[LF];
+    CSharpCodeBlock - [9..86)::77
+        CSharpStatementLiteral - [9..13)::4 - [    ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+            Whitespace;[    ];
+        CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+            Transition;[@];
+        CSharpStatementLiteral - [14..44)::30 - [foreach(var p in Products) {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+            Keyword;[foreach];
+            LeftParenthesis;[(];
+            Identifier;[var];
+            Whitespace;[ ];
+            Identifier;[p];
+            Whitespace;[ ];
+            Keyword;[in];
+            Whitespace;[ ];
+            Identifier;[Products];
+            RightParenthesis;[)];
+            Whitespace;[ ];
+            LeftBrace;[{];
+            NewLine;[LF];
+        MarkupBlock - [44..79)::35
+            MarkupTextLiteral - [44..52)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[        ];
+            MarkupTagBlock - [52..56)::4 - [<li>]
+                MarkupTextLiteral - [52..56)::4 - [<li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Text;[li];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [56..65)::9 - [Product: ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Product:];
+                Whitespace;[ ];
+            CSharpCodeBlock - [65..72)::7
+                CSharpImplicitExpression - [65..72)::7
+                    CSharpTransition - [65..66)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [66..72)::6
+                        CSharpCodeBlock - [66..72)::6
+                            CSharpExpressionLiteral - [66..72)::6 - [p.Name] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[p];
+                                Dot;[.];
+                                Identifier;[Name];
+            MarkupTagBlock - [72..77)::5 - [</li>]
+                MarkupTextLiteral - [72..77)::5 - [</li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[li];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [77..79)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                NewLine;[LF];
+        CSharpStatementLiteral - [79..86)::7 - [    }LF] - Gen<Stmt> - SpanEditHandler;Accepts:None
+            Whitespace;[    ];
+            RightBrace;[}];
+            NewLine;[LF];
+    MarkupTextLiteral - [86..90)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Whitespace;[    ];
+    MarkupTagBlock - [90..95)::5 - [</ul>]
+        MarkupTextLiteral - [90..95)::5 - [</ul>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[ul];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseBlockDoesNotSwitchToCodeOnEmailAddressInText.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseBlockDoesNotSwitchToCodeOnEmailAddressInText.stree.txt
index 8a1d2cb746..8424ec0c62 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseBlockDoesNotSwitchToCodeOnEmailAddressInText.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseBlockDoesNotSwitchToCodeOnEmailAddressInText.stree.txt
@@ -1,14 +1,14 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [anurse@microsoft.com] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:1
-        HtmlTokenType.Text;[anurse@microsoft.com];
-    Tag block - Gen<None> - 6 - (25:0,25)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..31)::31 - [<foo>anurse@microsoft.com</foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTextLiteral - [5..25)::20 - [anurse@microsoft.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Text;[anurse@microsoft.com];
+    MarkupTagBlock - [25..31)::6 - [</foo>]
+        MarkupTextLiteral - [25..31)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentGivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentGivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.cspans.txt
index 7b24150dab..5b382487b7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentGivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentGivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.cspans.txt
@@ -8,7 +8,7 @@ Markup span at (44:2,0 [8] ) (Accepts:Any) - Parent: Markup block at (44:2,0 [35
 Markup span at (52:2,8 [4] ) (Accepts:None) - Parent: Tag block at (52:2,8 [4] )
 Markup span at (56:2,12 [9] ) (Accepts:Any) - Parent: Markup block at (44:2,0 [35] )
 Transition span at (65:2,21 [1] ) (Accepts:None) - Parent: Expression block at (65:2,21 [7] )
-Code span at (66:2,22 [6] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (65:2,21 [7] )
+Code span at (66:2,22 [6] ) (Accepts:NonWhitespace) - Parent: Expression block at (65:2,21 [7] )
 Markup span at (72:2,28 [5] ) (Accepts:None) - Parent: Tag block at (72:2,28 [5] )
 Markup span at (77:2,33 [2] ) (Accepts:None) - Parent: Markup block at (44:2,0 [35] )
 Code span at (79:3,0 [7] ) (Accepts:None) - Parent: Statement block at (9:1,0 [77] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentGivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentGivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.stree.txt
index 97fd746b22..29d50e5a76 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentGivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentGivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.stree.txt
@@ -1,67 +1,71 @@
-Markup block - Gen<None> - 95 - (0:0,0)
-    Markup span - Gen<Markup> - [   ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.WhiteSpace;[   ];
-    Tag block - Gen<None> - 4 - (3:0,3)
-        Markup span - Gen<Markup> - [<ul>] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[ul];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:1
-        HtmlTokenType.NewLine;[LF];
-    Statement block - Gen<None> - 77 - (9:1,0)
-        Code span - Gen<Stmt> - [    ] - SpanEditHandler;Accepts:Any - (9:1,0) - Tokens:1
-            CSharpTokenType.WhiteSpace;[    ];
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (13:1,4) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Stmt> - [foreach(var p in Products) {LF] - SpanEditHandler;Accepts:Any - (14:1,5) - Tokens:13
-            CSharpTokenType.Keyword;[foreach];
-            CSharpTokenType.LeftParenthesis;[(];
-            CSharpTokenType.Identifier;[var];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[p];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Keyword;[in];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.Identifier;[Products];
-            CSharpTokenType.RightParenthesis;[)];
-            CSharpTokenType.WhiteSpace;[ ];
-            CSharpTokenType.LeftBrace;[{];
-            CSharpTokenType.NewLine;[LF];
-        Markup block - Gen<None> - 35 - (44:2,0)
-            Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (44:2,0) - Tokens:1
-                HtmlTokenType.WhiteSpace;[        ];
-            Tag block - Gen<None> - 4 - (52:2,8)
-                Markup span - Gen<Markup> - [<li>] - SpanEditHandler;Accepts:None - (52:2,8) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[li];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Product: ] - SpanEditHandler;Accepts:Any - (56:2,12) - Tokens:2
-                HtmlTokenType.Text;[Product:];
-                HtmlTokenType.WhiteSpace;[ ];
-            Expression block - Gen<Expr> - 7 - (65:2,21)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (65:2,21) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [p.Name] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (66:2,22) - Tokens:3
-                    CSharpTokenType.Identifier;[p];
-                    CSharpTokenType.Dot;[.];
-                    CSharpTokenType.Identifier;[Name];
-            Tag block - Gen<None> - 5 - (72:2,28)
-                Markup span - Gen<Markup> - [</li>] - SpanEditHandler;Accepts:None - (72:2,28) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[li];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (77:2,33) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
-        Code span - Gen<Stmt> - [    }LF] - SpanEditHandler;Accepts:None - (79:3,0) - Tokens:3
-            CSharpTokenType.WhiteSpace;[    ];
-            CSharpTokenType.RightBrace;[}];
-            CSharpTokenType.NewLine;[LF];
-    Markup span - Gen<Markup> - [    ] - SpanEditHandler;Accepts:Any - (86:4,0) - Tokens:1
-        HtmlTokenType.WhiteSpace;[    ];
-    Tag block - Gen<None> - 5 - (90:4,4)
-        Markup span - Gen<Markup> - [</ul>] - SpanEditHandler;Accepts:Any - (90:4,4) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[ul];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..95)::95 - [   <ul>LF    @foreach(var p in Products) {LF        <li>Product: @p.Name</li>LF    }LF    </ul>]
+    MarkupBlock - [0..95)::95
+        MarkupTextLiteral - [0..3)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[   ];
+        MarkupTagBlock - [3..7)::4 - [<ul>]
+            MarkupTextLiteral - [3..7)::4 - [<ul>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[ul];
+                CloseAngle;[>];
+        MarkupTextLiteral - [7..9)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [9..86)::77
+            CSharpStatementLiteral - [9..13)::4 - [    ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[    ];
+            CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpStatementLiteral - [14..44)::30 - [foreach(var p in Products) {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Keyword;[foreach];
+                LeftParenthesis;[(];
+                Identifier;[var];
+                Whitespace;[ ];
+                Identifier;[p];
+                Whitespace;[ ];
+                Keyword;[in];
+                Whitespace;[ ];
+                Identifier;[Products];
+                RightParenthesis;[)];
+                Whitespace;[ ];
+                LeftBrace;[{];
+                NewLine;[LF];
+            MarkupBlock - [44..79)::35
+                MarkupTextLiteral - [44..52)::8 - [        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[        ];
+                MarkupTagBlock - [52..56)::4 - [<li>]
+                    MarkupTextLiteral - [52..56)::4 - [<li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        Text;[li];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [56..65)::9 - [Product: ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[Product:];
+                    Whitespace;[ ];
+                CSharpCodeBlock - [65..72)::7
+                    CSharpImplicitExpression - [65..72)::7
+                        CSharpTransition - [65..66)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [66..72)::6
+                            CSharpCodeBlock - [66..72)::6
+                                CSharpExpressionLiteral - [66..72)::6 - [p.Name] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                    Identifier;[p];
+                                    Dot;[.];
+                                    Identifier;[Name];
+                MarkupTagBlock - [72..77)::5 - [</li>]
+                    MarkupTextLiteral - [72..77)::5 - [</li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[li];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [77..79)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    NewLine;[LF];
+            CSharpStatementLiteral - [79..86)::7 - [    }LF] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                Whitespace;[    ];
+                RightBrace;[}];
+                NewLine;[LF];
+        MarkupTextLiteral - [86..90)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[    ];
+        MarkupTagBlock - [90..95)::5 - [</ul>]
+            MarkupTextLiteral - [90..95)::5 - [</ul>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[ul];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsPairsOfAtSignsAsEscapeSequence.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsPairsOfAtSignsAsEscapeSequence.cspans.txt
index c8f0e1dc10..f524279da0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsPairsOfAtSignsAsEscapeSequence.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsPairsOfAtSignsAsEscapeSequence.cspans.txt
@@ -4,5 +4,5 @@ Markup span at (6:0,6 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19]
 Markup span at (7:0,7 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
 Markup span at (8:0,8 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
 Transition span at (9:0,9 [1] ) (Accepts:None) - Parent: Expression block at (9:0,9 [4] )
-Code span at (10:0,10 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (9:0,9 [4] )
+Code span at (10:0,10 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (9:0,9 [4] )
 Markup span at (13:0,13 [6] ) (Accepts:Any) - Parent: Tag block at (13:0,13 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsPairsOfAtSignsAsEscapeSequence.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsPairsOfAtSignsAsEscapeSequence.stree.txt
index 954e1ef607..028e340b2e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsPairsOfAtSignsAsEscapeSequence.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsPairsOfAtSignsAsEscapeSequence.stree.txt
@@ -1,25 +1,29 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:1
-        HtmlTokenType.Transition;[@];
-    Markup span - Gen<Markup> - [@] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:1
-        HtmlTokenType.Transition;[@];
-    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:1
-        HtmlTokenType.Transition;[@];
-    Markup span - Gen<Markup> - [@] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:1
-        HtmlTokenType.Transition;[@];
-    Expression block - Gen<Expr> - 4 - (9:0,9)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (10:0,10) - Tokens:1
-            CSharpTokenType.Identifier;[bar];
-    Tag block - Gen<None> - 6 - (13:0,13)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..19)::19 - [<foo>@@@@@bar</foo>]
+    MarkupBlock - [0..19)::19
+        MarkupTagBlock - [0..5)::5 - [<foo>]
+            MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+        MarkupEphemeralTextLiteral - [5..6)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+            Transition;[@];
+        MarkupTextLiteral - [6..7)::1 - [@] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Transition;[@];
+        MarkupEphemeralTextLiteral - [7..8)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+            Transition;[@];
+        MarkupTextLiteral - [8..9)::1 - [@] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Transition;[@];
+        CSharpCodeBlock - [9..13)::4
+            CSharpImplicitExpression - [9..13)::4
+                CSharpTransition - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [10..13)::3
+                    CSharpCodeBlock - [10..13)::3
+                        CSharpExpressionLiteral - [10..13)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[bar];
+        MarkupTagBlock - [13..19)::6 - [</foo>]
+            MarkupTextLiteral - [13..19)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsTwoAtSignsAsEscapeSequence.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsTwoAtSignsAsEscapeSequence.stree.txt
index e870829b98..3430fb6abc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsTwoAtSignsAsEscapeSequence.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParseDocumentTreatsTwoAtSignsAsEscapeSequence.stree.txt
@@ -1,17 +1,18 @@
-Markup block - Gen<None> - 16 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:1
-        HtmlTokenType.Transition;[@];
-    Markup span - Gen<Markup> - [@bar] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:2
-        HtmlTokenType.Transition;[@];
-        HtmlTokenType.Text;[bar];
-    Tag block - Gen<None> - 6 - (10:0,10)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..16)::16 - [<foo>@@bar</foo>]
+    MarkupBlock - [0..16)::16
+        MarkupTagBlock - [0..5)::5 - [<foo>]
+            MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+        MarkupEphemeralTextLiteral - [5..6)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+            Transition;[@];
+        MarkupTextLiteral - [6..10)::4 - [@bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Transition;[@];
+            Text;[bar];
+        MarkupTagBlock - [10..16)::6 - [</foo>]
+            MarkupTextLiteral - [10..16)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParsesCodeWithinSingleLineMarkup.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParsesCodeWithinSingleLineMarkup.cspans.txt
index 74dffe8e0d..5f200ec3ec 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParsesCodeWithinSingleLineMarkup.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParsesCodeWithinSingleLineMarkup.cspans.txt
@@ -2,5 +2,5 @@ Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Markup block at (0:0,0
 MetaCode span at (1:0,1 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
 Markup span at (2:0,2 [8] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
 Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [4] )
-Code span at (11:0,11 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (10:0,10 [4] )
+Code span at (11:0,11 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [4] )
 Markup span at (14:0,14 [6] ) (Accepts:None) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParsesCodeWithinSingleLineMarkup.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParsesCodeWithinSingleLineMarkup.stree.txt
index 8f303907c4..bfffda471d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParsesCodeWithinSingleLineMarkup.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/ParsesCodeWithinSingleLineMarkup.stree.txt
@@ -1,20 +1,23 @@
-Markup block - Gen<None> - 20 - (0:0,0)
-    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-        HtmlTokenType.Transition;[@];
-    MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:1
-        HtmlTokenType.Colon;[:];
-    Markup span - Gen<Markup> - [<li>Foo ] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:5
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Text;[li];
-        HtmlTokenType.CloseAngle;[>];
-        HtmlTokenType.Text;[Foo];
-        HtmlTokenType.WhiteSpace;[ ];
-    Expression block - Gen<Expr> - 4 - (10:0,10)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [Bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (11:0,11) - Tokens:1
-            CSharpTokenType.Identifier;[Bar];
-    Markup span - Gen<Markup> - [ BazLF] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:3
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[Baz];
-        HtmlTokenType.NewLine;[LF];
+MarkupBlock - [0..20)::20 - [@:<li>Foo @Bar BazLF]
+    MarkupTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+        Transition;[@];
+    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:Any
+        Colon;[:];
+    MarkupTextLiteral - [2..10)::8 - [<li>Foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        OpenAngle;[<];
+        Text;[li];
+        CloseAngle;[>];
+        Text;[Foo];
+        Whitespace;[ ];
+    CSharpCodeBlock - [10..14)::4
+        CSharpImplicitExpression - [10..14)::4
+            CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpImplicitExpressionBody - [11..14)::3
+                CSharpCodeBlock - [11..14)::3
+                    CSharpExpressionLiteral - [11..14)::3 - [Bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                        Identifier;[Bar];
+    MarkupTextLiteral - [14..20)::6 - [ BazLF] - Gen<Markup> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
+        Text;[Baz];
+        NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsPairsOfAtSignsAsEscapeSequence.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsPairsOfAtSignsAsEscapeSequence.cspans.txt
index 2ba48b525f..becdf645bd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsPairsOfAtSignsAsEscapeSequence.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsPairsOfAtSignsAsEscapeSequence.cspans.txt
@@ -1,9 +1,9 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [36] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [36] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [36] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [36] )
-Markup span at (12:0,12 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [36] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [36] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [36] )
+Markup span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [36] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [36] )
 Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [21] )
 Markup span at (15:0,15 [5] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [5] )
@@ -12,7 +12,7 @@ Markup span at (21:0,21 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [
 Markup span at (22:0,22 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [21] )
 Markup span at (23:0,23 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [21] )
 Transition span at (24:0,24 [1] ) (Accepts:None) - Parent: Expression block at (24:0,24 [4] )
-Code span at (25:0,25 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (24:0,24 [4] )
+Code span at (25:0,25 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (24:0,24 [4] )
 Markup span at (28:0,28 [6] ) (Accepts:Any) - Parent: Tag block at (28:0,28 [6] )
 Markup span at (34:0,34 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [21] )
 MetaCode span at (35:0,35 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [36] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsPairsOfAtSignsAsEscapeSequence.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsPairsOfAtSignsAsEscapeSequence.stree.txt
index 8025b4dc6b..28b65505c7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsPairsOfAtSignsAsEscapeSequence.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsPairsOfAtSignsAsEscapeSequence.stree.txt
@@ -1,49 +1,56 @@
-Markup block - Gen<None> - 36 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 36 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [Foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[Foo];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (13:0,13) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 21 - (14:0,14)
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 5 - (15:0,15)
-                Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[foo];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Markup span - Gen<Markup> - [@] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Markup span - Gen<Markup> - [@] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Expression block - Gen<Expr> - 4 - (24:0,24)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K15 - (25:0,25) - Tokens:1
-                    CSharpTokenType.Identifier;[bar];
-            Tag block - Gen<None> - 6 - (28:0,28)
-                Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[foo];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (35:0,35) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..36)::36 - [@section Foo { <foo>@@@@@bar</foo> }]
+    MarkupBlock - [0..36)::36
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..36)::36
+            RazorDirective - [0..36)::36 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..36)::35
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..36)::28
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [Foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Foo];
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..35)::21
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [15..20)::5 - [<foo>]
+                                MarkupTextLiteral - [15..20)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                            MarkupEphemeralTextLiteral - [20..21)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Transition;[@];
+                            MarkupTextLiteral - [21..22)::1 - [@] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [22..23)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Transition;[@];
+                            MarkupTextLiteral - [23..24)::1 - [@] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Transition;[@];
+                            CSharpCodeBlock - [24..28)::4
+                                CSharpImplicitExpression - [24..28)::4
+                                    CSharpTransition - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [25..28)::3
+                                        CSharpCodeBlock - [25..28)::3
+                                            CSharpExpressionLiteral - [25..28)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15
+                                                Identifier;[bar];
+                            MarkupTagBlock - [28..34)::6 - [</foo>]
+                                MarkupTextLiteral - [28..34)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [35..36)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [36..36)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsTwoAtSignsAsEscapeSequence.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsTwoAtSignsAsEscapeSequence.cspans.txt
index 790ecbe06d..6aa928827a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsTwoAtSignsAsEscapeSequence.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsTwoAtSignsAsEscapeSequence.cspans.txt
@@ -1,9 +1,9 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [33] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [33] )
-Markup span at (12:0,12 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [33] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [33] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [33] )
+Markup span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [33] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
 Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [18] )
 Markup span at (15:0,15 [5] ) (Accepts:Any) - Parent: Tag block at (15:0,15 [5] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsTwoAtSignsAsEscapeSequence.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsTwoAtSignsAsEscapeSequence.stree.txt
index 8314633d3a..90669c6b28 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsTwoAtSignsAsEscapeSequence.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionBodyTreatsTwoAtSignsAsEscapeSequence.stree.txt
@@ -1,41 +1,45 @@
-Markup block - Gen<None> - 33 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 33 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [Foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[Foo];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (13:0,13) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 18 - (14:0,14)
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-            Tag block - Gen<None> - 5 - (15:0,15)
-                Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[foo];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-                HtmlTokenType.Transition;[@];
-            Markup span - Gen<Markup> - [@bar] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:2
-                HtmlTokenType.Transition;[@];
-                HtmlTokenType.Text;[bar];
-            Tag block - Gen<None> - 6 - (25:0,25)
-                Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[foo];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..33)::33 - [@section Foo { <foo>@@bar</foo> }]
+    MarkupBlock - [0..33)::33
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..33)::33
+            RazorDirective - [0..33)::33 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..33)::32
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..33)::25
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [Foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Foo];
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..32)::18
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [15..20)::5 - [<foo>]
+                                MarkupTextLiteral - [15..20)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                            MarkupEphemeralTextLiteral - [20..21)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Transition;[@];
+                            MarkupTextLiteral - [21..25)::4 - [@bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Transition;[@];
+                                Text;[bar];
+                            MarkupTagBlock - [25..31)::6 - [</foo>]
+                                MarkupTextLiteral - [25..31)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[foo];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [33..33)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.cspans.txt
index 73847ba484..4d21631014 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.cspans.txt
@@ -1,9 +1,9 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [127] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [127] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [127] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [127] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [127] )
-Markup span at (12:0,12 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [127] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [127] )
+Code span at (9:0,9 [3] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [127] )
+Markup span at (12:0,12 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [127] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [127] )
 Markup span at (14:0,14 [6] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [112] )
 Markup span at (20:1,4 [4] ) (Accepts:Any) - Parent: Tag block at (20:1,4 [4] )
@@ -15,7 +15,7 @@ Markup span at (65:3,0 [12] ) (Accepts:Any) - Parent: Markup block at (65:3,0 [3
 Markup span at (77:3,12 [4] ) (Accepts:None) - Parent: Tag block at (77:3,12 [4] )
 Markup span at (81:3,16 [9] ) (Accepts:Any) - Parent: Markup block at (65:3,0 [39] )
 Transition span at (90:3,25 [1] ) (Accepts:None) - Parent: Expression block at (90:3,25 [7] )
-Code span at (91:3,26 [6] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (90:3,25 [7] )
+Code span at (91:3,26 [6] ) (Accepts:NonWhitespace) - Parent: Expression block at (90:3,25 [7] )
 Markup span at (97:3,32 [5] ) (Accepts:None) - Parent: Tag block at (97:3,32 [5] )
 Markup span at (102:3,37 [2] ) (Accepts:None) - Parent: Markup block at (65:3,0 [39] )
 Code span at (104:4,0 [11] ) (Accepts:None) - Parent: Statement block at (26:2,0 [89] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.stree.txt
index 4b833c9b90..d777024566 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SectionContextGivesWhitespacePreceedingAtToCodeIfThereIsNoMarkupOnThatLine.stree.txt
@@ -1,90 +1,97 @@
-Markup block - Gen<None> - 127 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 127 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.Identifier;[section];
-        Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1
-            CSharpTokenType.WhiteSpace;[ ];
-        MetaCode span - Gen<None> - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd - (13:0,13) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 112 - (14:0,14)
-            Markup span - Gen<Markup> - [LF    ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:2
-                HtmlTokenType.NewLine;[LF];
-                HtmlTokenType.WhiteSpace;[    ];
-            Tag block - Gen<None> - 4 - (20:1,4)
-                Markup span - Gen<Markup> - [<ul>] - SpanEditHandler;Accepts:Any - (20:1,4) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[ul];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (24:1,8) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
-            Statement block - Gen<None> - 89 - (26:2,0)
-                Code span - Gen<Stmt> - [        ] - SpanEditHandler;Accepts:Any - (26:2,0) - Tokens:1
-                    CSharpTokenType.WhiteSpace;[        ];
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (34:2,8) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Stmt> - [foreach(var p in Products) {LF] - SpanEditHandler;Accepts:Any - (35:2,9) - Tokens:13
-                    CSharpTokenType.Keyword;[foreach];
-                    CSharpTokenType.LeftParenthesis;[(];
-                    CSharpTokenType.Identifier;[var];
-                    CSharpTokenType.WhiteSpace;[ ];
-                    CSharpTokenType.Identifier;[p];
-                    CSharpTokenType.WhiteSpace;[ ];
-                    CSharpTokenType.Keyword;[in];
-                    CSharpTokenType.WhiteSpace;[ ];
-                    CSharpTokenType.Identifier;[Products];
-                    CSharpTokenType.RightParenthesis;[)];
-                    CSharpTokenType.WhiteSpace;[ ];
-                    CSharpTokenType.LeftBrace;[{];
-                    CSharpTokenType.NewLine;[LF];
-                Markup block - Gen<None> - 39 - (65:3,0)
-                    Markup span - Gen<Markup> - [            ] - SpanEditHandler;Accepts:Any - (65:3,0) - Tokens:1
-                        HtmlTokenType.WhiteSpace;[            ];
-                    Tag block - Gen<None> - 4 - (77:3,12)
-                        Markup span - Gen<Markup> - [<li>] - SpanEditHandler;Accepts:None - (77:3,12) - Tokens:3
-                            HtmlTokenType.OpenAngle;[<];
-                            HtmlTokenType.Text;[li];
-                            HtmlTokenType.CloseAngle;[>];
-                    Markup span - Gen<Markup> - [Product: ] - SpanEditHandler;Accepts:Any - (81:3,16) - Tokens:2
-                        HtmlTokenType.Text;[Product:];
-                        HtmlTokenType.WhiteSpace;[ ];
-                    Expression block - Gen<Expr> - 7 - (90:3,25)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (90:3,25) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [p.Name] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K15 - (91:3,26) - Tokens:3
-                            CSharpTokenType.Identifier;[p];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Name];
-                    Tag block - Gen<None> - 5 - (97:3,32)
-                        Markup span - Gen<Markup> - [</li>] - SpanEditHandler;Accepts:None - (97:3,32) - Tokens:4
-                            HtmlTokenType.OpenAngle;[<];
-                            HtmlTokenType.ForwardSlash;[/];
-                            HtmlTokenType.Text;[li];
-                            HtmlTokenType.CloseAngle;[>];
-                    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (102:3,37) - Tokens:1
-                        HtmlTokenType.NewLine;[LF];
-                Code span - Gen<Stmt> - [        }LF] - SpanEditHandler;Accepts:None - (104:4,0) - Tokens:3
-                    CSharpTokenType.WhiteSpace;[        ];
-                    CSharpTokenType.RightBrace;[}];
-                    CSharpTokenType.NewLine;[LF];
-            Markup span - Gen<Markup> - [    ] - SpanEditHandler;Accepts:Any - (115:5,0) - Tokens:1
-                HtmlTokenType.WhiteSpace;[    ];
-            Tag block - Gen<None> - 5 - (119:5,4)
-                Markup span - Gen<Markup> - [</ul>] - SpanEditHandler;Accepts:Any - (119:5,4) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[ul];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (124:5,9) - Tokens:1
-                HtmlTokenType.NewLine;[LF];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (126:6,0) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (127:6,1) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..127)::127 - [@section foo {LF    <ul>LF        @foreach(var p in Products) {LF            <li>Product: @p.Name</li>LF        }LF    </ul>LF}]
+    MarkupBlock - [0..127)::127
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..127)::127
+            RazorDirective - [0..127)::127 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..127)::126
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..127)::119
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..12)::3 - [foo] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[foo];
+                        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [14..126)::112
+                            MarkupTextLiteral - [14..20)::6 - [LF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                                Whitespace;[    ];
+                            MarkupTagBlock - [20..24)::4 - [<ul>]
+                                MarkupTextLiteral - [20..24)::4 - [<ul>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[ul];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [24..26)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                            CSharpCodeBlock - [26..115)::89
+                                CSharpStatementLiteral - [26..34)::8 - [        ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[        ];
+                                CSharpTransition - [34..35)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpStatementLiteral - [35..65)::30 - [foreach(var p in Products) {LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                    Keyword;[foreach];
+                                    LeftParenthesis;[(];
+                                    Identifier;[var];
+                                    Whitespace;[ ];
+                                    Identifier;[p];
+                                    Whitespace;[ ];
+                                    Keyword;[in];
+                                    Whitespace;[ ];
+                                    Identifier;[Products];
+                                    RightParenthesis;[)];
+                                    Whitespace;[ ];
+                                    LeftBrace;[{];
+                                    NewLine;[LF];
+                                MarkupBlock - [65..104)::39
+                                    MarkupTextLiteral - [65..77)::12 - [            ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[            ];
+                                    MarkupTagBlock - [77..81)::4 - [<li>]
+                                        MarkupTextLiteral - [77..81)::4 - [<li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            Text;[li];
+                                            CloseAngle;[>];
+                                    MarkupTextLiteral - [81..90)::9 - [Product: ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Product:];
+                                        Whitespace;[ ];
+                                    CSharpCodeBlock - [90..97)::7
+                                        CSharpImplicitExpression - [90..97)::7
+                                            CSharpTransition - [90..91)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            CSharpImplicitExpressionBody - [91..97)::6
+                                                CSharpCodeBlock - [91..97)::6
+                                                    CSharpExpressionLiteral - [91..97)::6 - [p.Name] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15
+                                                        Identifier;[p];
+                                                        Dot;[.];
+                                                        Identifier;[Name];
+                                    MarkupTagBlock - [97..102)::5 - [</li>]
+                                        MarkupTextLiteral - [97..102)::5 - [</li>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            ForwardSlash;[/];
+                                            Text;[li];
+                                            CloseAngle;[>];
+                                    MarkupTextLiteral - [102..104)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        NewLine;[LF];
+                                CSharpStatementLiteral - [104..115)::11 - [        }LF] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                                    Whitespace;[        ];
+                                    RightBrace;[}];
+                                    NewLine;[LF];
+                            MarkupTextLiteral - [115..119)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[    ];
+                            MarkupTagBlock - [119..124)::5 - [</ul>]
+                                MarkupTextLiteral - [119..124)::5 - [</ul>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[ul];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [124..126)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                NewLine;[LF];
+                        RazorMetaCode - [126..127)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [127..127)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinCDataDeclaration.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinCDataDeclaration.cspans.txt
index 88271d6d55..fe0b6cb2ea 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinCDataDeclaration.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinCDataDeclaration.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (0:0,0 [5] ) (Accepts:None) - Parent: Tag block at (0:0,0 [5] )
 Markup span at (5:0,5 [14] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [36] )
 Transition span at (19:0,19 [1] ) (Accepts:None) - Parent: Expression block at (19:0,19 [4] )
-Code span at (20:0,20 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (19:0,19 [4] )
+Code span at (20:0,20 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (19:0,19 [4] )
 Markup span at (23:0,23 [7] ) (Accepts:None) - Parent: Markup block at (0:0,0 [36] )
 Markup span at (30:0,30 [6] ) (Accepts:None) - Parent: Tag block at (30:0,30 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinCDataDeclaration.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinCDataDeclaration.stree.txt
index 413d0ed213..fc45c62cbd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinCDataDeclaration.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinCDataDeclaration.stree.txt
@@ -1,32 +1,35 @@
-Markup block - Gen<None> - 36 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<![CDATA[ foo ] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:8
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Bang;[!];
-        HtmlTokenType.LeftBracket;[[];
-        HtmlTokenType.Text;[CDATA];
-        HtmlTokenType.LeftBracket;[[];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[foo];
-        HtmlTokenType.WhiteSpace;[ ];
-    Expression block - Gen<Expr> - 4 - (19:0,19)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (20:0,20) - Tokens:1
-            CSharpTokenType.Identifier;[bar];
-    Markup span - Gen<Markup> - [ baz]]>] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:5
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[baz];
-        HtmlTokenType.RightBracket;[]];
-        HtmlTokenType.RightBracket;[]];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (30:0,30)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (30:0,30) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..36)::36 - [<foo><![CDATA[ foo @bar baz]]></foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTextLiteral - [5..19)::14 - [<![CDATA[ foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        OpenAngle;[<];
+        Bang;[!];
+        LeftBracket;[[];
+        Text;[CDATA];
+        LeftBracket;[[];
+        Whitespace;[ ];
+        Text;[foo];
+        Whitespace;[ ];
+    CSharpCodeBlock - [19..23)::4
+        CSharpImplicitExpression - [19..23)::4
+            CSharpTransition - [19..20)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpImplicitExpressionBody - [20..23)::3
+                CSharpCodeBlock - [20..23)::3
+                    CSharpExpressionLiteral - [20..23)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                        Identifier;[bar];
+    MarkupTextLiteral - [23..30)::7 - [ baz]]>] - Gen<Markup> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
+        Text;[baz];
+        RightBracket;[]];
+        RightBracket;[]];
+        CloseAngle;[>];
+    MarkupTagBlock - [30..36)::6 - [</foo>]
+        MarkupTextLiteral - [30..36)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinComment.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinComment.cspans.txt
index ac08ec4ddf..3f502a0d21 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinComment.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinComment.cspans.txt
@@ -1,8 +1,8 @@
 Markup span at (0:0,0 [5] ) (Accepts:None) - Parent: Tag block at (0:0,0 [5] )
 Markup span at (5:0,5 [4] ) (Accepts:None) - Parent: HtmlComment block at (5:0,5 [13] )
-Markup span at (9:0,9 [1] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (5:0,5 [13] )
+Markup span at (9:0,9 [1] ) (Accepts:Whitespace) - Parent: HtmlComment block at (5:0,5 [13] )
 Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [4] )
-Code span at (11:0,11 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (10:0,10 [4] )
-Markup span at (14:0,14 [1] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (5:0,5 [13] )
+Code span at (11:0,11 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [4] )
+Markup span at (14:0,14 [1] ) (Accepts:Whitespace) - Parent: HtmlComment block at (5:0,5 [13] )
 Markup span at (15:0,15 [3] ) (Accepts:None) - Parent: HtmlComment block at (5:0,5 [13] )
 Markup span at (18:0,18 [6] ) (Accepts:None) - Parent: Tag block at (18:0,18 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinComment.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinComment.stree.txt
index 49c6fb5af4..df9f768f80 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinComment.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinComment.stree.txt
@@ -1,29 +1,32 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    HtmlComment block - Gen<None> - 13 - (5:0,5)
-        Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Bang;[!];
-            HtmlTokenType.DoubleHyphen;[--];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (9:0,9) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Expression block - Gen<Expr> - 4 - (10:0,10)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (11:0,11) - Tokens:1
-                CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (14:0,14) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:2
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (18:0,18)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..24)::24 - [<foo><!-- @foo --></foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupCommentBlock - [5..18)::13
+        MarkupTextLiteral - [5..9)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Bang;[!];
+            DoubleHyphen;[--];
+        MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+            Whitespace;[ ];
+        CSharpCodeBlock - [10..14)::4
+            CSharpImplicitExpression - [10..14)::4
+                CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [11..14)::3
+                    CSharpCodeBlock - [11..14)::3
+                        CSharpExpressionLiteral - [11..14)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+        MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+            Whitespace;[ ];
+        MarkupTextLiteral - [15..18)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+            DoubleHyphen;[--];
+            CloseAngle;[>];
+    MarkupTagBlock - [18..24)::6 - [</foo>]
+        MarkupTextLiteral - [18..24)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinSGMLDeclaration.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinSGMLDeclaration.cspans.txt
index 8c3327b47e..6337b1f5e3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinSGMLDeclaration.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinSGMLDeclaration.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (0:0,0 [5] ) (Accepts:None) - Parent: Tag block at (0:0,0 [5] )
 Markup span at (5:0,5 [14] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
 Transition span at (19:0,19 [1] ) (Accepts:None) - Parent: Expression block at (19:0,19 [4] )
-Code span at (20:0,20 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (19:0,19 [4] )
+Code span at (20:0,20 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (19:0,19 [4] )
 Markup span at (23:0,23 [5] ) (Accepts:None) - Parent: Markup block at (0:0,0 [34] )
 Markup span at (28:0,28 [6] ) (Accepts:None) - Parent: Tag block at (28:0,28 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinSGMLDeclaration.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinSGMLDeclaration.stree.txt
index b1cc49c669..71abdc043b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinSGMLDeclaration.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinSGMLDeclaration.stree.txt
@@ -1,28 +1,31 @@
-Markup block - Gen<None> - 34 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<!DOCTYPE foo ] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:6
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Bang;[!];
-        HtmlTokenType.Text;[DOCTYPE];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[foo];
-        HtmlTokenType.WhiteSpace;[ ];
-    Expression block - Gen<Expr> - 4 - (19:0,19)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (20:0,20) - Tokens:1
-            CSharpTokenType.Identifier;[bar];
-    Markup span - Gen<Markup> - [ baz>] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:3
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[baz];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (28:0,28)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (28:0,28) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..34)::34 - [<foo><!DOCTYPE foo @bar baz></foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTextLiteral - [5..19)::14 - [<!DOCTYPE foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        OpenAngle;[<];
+        Bang;[!];
+        Text;[DOCTYPE];
+        Whitespace;[ ];
+        Text;[foo];
+        Whitespace;[ ];
+    CSharpCodeBlock - [19..23)::4
+        CSharpImplicitExpression - [19..23)::4
+            CSharpTransition - [19..20)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpImplicitExpressionBody - [20..23)::3
+                CSharpCodeBlock - [20..23)::3
+                    CSharpExpressionLiteral - [20..23)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                        Identifier;[bar];
+    MarkupTextLiteral - [23..28)::5 - [ baz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
+        Text;[baz];
+        CloseAngle;[>];
+    MarkupTagBlock - [28..34)::6 - [</foo>]
+        MarkupTextLiteral - [28..34)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinXMLProcessingInstruction.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinXMLProcessingInstruction.cspans.txt
index 0bc3c6baf2..a2dd80286c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinXMLProcessingInstruction.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinXMLProcessingInstruction.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (0:0,0 [5] ) (Accepts:None) - Parent: Tag block at (0:0,0 [5] )
 Markup span at (5:0,5 [10] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )
 Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Expression block at (15:0,15 [4] )
-Code span at (16:0,16 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (15:0,15 [4] )
+Code span at (16:0,16 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (15:0,15 [4] )
 Markup span at (19:0,19 [6] ) (Accepts:None) - Parent: Markup block at (0:0,0 [31] )
 Markup span at (25:0,25 [6] ) (Accepts:None) - Parent: Tag block at (25:0,25 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinXMLProcessingInstruction.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinXMLProcessingInstruction.stree.txt
index 75154f5d24..7944430ce6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinXMLProcessingInstruction.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SupportsCodeWithinXMLProcessingInstruction.stree.txt
@@ -1,29 +1,32 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<?xml foo ] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:6
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.QuestionMark;[?];
-        HtmlTokenType.Text;[xml];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[foo];
-        HtmlTokenType.WhiteSpace;[ ];
-    Expression block - Gen<Expr> - 4 - (15:0,15)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (16:0,16) - Tokens:1
-            CSharpTokenType.Identifier;[bar];
-    Markup span - Gen<Markup> - [ baz?>] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:4
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[baz];
-        HtmlTokenType.QuestionMark;[?];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (25:0,25)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..31)::31 - [<foo><?xml foo @bar baz?></foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTextLiteral - [5..15)::10 - [<?xml foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        OpenAngle;[<];
+        QuestionMark;[?];
+        Text;[xml];
+        Whitespace;[ ];
+        Text;[foo];
+        Whitespace;[ ];
+    CSharpCodeBlock - [15..19)::4
+        CSharpImplicitExpression - [15..19)::4
+            CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpImplicitExpressionBody - [16..19)::3
+                CSharpCodeBlock - [16..19)::3
+                    CSharpExpressionLiteral - [16..19)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                        Identifier;[bar];
+    MarkupTextLiteral - [19..25)::6 - [ baz?>] - Gen<Markup> - SpanEditHandler;Accepts:None
+        Whitespace;[ ];
+        Text;[baz];
+        QuestionMark;[?];
+        CloseAngle;[>];
+    MarkupTagBlock - [25..31)::6 - [</foo>]
+        MarkupTextLiteral - [25..31)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.cspans.txt
index 9fe071f0a0..d0de0faee1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (0:0,0 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [18] )
 Markup span at (4:0,4 [6] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [11] )
 Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [4] )
-Code span at (11:0,11 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (10:0,10 [4] )
+Code span at (11:0,11 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [4] )
 Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Markup block at (4:0,4 [11] )
 Markup span at (15:0,15 [3] ) (Accepts:None) - Parent: Tag block at (0:0,0 [18] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.stree.txt
index 9ff4626d5c..d4fddc9dd0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInAttributeValue.stree.txt
@@ -1,23 +1,30 @@
-Markup block - Gen<None> - 18 - (0:0,0)
-    Tag block - Gen<None> - 18 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-        Markup block - Gen<Attr:bar, bar="@(4:0,4),"@(14:0,14)> - 11 - (4:0,4)
-            Markup span - Gen<None> - [ bar="] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[bar];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.DoubleQuote;["];
-            Markup block - Gen<DynAttr:@(10:0,10)> - 4 - (10:0,10)
-                Expression block - Gen<Expr> - 4 - (10:0,10)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (11:0,11) - Tokens:1
-                        CSharpTokenType.Identifier;[baz];
-            Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.DoubleQuote;["];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..18)::18 - [<foo bar="@baz" />]
+    MarkupTagBlock - [0..18)::18 - [<foo bar="@baz" />]
+        MarkupTextLiteral - [0..4)::4 - [<foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[foo];
+        MarkupAttributeBlock - [4..15)::11 - [ bar="@baz"]
+            MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+            MarkupTextLiteral - [5..8)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[bar];
+            Equals;[=];
+            MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                DoubleQuote;["];
+            GenericBlock - [10..14)::4
+                MarkupDynamicAttributeValue - [10..14)::4 - [@baz]
+                    GenericBlock - [10..14)::4
+                        CSharpCodeBlock - [10..14)::4
+                            CSharpImplicitExpression - [10..14)::4
+                                CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [11..14)::3
+                                    CSharpCodeBlock - [11..14)::3
+                                        CSharpExpressionLiteral - [11..14)::3 - [baz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[baz];
+            MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                DoubleQuote;["];
+        MarkupTextLiteral - [15..18)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInTagContent.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInTagContent.cspans.txt
index b808c238ed..ff2f16f8ee 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInTagContent.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInTagContent.cspans.txt
@@ -1,10 +1,10 @@
 Markup span at (0:0,0 [5] ) (Accepts:None) - Parent: Tag block at (0:0,0 [5] )
 Markup span at (5:0,5 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
 Transition span at (5:0,5 [1] ) (Accepts:None) - Parent: Expression block at (5:0,5 [4] )
-Code span at (6:0,6 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (5:0,5 [4] )
+Code span at (6:0,6 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (5:0,5 [4] )
 Markup span at (9:0,9 [5] ) (Accepts:None) - Parent: Tag block at (9:0,9 [5] )
 Markup span at (14:0,14 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
 Transition span at (14:0,14 [1] ) (Accepts:None) - Parent: Expression block at (14:0,14 [4] )
-Code span at (15:0,15 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (14:0,14 [4] )
+Code span at (15:0,15 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (14:0,14 [4] )
 Markup span at (18:0,18 [6] ) (Accepts:None) - Parent: Tag block at (18:0,18 [6] )
 Markup span at (24:0,24 [6] ) (Accepts:None) - Parent: Tag block at (24:0,24 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInTagContent.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInTagContent.stree.txt
index 27fcde0102..f690ae4f8a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInTagContent.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredInTagContent.stree.txt
@@ -1,37 +1,43 @@
-Markup block - Gen<None> - 30 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Expression block - Gen<Expr> - 4 - (5:0,5)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (6:0,6) - Tokens:1
-            CSharpTokenType.Identifier;[bar];
-    Tag block - Gen<None> - 5 - (9:0,9)
-        Markup span - Gen<Markup> - [<baz>] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[baz];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Expression block - Gen<Expr> - 4 - (14:0,14)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [boz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (15:0,15) - Tokens:1
-            CSharpTokenType.Identifier;[boz];
-    Tag block - Gen<None> - 6 - (18:0,18)
-        Markup span - Gen<Markup> - [</baz>] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[baz];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (24:0,24)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..30)::30 - [<foo>@bar<baz>@boz</baz></foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupTextLiteral - [5..5)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Marker;[];
+    CSharpCodeBlock - [5..9)::4
+        CSharpImplicitExpression - [5..9)::4
+            CSharpTransition - [5..6)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpImplicitExpressionBody - [6..9)::3
+                CSharpCodeBlock - [6..9)::3
+                    CSharpExpressionLiteral - [6..9)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                        Identifier;[bar];
+    MarkupTagBlock - [9..14)::5 - [<baz>]
+        MarkupTextLiteral - [9..14)::5 - [<baz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[baz];
+            CloseAngle;[>];
+    MarkupTextLiteral - [14..14)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Marker;[];
+    CSharpCodeBlock - [14..18)::4
+        CSharpImplicitExpression - [14..18)::4
+            CSharpTransition - [14..15)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpImplicitExpressionBody - [15..18)::3
+                CSharpCodeBlock - [15..18)::3
+                    CSharpExpressionLiteral - [15..18)::3 - [boz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                        Identifier;[boz];
+    MarkupTagBlock - [18..24)::6 - [</baz>]
+        MarkupTextLiteral - [18..24)::6 - [</baz>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[baz];
+            CloseAngle;[>];
+    MarkupTagBlock - [24..30)::6 - [</foo>]
+        MarkupTextLiteral - [24..30)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredMidTag.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredMidTag.cspans.txt
index dc3d61e2f7..343938e24b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredMidTag.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredMidTag.cspans.txt
@@ -1,4 +1,4 @@
 Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [12] )
 Transition span at (5:0,5 [1] ) (Accepts:None) - Parent: Expression block at (5:0,5 [4] )
-Code span at (6:0,6 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (5:0,5 [4] )
+Code span at (6:0,6 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (5:0,5 [4] )
 Markup span at (9:0,9 [3] ) (Accepts:None) - Parent: Tag block at (0:0,0 [12] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredMidTag.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredMidTag.stree.txt
index 9dc68e173b..7b3fe6acc1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredMidTag.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredMidTag.stree.txt
@@ -1,15 +1,18 @@
-Markup block - Gen<None> - 12 - (0:0,0)
-    Tag block - Gen<None> - 12 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.WhiteSpace;[ ];
-        Expression block - Gen<Expr> - 4 - (5:0,5)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Expr> - [bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (6:0,6) - Tokens:1
-                CSharpTokenType.Identifier;[bar];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..12)::12 - [<foo @bar />]
+    MarkupTagBlock - [0..12)::12 - [<foo @bar />]
+        MarkupTextLiteral - [0..5)::5 - [<foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [5..9)::4
+            CSharpImplicitExpression - [5..9)::4
+                CSharpTransition - [5..6)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [6..9)::3
+                    CSharpCodeBlock - [6..9)::3
+                        CSharpExpressionLiteral - [6..9)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[bar];
+        MarkupTextLiteral - [9..12)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesWhenCharacterBeforeSwapIsNonAlphanumeric.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesWhenCharacterBeforeSwapIsNonAlphanumeric.cspans.txt
index d26c275778..b124ca38c8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesWhenCharacterBeforeSwapIsNonAlphanumeric.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesWhenCharacterBeforeSwapIsNonAlphanumeric.cspans.txt
@@ -1,5 +1,5 @@
 Markup span at (0:0,0 [3] ) (Accepts:None) - Parent: Tag block at (0:0,0 [3] )
 Markup span at (3:0,3 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
 Transition span at (7:0,7 [1] ) (Accepts:None) - Parent: Expression block at (7:0,7 [2] )
-Code span at (8:0,8 [1] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (7:0,7 [2] )
+Code span at (8:0,8 [1] ) (Accepts:NonWhitespace) - Parent: Expression block at (7:0,7 [2] )
 Markup span at (9:0,9 [4] ) (Accepts:None) - Parent: Tag block at (9:0,9 [4] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesWhenCharacterBeforeSwapIsNonAlphanumeric.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesWhenCharacterBeforeSwapIsNonAlphanumeric.stree.txt
index 86f695b364..2e38b78492 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesWhenCharacterBeforeSwapIsNonAlphanumeric.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/SwitchesWhenCharacterBeforeSwapIsNonAlphanumeric.stree.txt
@@ -1,19 +1,22 @@
-Markup block - Gen<None> - 13 - (0:0,0)
-    Tag block - Gen<None> - 3 - (0:0,0)
-        Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [foo#] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
-        HtmlTokenType.Text;[foo#];
-    Expression block - Gen<Expr> - 2 - (7:0,7)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (7:0,7) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [i] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (8:0,8) - Tokens:1
-            CSharpTokenType.Identifier;[i];
-    Tag block - Gen<None> - 4 - (9:0,9)
-        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..13)::13 - [<p>foo#@i</p>]
+    MarkupTagBlock - [0..3)::3 - [<p>]
+        MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[p];
+            CloseAngle;[>];
+    MarkupTextLiteral - [3..7)::4 - [foo#] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Text;[foo#];
+    CSharpCodeBlock - [7..9)::2
+        CSharpImplicitExpression - [7..9)::2
+            CSharpTransition - [7..8)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpImplicitExpressionBody - [8..9)::1
+                CSharpCodeBlock - [8..9)::1
+                    CSharpExpressionLiteral - [8..9)::1 - [i] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                        Identifier;[i];
+    MarkupTagBlock - [9..13)::4 - [</p>]
+        MarkupTextLiteral - [9..13)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[p];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsPairsOfAtSignsAsEscapeSequence.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsPairsOfAtSignsAsEscapeSequence.cspans.txt
index cfaae19551..f6a32bba15 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsPairsOfAtSignsAsEscapeSequence.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsPairsOfAtSignsAsEscapeSequence.cspans.txt
@@ -4,5 +4,5 @@ Markup span at (6:0,6 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19]
 Markup span at (7:0,7 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
 Markup span at (8:0,8 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
 Transition span at (9:0,9 [1] ) (Accepts:None) - Parent: Expression block at (9:0,9 [4] )
-Code span at (10:0,10 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (9:0,9 [4] )
+Code span at (10:0,10 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (9:0,9 [4] )
 Markup span at (13:0,13 [6] ) (Accepts:None) - Parent: Tag block at (13:0,13 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsPairsOfAtSignsAsEscapeSequence.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsPairsOfAtSignsAsEscapeSequence.stree.txt
index 7cb37cc2a4..5d662de02b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsPairsOfAtSignsAsEscapeSequence.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsPairsOfAtSignsAsEscapeSequence.stree.txt
@@ -1,25 +1,28 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:1
-        HtmlTokenType.Transition;[@];
-    Markup span - Gen<Markup> - [@] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:1
-        HtmlTokenType.Transition;[@];
-    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:1
-        HtmlTokenType.Transition;[@];
-    Markup span - Gen<Markup> - [@] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:1
-        HtmlTokenType.Transition;[@];
-    Expression block - Gen<Expr> - 4 - (9:0,9)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (10:0,10) - Tokens:1
-            CSharpTokenType.Identifier;[bar];
-    Tag block - Gen<None> - 6 - (13:0,13)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..19)::19 - [<foo>@@@@@bar</foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupEphemeralTextLiteral - [5..6)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+        Transition;[@];
+    MarkupTextLiteral - [6..7)::1 - [@] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Transition;[@];
+    MarkupEphemeralTextLiteral - [7..8)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+        Transition;[@];
+    MarkupTextLiteral - [8..9)::1 - [@] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Transition;[@];
+    CSharpCodeBlock - [9..13)::4
+        CSharpImplicitExpression - [9..13)::4
+            CSharpTransition - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Transition;[@];
+            CSharpImplicitExpressionBody - [10..13)::3
+                CSharpCodeBlock - [10..13)::3
+                    CSharpExpressionLiteral - [10..13)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                        Identifier;[bar];
+    MarkupTagBlock - [13..19)::6 - [</foo>]
+        MarkupTextLiteral - [13..19)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsTwoAtSignsAsEscapeSequence.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsTwoAtSignsAsEscapeSequence.stree.txt
index f772dd83c6..0b73d78433 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsTwoAtSignsAsEscapeSequence.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlToCodeSwitchTest/TreatsTwoAtSignsAsEscapeSequence.stree.txt
@@ -1,17 +1,17 @@
-Markup block - Gen<None> - 16 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:1
-        HtmlTokenType.Transition;[@];
-    Markup span - Gen<Markup> - [@bar] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:2
-        HtmlTokenType.Transition;[@];
-        HtmlTokenType.Text;[bar];
-    Tag block - Gen<None> - 6 - (10:0,10)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+MarkupBlock - [0..16)::16 - [<foo>@@bar</foo>]
+    MarkupTagBlock - [0..5)::5 - [<foo>]
+        MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            Text;[foo];
+            CloseAngle;[>];
+    MarkupEphemeralTextLiteral - [5..6)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:Any
+        Transition;[@];
+    MarkupTextLiteral - [6..10)::4 - [@bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+        Transition;[@];
+        Text;[bar];
+    MarkupTagBlock - [10..16)::6 - [</foo>]
+        MarkupTextLiteral - [10..16)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:None
+            OpenAngle;[<];
+            ForwardSlash;[/];
+            Text;[foo];
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_DoesNotSpecialCase_VoidTags.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_DoesNotSpecialCase_VoidTags.cspans.txt
new file mode 100644
index 0000000000..d9ab213c73
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_DoesNotSpecialCase_VoidTags.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Markup span at (2:1,0 [7] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [7] )
+Markup span at (9:1,7 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Markup span at (12:1,10 [8] ) (Accepts:Any) - Parent: Tag block at (12:1,10 [8] )
+Markup span at (20:1,18 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_DoesNotSpecialCase_VoidTags.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_DoesNotSpecialCase_VoidTags.stree.txt
new file mode 100644
index 0000000000..ba5f6c0b54
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_DoesNotSpecialCase_VoidTags.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..22)::22 - [LF<input>Foo</input>LF]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..20)::18
+            MarkupTagBlock - [2..9)::7 - [<input>]
+                MarkupTextLiteral - [2..9)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [9..12)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Foo];
+            MarkupTagBlock - [12..20)::8 - [</input>]
+                MarkupTextLiteral - [12..20)::8 - [</input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[input];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [20..22)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_EndTagsWithMissingStartTags.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_EndTagsWithMissingStartTags.cspans.txt
new file mode 100644
index 0000000000..017a6ad437
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_EndTagsWithMissingStartTags.cspans.txt
@@ -0,0 +1,3 @@
+Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
+Markup span at (5:1,3 [6] ) (Accepts:Any) - Parent: Tag block at (5:1,3 [6] )
+Markup span at (11:1,9 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_EndTagsWithMissingStartTags.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_EndTagsWithMissingStartTags.stree.txt
new file mode 100644
index 0000000000..3fccc12bea
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_EndTagsWithMissingStartTags.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..13)::13 - [LFFoo</div>LF]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..5)::5 - [LFFoo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+            Text;[Foo];
+        MarkupElement - [5..11)::6
+            MarkupTagBlock - [5..11)::6 - [</div>]
+                MarkupTextLiteral - [5..11)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [11..13)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_IncompleteTags.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_IncompleteTags.cspans.txt
new file mode 100644
index 0000000000..245badb59b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_IncompleteTags.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Markup span at (2:1,0 [1] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [1] )
+Markup span at (3:1,1 [5] ) (Accepts:Any) - Parent: Tag block at (3:1,1 [5] )
+Markup span at (8:1,6 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Markup span at (12:1,10 [2] ) (Accepts:Any) - Parent: Tag block at (12:1,10 [2] )
+Markup span at (14:1,12 [6] ) (Accepts:Any) - Parent: Tag block at (14:1,12 [6] )
+Markup span at (20:1,18 [5] ) (Accepts:Any) - Parent: Tag block at (20:1,18 [5] )
+Markup span at (25:1,23 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_IncompleteTags.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_IncompleteTags.stree.txt
new file mode 100644
index 0000000000..31f5bd6704
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_IncompleteTags.stree.txt
@@ -0,0 +1,36 @@
+RazorDocument - [0..27)::27 - [LF<<div>>Foo</</div><   >LF]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..3)::1
+            MarkupTagBlock - [2..3)::1 - [<]
+                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+        MarkupElement - [3..20)::17
+            MarkupTagBlock - [3..8)::5 - [<div>]
+                MarkupTextLiteral - [3..8)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [8..12)::4 - [>Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+                Text;[Foo];
+            MarkupElement - [12..14)::2
+                MarkupTagBlock - [12..14)::2 - [</]
+                    MarkupTextLiteral - [12..14)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+            MarkupTagBlock - [14..20)::6 - [</div>]
+                MarkupTextLiteral - [14..20)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
+        MarkupElement - [20..25)::5
+            MarkupTagBlock - [20..25)::5 - [<   >]
+                MarkupTextLiteral - [20..25)::5 - [<   >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Whitespace;[   ];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [25..27)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_MalformedTags_RecoversSuccessfully.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_MalformedTags_RecoversSuccessfully.cspans.txt
new file mode 100644
index 0000000000..616773a7c7
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_MalformedTags_RecoversSuccessfully.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
+Markup span at (2:1,0 [5] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [5] )
+Markup span at (7:1,5 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
+Markup span at (14:1,12 [7] ) (Accepts:Any) - Parent: Tag block at (14:1,12 [7] )
+Markup span at (21:1,19 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
+Markup span at (27:1,25 [6] ) (Accepts:Any) - Parent: Tag block at (27:1,25 [6] )
+Markup span at (33:1,31 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_MalformedTags_RecoversSuccessfully.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_MalformedTags_RecoversSuccessfully.stree.txt
new file mode 100644
index 0000000000..9ea3d31fbc
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_MalformedTags_RecoversSuccessfully.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..35)::35 - [LF<div>content</span>footer</div>LF]
+    MarkupBlock - [0..35)::35
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..33)::31
+            MarkupTagBlock - [2..7)::5 - [<div>]
+                MarkupTextLiteral - [2..7)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [7..14)::7 - [content] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[content];
+            MarkupElement - [14..21)::7
+                MarkupTagBlock - [14..21)::7 - [</span>]
+                    MarkupTextLiteral - [14..21)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[span];
+                        CloseAngle;[>];
+            MarkupTextLiteral - [21..27)::6 - [footer] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[footer];
+            MarkupTagBlock - [27..33)::6 - [</div>]
+                MarkupTextLiteral - [27..33)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [33..35)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_MisplacedEndTags_RecoversSuccessfully.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_MisplacedEndTags_RecoversSuccessfully.cspans.txt
new file mode 100644
index 0000000000..d19254baf9
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_MisplacedEndTags_RecoversSuccessfully.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
+Markup span at (2:1,0 [5] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [5] )
+Markup span at (7:1,5 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
+Markup span at (14:1,12 [6] ) (Accepts:Any) - Parent: Tag block at (14:1,12 [6] )
+Markup span at (20:1,18 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
+Markup span at (26:1,24 [6] ) (Accepts:Any) - Parent: Tag block at (26:1,24 [6] )
+Markup span at (32:1,30 [7] ) (Accepts:Any) - Parent: Tag block at (32:1,30 [7] )
+Markup span at (39:1,37 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_MisplacedEndTags_RecoversSuccessfully.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_MisplacedEndTags_RecoversSuccessfully.stree.txt
new file mode 100644
index 0000000000..459c938fbd
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_MisplacedEndTags_RecoversSuccessfully.stree.txt
@@ -0,0 +1,35 @@
+RazorDocument - [0..41)::41 - [LF<div>content<span>footer</div></span>LF]
+    MarkupBlock - [0..41)::41
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..32)::30
+            MarkupTagBlock - [2..7)::5 - [<div>]
+                MarkupTextLiteral - [2..7)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [7..14)::7 - [content] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[content];
+            MarkupElement - [14..26)::12
+                MarkupTagBlock - [14..20)::6 - [<span>]
+                    MarkupTextLiteral - [14..20)::6 - [<span>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[span];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [20..26)::6 - [footer] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[footer];
+            MarkupTagBlock - [26..32)::6 - [</div>]
+                MarkupTextLiteral - [26..32)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
+        MarkupElement - [32..39)::7
+            MarkupTagBlock - [32..39)::7 - [</span>]
+                MarkupTextLiteral - [32..39)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[span];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [39..41)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_SelfClosingTags.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_SelfClosingTags.cspans.txt
new file mode 100644
index 0000000000..68917ae59c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_SelfClosingTags.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Markup span at (2:1,0 [5] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [5] )
+Markup span at (7:1,5 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Markup span at (10:1,8 [10] ) (Accepts:Any) - Parent: Tag block at (10:1,8 [10] )
+Markup span at (20:1,18 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_SelfClosingTags.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_SelfClosingTags.stree.txt
new file mode 100644
index 0000000000..d8fe2f2b56
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_SelfClosingTags.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..22)::22 - [LF<br/>Foo<custom />LF]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..7)::5
+            MarkupTagBlock - [2..7)::5 - [<br/>]
+                MarkupTextLiteral - [2..7)::5 - [<br/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[br];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [7..10)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Foo];
+        MarkupElement - [10..20)::10
+            MarkupTagBlock - [10..20)::10 - [<custom />]
+                MarkupTextLiteral - [10..20)::10 - [<custom />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[custom];
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [20..22)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_StartTagsWithMissingEndTags.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_StartTagsWithMissingEndTags.cspans.txt
new file mode 100644
index 0000000000..23600f15fe
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_StartTagsWithMissingEndTags.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [59] )
+Markup span at (2:1,0 [5] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [5] )
+Markup span at (7:1,5 [15] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [59] )
+Markup span at (22:3,4 [3] ) (Accepts:Any) - Parent: Tag block at (22:3,4 [3] )
+Markup span at (25:3,7 [23] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [59] )
+Markup span at (48:5,8 [9] ) (Accepts:Any) - Parent: Tag block at (48:5,8 [9] )
+Markup span at (57:5,17 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [59] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_StartTagsWithMissingEndTags.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_StartTagsWithMissingEndTags.stree.txt
new file mode 100644
index 0000000000..6ded51cb3c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_StartTagsWithMissingEndTags.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..59)::59 - [LF<div>LF    FooLF    <p>LF        BarLF        </strong>LF]
+    MarkupBlock - [0..59)::59
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..59)::57
+            MarkupTagBlock - [2..7)::5 - [<div>]
+                MarkupTextLiteral - [2..7)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [7..22)::15 - [LF    FooLF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                Whitespace;[    ];
+                Text;[Foo];
+                NewLine;[LF];
+                Whitespace;[    ];
+            MarkupElement - [22..59)::37
+                MarkupTagBlock - [22..25)::3 - [<p>]
+                    MarkupTextLiteral - [22..25)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [25..48)::23 - [LF        BarLF        ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    NewLine;[LF];
+                    Whitespace;[        ];
+                    Text;[Bar];
+                    NewLine;[LF];
+                    Whitespace;[        ];
+                MarkupElement - [48..57)::9
+                    MarkupTagBlock - [48..57)::9 - [</strong>]
+                        MarkupTextLiteral - [48..57)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[strong];
+                            CloseAngle;[>];
+                MarkupTextLiteral - [57..59)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_ValidNestedTags.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_ValidNestedTags.cspans.txt
new file mode 100644
index 0000000000..63be5f5b10
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_ValidNestedTags.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [49] )
+Markup span at (2:1,0 [5] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [5] )
+Markup span at (7:1,5 [15] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [49] )
+Markup span at (22:3,4 [3] ) (Accepts:Any) - Parent: Tag block at (22:3,4 [3] )
+Markup span at (25:3,7 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [49] )
+Markup span at (28:3,10 [4] ) (Accepts:Any) - Parent: Tag block at (28:3,10 [4] )
+Markup span at (32:3,14 [11] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [49] )
+Markup span at (43:5,0 [6] ) (Accepts:Any) - Parent: Tag block at (43:5,0 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_ValidNestedTags.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_ValidNestedTags.stree.txt
new file mode 100644
index 0000000000..2ed5c377ec
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_ValidNestedTags.stree.txt
@@ -0,0 +1,41 @@
+RazorDocument - [0..49)::49 - [LF<div>LF    FooLF    <p>Bar</p>LF    BazLF</div>]
+    MarkupBlock - [0..49)::49
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..49)::47
+            MarkupTagBlock - [2..7)::5 - [<div>]
+                MarkupTextLiteral - [2..7)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [7..22)::15 - [LF    FooLF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                Whitespace;[    ];
+                Text;[Foo];
+                NewLine;[LF];
+                Whitespace;[    ];
+            MarkupElement - [22..32)::10
+                MarkupTagBlock - [22..25)::3 - [<p>]
+                    MarkupTextLiteral - [22..25)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [25..28)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[Bar];
+                MarkupTagBlock - [28..32)::4 - [</p>]
+                    MarkupTextLiteral - [28..32)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+            MarkupTextLiteral - [32..43)::11 - [LF    BazLF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                Whitespace;[    ];
+                Text;[Baz];
+                NewLine;[LF];
+            MarkupTagBlock - [43..49)::6 - [</div>]
+                MarkupTextLiteral - [43..49)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_ValidNestedTagsMixedWithCode.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_ValidNestedTagsMixedWithCode.cspans.txt
new file mode 100644
index 0000000000..27e228bccf
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_ValidNestedTagsMixedWithCode.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [66] )
+Markup span at (2:1,0 [5] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [5] )
+Markup span at (7:1,5 [15] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [66] )
+Markup span at (22:3,4 [3] ) (Accepts:Any) - Parent: Tag block at (22:3,4 [3] )
+Transition span at (25:3,7 [1] ) (Accepts:None) - Parent: Expression block at (25:3,7 [4] )
+Code span at (26:3,8 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (25:3,7 [4] )
+Markup span at (29:3,11 [4] ) (Accepts:Any) - Parent: Tag block at (29:3,11 [4] )
+Markup span at (33:3,15 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [66] )
+Code span at (35:4,0 [4] ) (Accepts:Any) - Parent: Statement block at (35:4,0 [21] )
+Transition span at (39:4,4 [1] ) (Accepts:None) - Parent: Statement block at (39:4,4 [17] )
+MetaCode span at (40:4,5 [1] ) (Accepts:None) - Parent: Statement block at (39:4,4 [17] )
+Code span at (41:4,6 [14] ) (Accepts:Any) - Parent: Statement block at (39:4,4 [17] )
+MetaCode span at (55:4,20 [1] ) (Accepts:None) - Parent: Statement block at (39:4,4 [17] )
+Markup span at (56:4,21 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [66] )
+Markup span at (58:5,0 [6] ) (Accepts:Any) - Parent: Tag block at (58:5,0 [6] )
+Markup span at (64:5,6 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [66] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_ValidNestedTagsMixedWithCode.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_ValidNestedTagsMixedWithCode.stree.txt
new file mode 100644
index 0000000000..e02aadd04f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_ValidNestedTagsMixedWithCode.stree.txt
@@ -0,0 +1,71 @@
+RazorDocument - [0..66)::66 - [LF<div>LF    FooLF    <p>@Bar</p>LF    @{ var x = Bar; }LF</div>LF]
+    MarkupBlock - [0..66)::66
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..64)::62
+            MarkupTagBlock - [2..7)::5 - [<div>]
+                MarkupTextLiteral - [2..7)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [7..22)::15 - [LF    FooLF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                Whitespace;[    ];
+                Text;[Foo];
+                NewLine;[LF];
+                Whitespace;[    ];
+            MarkupElement - [22..33)::11
+                MarkupTagBlock - [22..25)::3 - [<p>]
+                    MarkupTextLiteral - [22..25)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                CSharpCodeBlock - [25..29)::4
+                    CSharpImplicitExpression - [25..29)::4
+                        CSharpTransition - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [26..29)::3
+                            CSharpCodeBlock - [26..29)::3
+                                CSharpExpressionLiteral - [26..29)::3 - [Bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                    Identifier;[Bar];
+                MarkupTagBlock - [29..33)::4 - [</p>]
+                    MarkupTextLiteral - [29..33)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+            MarkupTextLiteral - [33..35)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            CSharpCodeBlock - [35..56)::21
+                CSharpStatementLiteral - [35..39)::4 - [    ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Whitespace;[    ];
+                CSharpStatement - [39..56)::17
+                    CSharpTransition - [39..40)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpStatementBody - [40..56)::16
+                        RazorMetaCode - [40..41)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [41..55)::14
+                            CSharpStatementLiteral - [41..55)::14 - [ var x = Bar; ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                                Whitespace;[ ];
+                                Identifier;[var];
+                                Whitespace;[ ];
+                                Identifier;[x];
+                                Whitespace;[ ];
+                                Assign;[=];
+                                Whitespace;[ ];
+                                Identifier;[Bar];
+                                Semicolon;[;];
+                                Whitespace;[ ];
+                        RazorMetaCode - [55..56)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+            MarkupEphemeralTextLiteral - [56..58)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupTagBlock - [58..64)::6 - [</div>]
+                MarkupTextLiteral - [58..64)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [64..66)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_ValidTags.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_ValidTags.cspans.txt
new file mode 100644
index 0000000000..cbaaaf3772
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_ValidTags.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Markup span at (2:1,0 [5] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [5] )
+Markup span at (7:1,5 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Markup span at (10:1,8 [6] ) (Accepts:Any) - Parent: Tag block at (10:1,8 [6] )
+Markup span at (16:1,14 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Markup span at (18:2,0 [3] ) (Accepts:Any) - Parent: Tag block at (18:2,0 [3] )
+Markup span at (21:2,3 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
+Markup span at (24:2,6 [4] ) (Accepts:Any) - Parent: Tag block at (24:2,6 [4] )
+Markup span at (28:2,10 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [30] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_ValidTags.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_ValidTags.stree.txt
new file mode 100644
index 0000000000..b728f69dfd
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/MarkupElementRewriterTest/Rewrites_ValidTags.stree.txt
@@ -0,0 +1,36 @@
+RazorDocument - [0..30)::30 - [LF<div>Foo</div>LF<p>Bar</p>LF]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [2..16)::14
+            MarkupTagBlock - [2..7)::5 - [<div>]
+                MarkupTextLiteral - [2..7)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [7..10)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Foo];
+            MarkupTagBlock - [10..16)::6 - [</div>]
+                MarkupTextLiteral - [10..16)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [16..18)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupElement - [18..28)::10
+            MarkupTagBlock - [18..21)::3 - [<p>]
+                MarkupTextLiteral - [18..21)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [21..24)::3 - [Bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Bar];
+            MarkupTagBlock - [24..28)::4 - [</p>]
+                MarkupTextLiteral - [24..28)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [28..30)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
index 8fa8983d5e..90b83a758f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [18] )
 MetaCode span at (1:0,1 [12] ) (Accepts:None) - Parent: Directive block at (0:0,0 [18] )
 Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [18] )
 Code span at (14:0,14 [4] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [18] )
+Markup span at (18:0,18 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
new file mode 100644
index 0000000000..415af2bb31
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..18)::18 - [@addTagHelper Foo"]
+    MarkupBlock - [0..18)::18
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..18)::18
+            RazorDirective - [0..18)::18
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..18)::17
+                    RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [13..18)::5
+                        MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [14..18)::4 - [Foo"] - Gen<AddTagHelper:{Foo";Foo";;} [RZ1000(17:0,17 [1] ), RZ1019(14:0,14 [4] ), RZ1036(14:0,14 [4] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Identifier;[Foo];
+                            StringLiteral;["];RZ1000(17:0,17 [1] )
+        MarkupTextLiteral - [18..18)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.cspans.txt
index 46934861be..bb83fe7c4c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
 MetaCode span at (1:0,1 [12] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
 Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
 Code span at (14:0,14 [3] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (17:0,17 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.stree.txt
new file mode 100644
index 0000000000..32eaa73ae7
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..17)::17 - [@addTagHelper Foo]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            RazorDirective - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..17)::16
+                    RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [13..17)::4
+                        MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [14..17)::3 - [Foo] - Gen<AddTagHelper:{Foo;Foo;;} [RZ1036(14:0,14 [3] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Identifier;[Foo];
+        MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_NoValue_Invalid.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_NoValue_Invalid.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_NoValue_Invalid.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_NoValue_Invalid.cspans.txt
index 6691c76927..25806343ae 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_NoValue_Invalid.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_NoValue_Invalid.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
 MetaCode span at (1:0,1 [12] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
 Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
 Code span at (14:0,14 [2] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [16] )
+Markup span at (16:0,16 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_NoValue_Invalid.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_NoValue_Invalid.stree.txt
new file mode 100644
index 0000000000..95e2ab911c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_NoValue_Invalid.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..16)::16 - [@addTagHelper ""]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            RazorDirective - [0..16)::16
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..16)::15
+                    RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [13..16)::3
+                        MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [14..16)::2 - [""] - Gen<AddTagHelper:{"";;;} [RZ1036(15:0,15 [1] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;[""];
+        MarkupTextLiteral - [16..16)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_RequiresValue.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_RequiresValue.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_RequiresValue.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_RequiresValue.cspans.txt
index b1d833a6db..61be581b1c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_RequiresValue.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_RequiresValue.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
 MetaCode span at (1:0,1 [12] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
 Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
 Code span at (14:0,14 [0] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [14] )
+Markup span at (14:0,14 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_RequiresValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_RequiresValue.stree.txt
new file mode 100644
index 0000000000..660b83b424
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_RequiresValue.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..14)::14 - [@addTagHelper ]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..14)::14
+            RazorDirective - [0..14)::14
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..14)::13
+                    RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [13..14)::1
+                        MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [14..14)::0 - [] - Gen<AddTagHelper:{;;;} [RZ1018(1:0,1 [13] ), RZ1036(14:0,14 [1] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Marker;[];
+        MarkupTextLiteral - [14..14)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.cspans.txt
index 2739fb7f95..4810545912 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
 MetaCode span at (1:0,1 [12] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
 Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
 Code span at (14:0,14 [8] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.stree.txt
new file mode 100644
index 0000000000..e5a43eb13a
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..22)::22 - [@addTagHelper '*, Foo']
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            RazorDirective - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..22)::21
+                    RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [13..22)::9
+                        MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [14..22)::8 - ['*, Foo'] - Gen<AddTagHelper:{'*, Foo';'*, Foo';;} [RZ1036(14:0,14 [8] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            CharacterLiteral;['*, Foo'];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
index 8fa8983d5e..90b83a758f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [18] )
 MetaCode span at (1:0,1 [12] ) (Accepts:None) - Parent: Directive block at (0:0,0 [18] )
 Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [18] )
 Code span at (14:0,14 [4] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [18] )
+Markup span at (18:0,18 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
new file mode 100644
index 0000000000..92b11e3ec3
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..18)::18 - [@addTagHelper "Foo]
+    MarkupBlock - [0..18)::18
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..18)::18
+            RazorDirective - [0..18)::18
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..18)::17
+                    RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [13..18)::5
+                        MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [14..18)::4 - ["Foo] - Gen<AddTagHelper:{"Foo;"Foo;;} [RZ1000(14:0,14 [1] ), RZ1019(14:0,14 [4] ), RZ1036(14:0,14 [4] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;["Foo];RZ1000(14:0,14 [1] )
+        MarkupTextLiteral - [18..18)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SupportsSpaces.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SupportsSpaces.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SupportsSpaces.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SupportsSpaces.cspans.txt
index a4a9f85b10..1a383325f7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SupportsSpaces.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SupportsSpaces.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
 MetaCode span at (1:0,1 [12] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
 Markup span at (13:0,13 [5] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
 Code span at (18:0,18 [14] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [32] )
+Markup span at (32:0,32 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SupportsSpaces.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SupportsSpaces.stree.txt
new file mode 100644
index 0000000000..a1d2a4c464
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_SupportsSpaces.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..32)::32 - [@addTagHelper     Foo,   Bar    ]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            RazorDirective - [0..32)::32
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..32)::31
+                    RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [13..32)::19
+                        MarkupTextLiteral - [13..18)::5 - [     ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[     ];
+                        CSharpStatementLiteral - [18..32)::14 - [Foo,   Bar    ] - Gen<AddTagHelper:{Foo,   Bar;Foo,   Bar;Foo;Bar}> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Identifier;[Foo];
+                            Comma;[,];
+                            Whitespace;[   ];
+                            Identifier;[Bar];
+                            Whitespace;[    ];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt
index 7868088eef..3b7dd42093 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
 MetaCode span at (1:0,1 [12] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
 Markup span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
 Code span at (14:0,14 [5] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [19] )
+Markup span at (19:0,19 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt
new file mode 100644
index 0000000000..45498ce535
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..19)::19 - [@addTagHelper "Foo"]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            RazorDirective - [0..19)::19
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..19)::18
+                    RazorMetaCode - [1..13)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [13..19)::6
+                        MarkupTextLiteral - [13..14)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [14..19)::5 - ["Foo"] - Gen<AddTagHelper:{"Foo";Foo;;} [RZ1036(15:0,15 [3] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;["Foo"];
+        MarkupTextLiteral - [19..19)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt
new file mode 100644
index 0000000000..c6fee76354
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Code span at (2:1,0 [2] ) (Accepts:Any) - Parent: Statement block at (2:1,0 [24] )
+Transition span at (4:1,2 [1] ) (Accepts:None) - Parent: Directive block at (4:1,2 [22] )
+MetaCode span at (5:1,3 [12] ) (Accepts:None) - Parent: Directive block at (4:1,2 [22] )
+Markup span at (17:1,15 [1] ) (Accepts:None) - Parent: Directive block at (4:1,2 [22] )
+Code span at (18:1,16 [8] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (4:1,2 [22] )
+Markup span at (26:1,24 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt
new file mode 100644
index 0000000000..adbdb50b07
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..26)::26 - [LF  @addTagHelper "*, Foo"]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..26)::24
+            CSharpStatementLiteral - [2..4)::2 - [  ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[  ];
+            RazorDirective - [4..26)::22
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [5..26)::21
+                    RazorMetaCode - [5..17)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [17..26)::9
+                        MarkupTextLiteral - [17..18)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [18..26)::8 - ["*, Foo"] - Gen<AddTagHelper:{"*, Foo";*, Foo;*;Foo}> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;["*, Foo"];
+        MarkupTextLiteral - [26..26)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.cspans.txt
new file mode 100644
index 0000000000..8caeeee11d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
+Transition span at (3:0,3 [1] ) (Accepts:None) - Parent: Directive block at (3:0,3 [24] )
+MetaCode span at (4:0,4 [12] ) (Accepts:None) - Parent: Directive block at (3:0,3 [24] )
+Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (3:0,3 [24] )
+Code span at (17:0,17 [10] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (3:0,3 [24] )
+Markup span at (27:1,0 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.stree.txt
new file mode 100644
index 0000000000..1e622480ba
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..28)::28 - [{  @addTagHelper "*, Foo"LF}]
+    MarkupBlock - [0..28)::28
+        MarkupTextLiteral - [0..3)::3 - [{  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+            Whitespace;[  ];
+        CSharpCodeBlock - [3..27)::24
+            RazorDirective - [3..27)::24
+                CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [4..27)::23
+                    RazorMetaCode - [4..16)::12 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[addTagHelper];
+                    CSharpCodeBlock - [16..27)::11
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..27)::10 - ["*, Foo"LF] - Gen<AddTagHelper:{"*, Foo";*, Foo;*;Foo} [RZ2005(4:0,4 [12] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;["*, Foo"];
+                            NewLine;[LF];
+        MarkupTextLiteral - [27..28)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.cspans.txt
new file mode 100644
index 0000000000..c23d9ce5f6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [176] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [176] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [176] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (8:0,8 [7] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (15:0,15 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (16:0,16 [9] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (25:0,25 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (26:0,26 [21] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (47:0,47 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (48:0,48 [29] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (77:0,77 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (78:0,78 [31] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (109:0,109 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [176] )
+Code span at (110:0,110 [66] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [176] )
+Markup span at (176:0,176 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [176] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.stree.txt
new file mode 100644
index 0000000000..cfa73cde1e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.stree.txt
@@ -0,0 +1,80 @@
+RazorDocument - [0..176)::176 - [@custom string? string?[] global::System.Int32? KeyValuePair<string, string>? KeyValuePair<string, string>?[] global::System.Collections.Generic.KeyValuePair<string, string>?[]]
+    MarkupBlock - [0..176)::176
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..176)::176
+            RazorDirective - [0..176)::176 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..176)::175
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..176)::169
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..15)::7 - [string?] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Keyword;[string];
+                            QuestionMark;[?];
+                        CSharpStatementLiteral - [15..16)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [16..25)::9 - [string?[]] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Keyword;[string];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            RightBracket;[]];
+                        CSharpStatementLiteral - [25..26)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [26..47)::21 - [global::System.Int32?] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[global];
+                            DoubleColon;[::];
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Int32];
+                            QuestionMark;[?];
+                        CSharpStatementLiteral - [47..48)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [48..77)::29 - [KeyValuePair<string, string>?] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[KeyValuePair];
+                            LessThan;[<];
+                            Keyword;[string];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[string];
+                            GreaterThan;[>];
+                            QuestionMark;[?];
+                        CSharpStatementLiteral - [77..78)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [78..109)::31 - [KeyValuePair<string, string>?[]] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[KeyValuePair];
+                            LessThan;[<];
+                            Keyword;[string];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[string];
+                            GreaterThan;[>];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            RightBracket;[]];
+                        CSharpStatementLiteral - [109..110)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [110..176)::66 - [global::System.Collections.Generic.KeyValuePair<string, string>?[]] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[global];
+                            DoubleColon;[::];
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Collections];
+                            Dot;[.];
+                            Identifier;[Generic];
+                            Dot;[.];
+                            Identifier;[KeyValuePair];
+                            LessThan;[<];
+                            Keyword;[string];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[string];
+                            GreaterThan;[>];
+                            QuestionMark;[?];
+                            LeftBracket;[[];
+                            RightBracket;[]];
+        MarkupTextLiteral - [176..176)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.cspans.txt
new file mode 100644
index 0000000000..f0a1ad489a
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.cspans.txt
@@ -0,0 +1,16 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [246] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [246] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [246] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (8:0,8 [11] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (19:0,19 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (20:0,20 [20] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (40:0,40 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (41:0,41 [29] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (70:0,70 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (71:0,71 [37] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (108:0,108 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (109:0,109 [36] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (145:0,145 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [246] )
+Code span at (146:0,146 [100] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [246] )
+Markup span at (246:0,246 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [246] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.stree.txt
new file mode 100644
index 0000000000..bd5ce0d7fb
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.stree.txt
@@ -0,0 +1,164 @@
+RazorDocument - [0..246)::246 - [@custom (bool, int) (int aa, string bb)? (  int?   q   ,  bool   w   ) ( int  ?  q, bool ?w ,(long ?  [])) ? (List<(int, string)?> aa, string bb) (string ss, (int u, List<(string, int)> k, (Char c, bool b, List<int> l)), global::System.Int32[] a)]
+    MarkupBlock - [0..246)::246
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..246)::246
+            RazorDirective - [0..246)::246 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..246)::245
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..246)::239
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..19)::11 - [(bool, int)] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            LeftParenthesis;[(];
+                            Keyword;[bool];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[int];
+                            RightParenthesis;[)];
+                        CSharpStatementLiteral - [19..20)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [20..40)::20 - [(int aa, string bb)?] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            LeftParenthesis;[(];
+                            Keyword;[int];
+                            Whitespace;[ ];
+                            Identifier;[aa];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[string];
+                            Whitespace;[ ];
+                            Identifier;[bb];
+                            RightParenthesis;[)];
+                            QuestionMark;[?];
+                        CSharpStatementLiteral - [40..41)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [41..70)::29 - [(  int?   q   ,  bool   w   )] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            LeftParenthesis;[(];
+                            Whitespace;[  ];
+                            Keyword;[int];
+                            QuestionMark;[?];
+                            Whitespace;[   ];
+                            Identifier;[q];
+                            Whitespace;[   ];
+                            Comma;[,];
+                            Whitespace;[  ];
+                            Keyword;[bool];
+                            Whitespace;[   ];
+                            Identifier;[w];
+                            Whitespace;[   ];
+                            RightParenthesis;[)];
+                        CSharpStatementLiteral - [70..71)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [71..108)::37 - [( int  ?  q, bool ?w ,(long ?  [])) ?] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            LeftParenthesis;[(];
+                            Whitespace;[ ];
+                            Keyword;[int];
+                            Whitespace;[  ];
+                            QuestionMark;[?];
+                            Whitespace;[  ];
+                            Identifier;[q];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[bool];
+                            Whitespace;[ ];
+                            QuestionMark;[?];
+                            Identifier;[w];
+                            Whitespace;[ ];
+                            Comma;[,];
+                            LeftParenthesis;[(];
+                            Keyword;[long];
+                            Whitespace;[ ];
+                            QuestionMark;[?];
+                            Whitespace;[  ];
+                            LeftBracket;[[];
+                            RightBracket;[]];
+                            RightParenthesis;[)];
+                            RightParenthesis;[)];
+                            Whitespace;[ ];
+                            QuestionMark;[?];
+                        CSharpStatementLiteral - [108..109)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [109..145)::36 - [(List<(int, string)?> aa, string bb)] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            LeftParenthesis;[(];
+                            Identifier;[List];
+                            LessThan;[<];
+                            LeftParenthesis;[(];
+                            Keyword;[int];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[string];
+                            RightParenthesis;[)];
+                            QuestionMark;[?];
+                            GreaterThan;[>];
+                            Whitespace;[ ];
+                            Identifier;[aa];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[string];
+                            Whitespace;[ ];
+                            Identifier;[bb];
+                            RightParenthesis;[)];
+                        CSharpStatementLiteral - [145..146)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [146..246)::100 - [(string ss, (int u, List<(string, int)> k, (Char c, bool b, List<int> l)), global::System.Int32[] a)] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            LeftParenthesis;[(];
+                            Keyword;[string];
+                            Whitespace;[ ];
+                            Identifier;[ss];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            LeftParenthesis;[(];
+                            Keyword;[int];
+                            Whitespace;[ ];
+                            Identifier;[u];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Identifier;[List];
+                            LessThan;[<];
+                            LeftParenthesis;[(];
+                            Keyword;[string];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[int];
+                            RightParenthesis;[)];
+                            GreaterThan;[>];
+                            Whitespace;[ ];
+                            Identifier;[k];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            LeftParenthesis;[(];
+                            Identifier;[Char];
+                            Whitespace;[ ];
+                            Identifier;[c];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[bool];
+                            Whitespace;[ ];
+                            Identifier;[b];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Identifier;[List];
+                            LessThan;[<];
+                            Keyword;[int];
+                            GreaterThan;[>];
+                            Whitespace;[ ];
+                            Identifier;[l];
+                            RightParenthesis;[)];
+                            RightParenthesis;[)];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Identifier;[global];
+                            DoubleColon;[::];
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Int32];
+                            LeftBracket;[[];
+                            RightBracket;[]];
+                            Whitespace;[ ];
+                            Identifier;[a];
+                            RightParenthesis;[)];
+        MarkupTextLiteral - [246..246)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.cspans.txt
new file mode 100644
index 0000000000..52a117679c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [23] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [23] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [23] )
+Code span at (8:0,8 [12] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [23] )
+None span at (20:0,20 [3] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [23] )
+Markup span at (23:0,23 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.stree.txt
new file mode 100644
index 0000000000..10efce7060
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..23)::23 - [@custom (bool, int?)   ]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            RazorDirective - [0..23)::23 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..23)::22
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..23)::16
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..20)::12 - [(bool, int?)] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            LeftParenthesis;[(];
+                            Keyword;[bool];
+                            Comma;[,];
+                            Whitespace;[ ];
+                            Keyword;[int];
+                            QuestionMark;[?];
+                            RightParenthesis;[)];
+                        UnclassifiedTextLiteral - [20..23)::3 - [   ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[   ];
+        MarkupTextLiteral - [23..23)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.cspans.txt
new file mode 100644
index 0000000000..68dfa71c77
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [67] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [67] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [67] )
+Code span at (7:0,7 [4] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [67] )
+Code span at (11:0,11 [34] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [67] )
+Code span at (45:0,45 [7] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [67] )
+Code span at (52:0,52 [11] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [67] )
+None span at (63:0,63 [4] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [67] )
+Markup span at (67:0,67 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [67] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.stree.txt
new file mode 100644
index 0000000000..1008dcab02
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..67)::67 - [@custom    System.Text.Encoding.ASCIIEncoding       Some_Member    ]
+    MarkupBlock - [0..67)::67
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..67)::67
+            RazorDirective - [0..67)::67 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..67)::66
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..67)::60
+                        CSharpStatementLiteral - [7..11)::4 - [    ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[    ];
+                        CSharpStatementLiteral - [11..45)::34 - [System.Text.Encoding.ASCIIEncoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[ASCIIEncoding];
+                        CSharpStatementLiteral - [45..52)::7 - [       ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[       ];
+                        CSharpStatementLiteral - [52..63)::11 - [Some_Member] - Gen<DirectiveToken {;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Some_Member];
+                        UnclassifiedTextLiteral - [63..67)::4 - [    ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[    ];
+        MarkupTextLiteral - [67..67)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.cspans.txt
new file mode 100644
index 0000000000..a2ac1bb1a7
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.stree.txt
new file mode 100644
index 0000000000..2e41bb2bbd
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..15)::15 - [@custom System.]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1014(8:0,8 [7] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..15)::7 - [System.] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[System.];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.cspans.txt
new file mode 100644
index 0000000000..0d19696aec
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Markup span at (14:0,14 [1] ) (Accepts:Any) - Parent: Tag block at (14:0,14 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.stree.txt
new file mode 100644
index 0000000000..df328da469
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..15)::15 - [@custom System<]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1014(8:0,8 [7] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..14)::6 - [System] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[System];
+        MarkupTagBlock - [14..15)::1 - [<]
+            MarkupTextLiteral - [14..15)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.cspans.txt
new file mode 100644
index 0000000000..1b4c670d6a
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [9] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.stree.txt
new file mode 100644
index 0000000000..9d6f4a44f4
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..17)::17 - [@custom System.LF]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1014(8:0,8 [7] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..17)::9 - [System.LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[System.];
+            NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.cspans.txt
new file mode 100644
index 0000000000..7232de595e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Markup span at (14:0,14 [3] ) (Accepts:Any) - Parent: Tag block at (14:0,14 [3] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.stree.txt
new file mode 100644
index 0000000000..f80f449fab
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..17)::17 - [@custom System<LF]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1014(8:0,8 [7] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..14)::6 - [System] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[System];
+        MarkupTagBlock - [14..17)::3 - [<LF]
+            MarkupTextLiteral - [14..17)::3 - [<LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                NewLine;[LF];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.cspans.txt
new file mode 100644
index 0000000000..4d02aa2a12
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [16] )
+Code span at (8:0,8 [7] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [16] )
+None span at (15:0,15 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [16] )
+Markup span at (16:0,16 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [23] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.stree.txt
new file mode 100644
index 0000000000..b06c7343c3
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..23)::23 - [@custom "hello" "world"]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            RazorDirective - [0..16)::16 - Directive:{custom;SingleLine;Unrestricted} [RZ1017(16:0,16 [7] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..16)::15
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..16)::9
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..15)::7 - ["hello"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["hello"];
+                        UnclassifiedTextLiteral - [15..16)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [16..23)::7 - ["world"] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            DoubleQuote;["];
+            Text;[world];
+            DoubleQuote;["];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.cspans.txt
new file mode 100644
index 0000000000..59f2a44c20
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [12] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.stree.txt
new file mode 100644
index 0000000000..ab35f9a32d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..20)::20 - [@custom -Some_Member]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1015(8:0,8 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..20)::12 - [-Some_Member] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[-Some_Member];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.cspans.txt
new file mode 100644
index 0000000000..66d394bc52
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [15] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [15] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [15] )
+Code span at (8:0,8 [7] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [15] )
+Markup span at (15:0,15 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.stree.txt
new file mode 100644
index 0000000000..5a51465112
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..15)::15 - [@custom "Hello"]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..15)::15
+            RazorDirective - [0..15)::15 - Directive:{custom;CodeBlock;Unrestricted} [RZ1012(15:0,15 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..15)::14
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..15)::8
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..15)::7 - ["Hello"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["Hello"];
+        MarkupTextLiteral - [15..15)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.cspans.txt
new file mode 100644
index 0000000000..557ac27df2
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [39] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [16] )
+Code span at (8:0,8 [7] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [16] )
+Markup span at (15:0,15 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [16] )
+Markup span at (16:0,16 [23] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [39] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.stree.txt
new file mode 100644
index 0000000000..df8418bece
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.stree.txt
@@ -0,0 +1,28 @@
+RazorDocument - [0..39)::39 - [@custom "Hello" World { foo(); bar(); }]
+    MarkupBlock - [0..39)::39
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            RazorDirective - [0..16)::16 - Directive:{custom;CodeBlock;Unrestricted} [RZ1017(16:0,16 [5] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..16)::15
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..16)::9
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..15)::7 - ["Hello"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["Hello"];
+                        MarkupTextLiteral - [15..16)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [16..39)::23 - [World { foo(); bar(); }] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[World];
+            Whitespace;[ ];
+            Text;[{];
+            Whitespace;[ ];
+            Text;[foo();];
+            Whitespace;[ ];
+            Text;[bar();];
+            Whitespace;[ ];
+            Text;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.cspans.txt
similarity index 61%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.cspans.txt
index 2bd242fa71..87860025d2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.cspans.txt
@@ -1,7 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
 MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
-Markup span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [17] )
-Code span at (8:0,8 [7] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [17] )
-Markup span at (15:0,15 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [17] )
+Code span at (8:0,8 [7] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (15:0,15 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [17] )
 MetaCode span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
 Code span at (17:0,17 [0] ) (Accepts:Any) - Parent: Directive block at (0:0,0 [17] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.stree.txt
new file mode 100644
index 0000000000..1b3104ce51
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.stree.txt
@@ -0,0 +1,25 @@
+RazorDocument - [0..17)::17 - [@custom "Hello" {]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            RazorDirective - [0..17)::17 - Directive:{custom;CodeBlock;Unrestricted} [RZ1006(16:0,16 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..17)::16
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..17)::10
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..15)::7 - ["Hello"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["Hello"];
+                        MarkupTextLiteral - [15..16)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [16..17)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [17..17)::0
+                            CSharpStatementLiteral - [17..17)::0 - [] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                Marker;[];
+                        RazorMetaCode - [17..17)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                            RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.cspans.txt
similarity index 70%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.cspans.txt
index 04bf3c5828..5429ef434a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.cspans.txt
@@ -1,12 +1,12 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [85] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
 MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
-Code span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [44] )
-Code span at (8:0,8 [34] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [44] )
-Markup span at (42:0,42 [2] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [44] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [44] )
+Code span at (8:0,8 [34] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [44] )
+Markup span at (42:0,42 [2] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [44] )
 Markup span at (44:1,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [85] )
 Transition span at (44:1,0 [1] ) (Accepts:None) - Parent: Directive block at (44:1,0 [41] )
 MetaCode span at (45:1,1 [6] ) (Accepts:None) - Parent: Directive block at (44:1,0 [41] )
-Code span at (51:1,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (44:1,0 [41] )
-Code span at (52:1,8 [33] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (44:1,0 [41] )
+Code span at (51:1,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (44:1,0 [41] )
+Code span at (52:1,8 [33] ) (Accepts:NonWhitespace) - Parent: Directive block at (44:1,0 [41] )
 Markup span at (85:1,41 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [85] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.stree.txt
new file mode 100644
index 0000000000..f9d3383434
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.stree.txt
@@ -0,0 +1,46 @@
+RazorDocument - [0..85)::85 - [@custom System.Text.Encoding.ASCIIEncodingLF@custom System.Text.Encoding.UTF8Encoding]
+    MarkupBlock - [0..85)::85
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..44)::44
+            RazorDirective - [0..44)::44 - Directive:{custom;SingleLine;FileScopedMultipleOccurring}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..44)::43
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..44)::37
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..42)::34 - [System.Text.Encoding.ASCIIEncoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[ASCIIEncoding];
+                        MarkupEphemeralTextLiteral - [42..44)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            NewLine;[LF];
+        MarkupTextLiteral - [44..44)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [44..85)::41
+            RazorDirective - [44..85)::41 - Directive:{custom;SingleLine;FileScopedMultipleOccurring}
+                CSharpTransition - [44..45)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [45..85)::40
+                    RazorMetaCode - [45..51)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [51..85)::34
+                        CSharpStatementLiteral - [51..52)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [52..85)::33 - [System.Text.Encoding.UTF8Encoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[UTF8Encoding];
+        MarkupTextLiteral - [85..85)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.cspans.txt
similarity index 70%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.cspans.txt
index 04bf3c5828..5429ef434a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.cspans.txt
@@ -1,12 +1,12 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [85] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
 MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
-Code span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [44] )
-Code span at (8:0,8 [34] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [44] )
-Markup span at (42:0,42 [2] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [44] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [44] )
+Code span at (8:0,8 [34] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [44] )
+Markup span at (42:0,42 [2] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [44] )
 Markup span at (44:1,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [85] )
 Transition span at (44:1,0 [1] ) (Accepts:None) - Parent: Directive block at (44:1,0 [41] )
 MetaCode span at (45:1,1 [6] ) (Accepts:None) - Parent: Directive block at (44:1,0 [41] )
-Code span at (51:1,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (44:1,0 [41] )
-Code span at (52:1,8 [33] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (44:1,0 [41] )
+Code span at (51:1,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (44:1,0 [41] )
+Code span at (52:1,8 [33] ) (Accepts:NonWhitespace) - Parent: Directive block at (44:1,0 [41] )
 Markup span at (85:1,41 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [85] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.stree.txt
new file mode 100644
index 0000000000..551e79b27c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.stree.txt
@@ -0,0 +1,46 @@
+RazorDocument - [0..85)::85 - [@custom System.Text.Encoding.ASCIIEncodingLF@custom System.Text.Encoding.UTF8Encoding]
+    MarkupBlock - [0..85)::85
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..44)::44
+            RazorDirective - [0..44)::44 - Directive:{custom;SingleLine;FileScopedSinglyOccurring}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..44)::43
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..44)::37
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..42)::34 - [System.Text.Encoding.ASCIIEncoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[ASCIIEncoding];
+                        MarkupEphemeralTextLiteral - [42..44)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            NewLine;[LF];
+        MarkupTextLiteral - [44..44)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [44..85)::41
+            RazorDirective - [44..85)::41 - Directive:{custom;SingleLine;FileScopedSinglyOccurring} [RZ2001(44:1,0 [7] )]
+                CSharpTransition - [44..45)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [45..85)::40
+                    RazorMetaCode - [45..51)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [51..85)::34
+                        CSharpStatementLiteral - [51..52)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [52..85)::33 - [System.Text.Encoding.UTF8Encoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[UTF8Encoding];
+        MarkupTextLiteral - [85..85)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.cspans.txt
similarity index 70%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.cspans.txt
index 0d5ab809f3..715c97f1c9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.cspans.txt
@@ -1,12 +1,12 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [59] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
 MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [44] )
-Code span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [44] )
-Code span at (8:0,8 [34] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [44] )
-Markup span at (42:0,42 [2] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [44] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [44] )
+Code span at (8:0,8 [34] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [44] )
+Markup span at (42:0,42 [2] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [44] )
 Markup span at (44:1,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [59] )
 Transition span at (44:1,0 [1] ) (Accepts:None) - Parent: Directive block at (44:1,0 [15] )
 MetaCode span at (45:1,1 [9] ) (Accepts:None) - Parent: Directive block at (44:1,0 [15] )
-Code span at (54:1,10 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (44:1,0 [15] )
-Code span at (55:1,11 [4] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (44:1,0 [15] )
+Code span at (54:1,10 [1] ) (Accepts:Whitespace) - Parent: Directive block at (44:1,0 [15] )
+Code span at (55:1,11 [4] ) (Accepts:NonWhitespace) - Parent: Directive block at (44:1,0 [15] )
 Markup span at (59:1,15 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [59] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.stree.txt
new file mode 100644
index 0000000000..e0591c053d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.stree.txt
@@ -0,0 +1,40 @@
+RazorDocument - [0..59)::59 - [@custom System.Text.Encoding.ASCIIEncodingLF@something Else]
+    MarkupBlock - [0..59)::59
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..44)::44
+            RazorDirective - [0..44)::44 - Directive:{custom;SingleLine;FileScopedSinglyOccurring}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..44)::43
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..44)::37
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..42)::34 - [System.Text.Encoding.ASCIIEncoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[ASCIIEncoding];
+                        MarkupEphemeralTextLiteral - [42..44)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            NewLine;[LF];
+        MarkupTextLiteral - [44..44)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [44..59)::15
+            RazorDirective - [44..59)::15 - Directive:{something;SingleLine;FileScopedMultipleOccurring}
+                CSharpTransition - [44..45)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [45..59)::14
+                    RazorMetaCode - [45..54)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[something];
+                    CSharpCodeBlock - [54..59)::5
+                        CSharpStatementLiteral - [54..55)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [55..59)::4 - [Else] - Gen<DirectiveToken {;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Else];
+        MarkupTextLiteral - [59..59)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.cspans.txt
similarity index 80%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.cspans.txt
index a345090d3e..b65e57e7d9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.cspans.txt
@@ -7,15 +7,15 @@ Transition span at (42:0,42 [1] ) (Accepts:None) - Parent: Comment block at (0:0
 Markup span at (43:0,43 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [130] )
 Transition span at (45:1,0 [1] ) (Accepts:None) - Parent: Directive block at (45:1,0 [44] )
 MetaCode span at (46:1,1 [6] ) (Accepts:None) - Parent: Directive block at (45:1,0 [44] )
-Code span at (52:1,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (45:1,0 [44] )
-Code span at (53:1,8 [34] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (45:1,0 [44] )
-Markup span at (87:1,42 [2] ) (Accepts:WhiteSpace) - Parent: Directive block at (45:1,0 [44] )
+Code span at (52:1,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (45:1,0 [44] )
+Code span at (53:1,8 [34] ) (Accepts:NonWhitespace) - Parent: Directive block at (45:1,0 [44] )
+Markup span at (87:1,42 [2] ) (Accepts:Whitespace) - Parent: Directive block at (45:1,0 [44] )
 Markup span at (89:2,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [130] )
 Transition span at (91:3,0 [1] ) (Accepts:None) - Parent: Directive block at (91:3,0 [17] )
 MetaCode span at (92:3,1 [9] ) (Accepts:None) - Parent: Directive block at (91:3,0 [17] )
-Code span at (101:3,10 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (91:3,0 [17] )
-Code span at (102:3,11 [4] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (91:3,0 [17] )
-Markup span at (106:3,15 [2] ) (Accepts:WhiteSpace) - Parent: Directive block at (91:3,0 [17] )
+Code span at (101:3,10 [1] ) (Accepts:Whitespace) - Parent: Directive block at (91:3,0 [17] )
+Code span at (102:3,11 [4] ) (Accepts:NonWhitespace) - Parent: Directive block at (91:3,0 [17] )
+Markup span at (106:3,15 [2] ) (Accepts:Whitespace) - Parent: Directive block at (91:3,0 [17] )
 Markup span at (108:4,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [130] )
 Markup span at (110:5,0 [3] ) (Accepts:Any) - Parent: Tag block at (110:5,0 [3] )
 Markup span at (113:5,3 [13] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [130] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.stree.txt
new file mode 100644
index 0000000000..fda3f57690
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.stree.txt
@@ -0,0 +1,67 @@
+RazorDocument - [0..130)::130 - [@* There are two directives beneath this *@LF@custom System.Text.Encoding.ASCIIEncodingLFLF@something ElseLFLF<p>This is extra</p>]
+    MarkupBlock - [0..130)::130
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        RazorComment - [0..43)::43
+            RazorCommentTransition;[@];
+            RazorCommentStar;[*];
+            RazorCommentLiteral;[ There are two directives beneath this ];
+            RazorCommentStar;[*];
+            RazorCommentTransition;[@];
+        MarkupTextLiteral - [43..45)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [45..89)::44
+            RazorDirective - [45..89)::44 - Directive:{custom;SingleLine;FileScopedSinglyOccurring}
+                CSharpTransition - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [46..89)::43
+                    RazorMetaCode - [46..52)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [52..89)::37
+                        CSharpStatementLiteral - [52..53)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [53..87)::34 - [System.Text.Encoding.ASCIIEncoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[ASCIIEncoding];
+                        MarkupEphemeralTextLiteral - [87..89)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            NewLine;[LF];
+        MarkupTextLiteral - [89..91)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [91..108)::17
+            RazorDirective - [91..108)::17 - Directive:{something;SingleLine;FileScopedMultipleOccurring}
+                CSharpTransition - [91..92)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [92..108)::16
+                    RazorMetaCode - [92..101)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[something];
+                    CSharpCodeBlock - [101..108)::7
+                        CSharpStatementLiteral - [101..102)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [102..106)::4 - [Else] - Gen<DirectiveToken {;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Else];
+                        MarkupEphemeralTextLiteral - [106..108)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            NewLine;[LF];
+        MarkupTextLiteral - [108..110)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTagBlock - [110..113)::3 - [<p>]
+            MarkupTextLiteral - [110..113)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [113..126)::13 - [This is extra] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[This];
+            Whitespace;[ ];
+            Text;[is];
+            Whitespace;[ ];
+            Text;[extra];
+        MarkupTagBlock - [126..130)::4 - [</p>]
+            MarkupTextLiteral - [126..130)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.cspans.txt
new file mode 100644
index 0000000000..f44c1c18b8
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [19] )
+Code span at (8:0,8 [7] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [19] )
+None span at (15:0,15 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [19] )
+MetaCode span at (16:0,16 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [19] )
+Markup span at (17:0,17 [2] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [19] )
+Markup span at (19:0,19 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.stree.txt
new file mode 100644
index 0000000000..bd14b1f20c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..19)::19 - [@custom "hello" ;  ]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            RazorDirective - [0..19)::19 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..19)::18
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..19)::12
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..15)::7 - ["hello"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["hello"];
+                        UnclassifiedTextLiteral - [15..16)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Semicolon;[;];
+                        MarkupEphemeralTextLiteral - [17..19)::2 - [  ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[  ];
+        MarkupTextLiteral - [19..19)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.cspans.txt
new file mode 100644
index 0000000000..82186c467a
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.stree.txt
new file mode 100644
index 0000000000..ec8ed8b511
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..14)::14 - [@custom {foo?}]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1016(8:0,8 [1] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..14)::6 - [{foo?}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{foo];
+            QuestionMark;[?];
+            Text;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.cspans.txt
new file mode 100644
index 0000000000..9e73b54511
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [8] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.stree.txt
new file mode 100644
index 0000000000..6ad2990a4e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..16)::16 - [@custom AString"]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1016(8:0,8 [7] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..16)::8 - [AString"] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[AString];
+            DoubleQuote;["];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.cspans.txt
new file mode 100644
index 0000000000..d5d9f27aef
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [9] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.stree.txt
new file mode 100644
index 0000000000..eef7233302
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..17)::17 - [@custom 'AString']
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1016(8:0,8 [9] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..17)::9 - ['AString'] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            SingleQuote;['];
+            Text;[AString];
+            SingleQuote;['];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.cspans.txt
new file mode 100644
index 0000000000..5d403c8984
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [7] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.stree.txt
new file mode 100644
index 0000000000..651feb6e9e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..15)::15 - [@custom AString]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted} [RZ1016(8:0,8 [7] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..15)::7 - [AString] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[AString];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.cspans.txt
new file mode 100644
index 0000000000..263c7efaa3
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [17] )
+Code span at (8:0,8 [9] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (17:0,17 [9] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [26] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.stree.txt
new file mode 100644
index 0000000000..f3d06f68b9
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..26)::26 - [@custom "string1""string2"]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            RazorDirective - [0..17)::17 - Directive:{custom;SingleLine;Unrestricted} [RZ1011(17:0,17 [9] )]
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..17)::16
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..17)::10
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..17)::9 - ["string1"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["string1"];
+        MarkupTextLiteral - [17..26)::9 - ["string2"] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            DoubleQuote;["];
+            Text;[string2];
+            DoubleQuote;["];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.cspans.txt
similarity index 59%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.cspans.txt
index a4003deee6..85992b911b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.cspans.txt
@@ -1,8 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
 MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
-Markup span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [32] )
-Code span at (8:0,8 [6] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [32] )
-Markup span at (14:0,14 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [32] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [32] )
+Code span at (8:0,8 [6] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [32] )
+Markup span at (14:0,14 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [32] )
 MetaCode span at (15:0,15 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
 Code span at (16:0,16 [15] ) (Accepts:Any) - Parent: Directive block at (0:0,0 [32] )
 MetaCode span at (31:0,31 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
+Markup span at (32:0,32 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.stree.txt
new file mode 100644
index 0000000000..68899fb843
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.stree.txt
@@ -0,0 +1,37 @@
+RazorDocument - [0..32)::32 - [@custom "Name" { foo(); bar(); }]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            RazorDirective - [0..32)::32 - Directive:{custom;CodeBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..32)::31
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..32)::25
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..14)::6 - ["Name"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["Name"];
+                        MarkupTextLiteral - [14..15)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [15..16)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [16..31)::15
+                            CSharpStatementLiteral - [16..31)::15 - [ foo(); bar(); ] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                Whitespace;[ ];
+                                Identifier;[foo];
+                                LeftParenthesis;[(];
+                                RightParenthesis;[)];
+                                Semicolon;[;];
+                                Whitespace;[ ];
+                                Identifier;[bar];
+                                LeftParenthesis;[(];
+                                RightParenthesis;[)];
+                                Semicolon;[;];
+                                Whitespace;[ ];
+                        RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.cspans.txt
new file mode 100644
index 0000000000..69febe9867
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [19] )
+Code span at (8:0,8 [11] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [19] )
+Markup span at (19:0,19 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.stree.txt
new file mode 100644
index 0000000000..d2d51198cb
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..19)::19 - [@custom Some_Member]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            RazorDirective - [0..19)::19 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..19)::18
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..19)::12
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..19)::11 - [Some_Member] - Gen<DirectiveToken {;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Some_Member];
+        MarkupTextLiteral - [19..19)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.cspans.txt
new file mode 100644
index 0000000000..9a307ed573
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.cspans.txt
@@ -0,0 +1,10 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [64] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [64] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [64] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [64] )
+Code span at (8:0,8 [34] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [64] )
+Code span at (42:0,42 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [64] )
+Code span at (43:0,43 [11] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [64] )
+Markup span at (54:0,54 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [64] )
+Code span at (55:0,55 [9] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [64] )
+Markup span at (64:0,64 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [64] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.stree.txt
new file mode 100644
index 0000000000..d2f7b39c4d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..64)::64 - [@custom System.Text.Encoding.ASCIIEncoding Some_Member "AString"]
+    MarkupBlock - [0..64)::64
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..64)::64
+            RazorDirective - [0..64)::64 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..64)::63
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..64)::57
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..42)::34 - [System.Text.Encoding.ASCIIEncoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[ASCIIEncoding];
+                        CSharpStatementLiteral - [42..43)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [43..54)::11 - [Some_Member] - Gen<DirectiveToken {;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Some_Member];
+                        MarkupEphemeralTextLiteral - [54..55)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [55..64)::9 - ["AString"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["AString"];
+        MarkupTextLiteral - [64..64)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.cspans.txt
similarity index 70%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.cspans.txt
index 1a375c2158..22dc8a5957 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.cspans.txt
@@ -1,8 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
 MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
-Markup span at (7:0,7 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [33] )
-Code span at (8:0,8 [8] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [33] )
-Markup span at (16:0,16 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [33] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [33] )
+Code span at (8:0,8 [8] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [33] )
+Markup span at (16:0,16 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [33] )
 MetaCode span at (17:0,17 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
 Markup span at (18:0,18 [1] ) (Accepts:Any) - Parent: Markup block at (18:0,18 [14] )
 Markup span at (19:0,19 [3] ) (Accepts:Any) - Parent: Tag block at (19:0,19 [3] )
@@ -10,3 +11,4 @@ Markup span at (22:0,22 [5] ) (Accepts:Any) - Parent: Markup block at (18:0,18 [
 Markup span at (27:0,27 [4] ) (Accepts:Any) - Parent: Tag block at (27:0,27 [4] )
 Markup span at (31:0,31 [1] ) (Accepts:Any) - Parent: Markup block at (18:0,18 [14] )
 MetaCode span at (32:0,32 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [33] )
+Markup span at (33:0,33 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [33] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.stree.txt
new file mode 100644
index 0000000000..c895c73d0c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.stree.txt
@@ -0,0 +1,46 @@
+RazorDocument - [0..33)::33 - [@custom "Header" { <p>F{o}o</p> }]
+    MarkupBlock - [0..33)::33
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..33)::33
+            RazorDirective - [0..33)::33 - Directive:{custom;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..33)::32
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..33)::26
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..16)::8 - ["Header"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["Header"];
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [17..18)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [18..32)::14
+                            MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [19..22)::3 - [<p>]
+                                MarkupTextLiteral - [19..22)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [22..27)::5 - [F{o}o] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[F];
+                                Text;[{];
+                                Text;[o];
+                                Text;[}];
+                                Text;[o];
+                            MarkupTagBlock - [27..31)::4 - [</p>]
+                                MarkupTextLiteral - [27..31)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [33..33)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.cspans.txt
new file mode 100644
index 0000000000..e3413d97ee
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [17] )
+Code span at (8:0,8 [9] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (17:0,17 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.stree.txt
new file mode 100644
index 0000000000..77987a903f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..17)::17 - [@custom "AString"]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            RazorDirective - [0..17)::17 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..17)::16
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..17)::10
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..17)::9 - ["AString"] - Gen<DirectiveToken {;String;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["AString"];
+        MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.cspans.txt
new file mode 100644
index 0000000000..fd5256e31f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [42] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [42] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [42] )
+Code span at (8:0,8 [34] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [42] )
+Markup span at (42:0,42 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.stree.txt
new file mode 100644
index 0000000000..ba28ef0a75
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..42)::42 - [@custom System.Text.Encoding.ASCIIEncoding]
+    MarkupBlock - [0..42)::42
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..42)::42
+            RazorDirective - [0..42)::42 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..42)::41
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..42)::35
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..42)::34 - [System.Text.Encoding.ASCIIEncoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[ASCIIEncoding];
+        MarkupTextLiteral - [42..42)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Class.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Class.cspans.txt
similarity index 52%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Class.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Class.cspans.txt
index edcf8072b2..35eaf0bb6c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Class.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Class.cspans.txt
@@ -1,2 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [6] )
 MetaCode span at (1:0,1 [5] ) (Accepts:None) - Parent: Directive block at (0:0,0 [6] )
+Markup span at (6:0,6 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Class.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Class.stree.txt
new file mode 100644
index 0000000000..006f105357
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Class.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..6)::6 - [@class]
+    MarkupBlock - [0..6)::6
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..6)::6
+            RazorDirective - [0..6)::6 - Directive:{class;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..6)::5
+                    RazorMetaCode - [1..6)::5 - Gen<None> - SpanEditHandler;Accepts:None
+                        Keyword;[class];
+                    CSharpCodeBlock - [6..6)::0
+        MarkupTextLiteral - [6..6)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Namespace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Namespace.cspans.txt
similarity index 51%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Namespace.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Namespace.cspans.txt
index c92fb77651..65fa84c6ab 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Namespace.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Namespace.cspans.txt
@@ -1,2 +1,4 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [10] )
 MetaCode span at (1:0,1 [9] ) (Accepts:None) - Parent: Directive block at (0:0,0 [10] )
+Markup span at (10:0,10 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [10] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Namespace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Namespace.stree.txt
new file mode 100644
index 0000000000..9b940ce6e5
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Directives_CanUseReservedWord_Namespace.stree.txt
@@ -0,0 +1,14 @@
+RazorDocument - [0..10)::10 - [@namespace]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            RazorDirective - [0..10)::10 - Directive:{namespace;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..10)::9
+                    RazorMetaCode - [1..10)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Keyword;[namespace];
+                    CSharpCodeBlock - [10..10)::0
+        MarkupTextLiteral - [10..10)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/EmptyFunctionsDirective.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/EmptyFunctionsDirective.cspans.txt
similarity index 67%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/EmptyFunctionsDirective.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/EmptyFunctionsDirective.cspans.txt
index 17a8238d63..ec35aaf914 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/EmptyFunctionsDirective.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/EmptyFunctionsDirective.cspans.txt
@@ -1,6 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
 MetaCode span at (1:0,1 [9] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
-Markup span at (10:0,10 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [14] )
+Markup span at (10:0,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [14] )
 MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
 Code span at (12:0,12 [1] ) (Accepts:Any) - Parent: Directive block at (0:0,0 [14] )
 MetaCode span at (13:0,13 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [14] )
+Markup span at (14:0,14 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/EmptyFunctionsDirective.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/EmptyFunctionsDirective.stree.txt
new file mode 100644
index 0000000000..7dec6510ef
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/EmptyFunctionsDirective.stree.txt
@@ -0,0 +1,23 @@
+RazorDocument - [0..14)::14 - [@functions { }]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..14)::14
+            RazorDirective - [0..14)::14 - Directive:{functions;CodeBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..14)::13
+                    RazorMetaCode - [1..10)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[functions];
+                    CSharpCodeBlock - [10..14)::4
+                        MarkupTextLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [12..13)::1
+                            CSharpStatementLiteral - [12..13)::1 - [ ] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                Whitespace;[ ];
+                        RazorMetaCode - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [14..14)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt
new file mode 100644
index 0000000000..80b5cd9e14
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
+Code span at (2:1,0 [2] ) (Accepts:Any) - Parent: Statement block at (2:1,0 [44] )
+Transition span at (4:1,2 [1] ) (Accepts:None) - Parent: Directive block at (4:1,2 [42] )
+MetaCode span at (5:1,3 [6] ) (Accepts:None) - Parent: Directive block at (4:1,2 [42] )
+Code span at (11:1,9 [1] ) (Accepts:Whitespace) - Parent: Directive block at (4:1,2 [42] )
+Code span at (12:1,10 [34] ) (Accepts:NonWhitespace) - Parent: Directive block at (4:1,2 [42] )
+Markup span at (46:1,44 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt
new file mode 100644
index 0000000000..bd2d6d768d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..46)::46 - [LF  @custom System.Text.Encoding.ASCIIEncoding]
+    MarkupBlock - [0..46)::46
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        CSharpCodeBlock - [2..46)::44
+            CSharpStatementLiteral - [2..4)::2 - [  ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                Whitespace;[  ];
+            RazorDirective - [4..46)::42 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [5..46)::41
+                    RazorMetaCode - [5..11)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [11..46)::35
+                        CSharpStatementLiteral - [11..12)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [12..46)::34 - [System.Text.Encoding.ASCIIEncoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[ASCIIEncoding];
+        MarkupTextLiteral - [46..46)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.cspans.txt
new file mode 100644
index 0000000000..2b00010889
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [48] )
+Transition span at (3:0,3 [1] ) (Accepts:None) - Parent: Directive block at (3:0,3 [44] )
+MetaCode span at (4:0,4 [6] ) (Accepts:None) - Parent: Directive block at (3:0,3 [44] )
+Code span at (10:0,10 [1] ) (Accepts:Whitespace) - Parent: Directive block at (3:0,3 [44] )
+Code span at (11:0,11 [34] ) (Accepts:NonWhitespace) - Parent: Directive block at (3:0,3 [44] )
+Markup span at (45:0,45 [2] ) (Accepts:Whitespace) - Parent: Directive block at (3:0,3 [44] )
+Markup span at (47:1,0 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [48] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.stree.txt
new file mode 100644
index 0000000000..de8aa13386
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.stree.txt
@@ -0,0 +1,27 @@
+RazorDocument - [0..48)::48 - [{  @custom System.Text.Encoding.ASCIIEncodingLF}]
+    MarkupBlock - [0..48)::48
+        MarkupTextLiteral - [0..3)::3 - [{  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[{];
+            Whitespace;[  ];
+        CSharpCodeBlock - [3..47)::44
+            RazorDirective - [3..47)::44 - Directive:{custom;SingleLine;Unrestricted} [RZ2005(4:0,4 [6] )]
+                CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [4..47)::43
+                    RazorMetaCode - [4..10)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [10..47)::37
+                        CSharpStatementLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [11..45)::34 - [System.Text.Encoding.ASCIIEncoding] - Gen<DirectiveToken {;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Text];
+                            Dot;[.];
+                            Identifier;[Encoding];
+                            Dot;[.];
+                            Identifier;[ASCIIEncoding];
+                        MarkupEphemeralTextLiteral - [45..47)::2 - [LF] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            NewLine;[LF];
+        MarkupTextLiteral - [47..48)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[}];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsArrays.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsArrays.cspans.txt
similarity index 75%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsArrays.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsArrays.cspans.txt
index 3147ee9712..79d48099bf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsArrays.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsArrays.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
 MetaCode span at (1:0,1 [8] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
-Code span at (9:0,9 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [22] )
-Code span at (10:0,10 [12] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [22] )
+Code span at (9:0,9 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [22] )
+Code span at (10:0,10 [12] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [22] )
 Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsArrays.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsArrays.stree.txt
new file mode 100644
index 0000000000..84882ce25e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsArrays.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..22)::22 - [@inherits string[[]][]]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            RazorDirective - [0..22)::22 - Directive:{inherits;SingleLine;FileScopedSinglyOccurring}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..22)::21
+                    RazorMetaCode - [1..9)::8 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[inherits];
+                    CSharpCodeBlock - [9..22)::13
+                        CSharpStatementLiteral - [9..10)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [10..22)::12 - [string[[]][]] - Gen<DirectiveToken {TypeName;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Keyword;[string];
+                            LeftBracket;[[];
+                            LeftBracket;[[];
+                            RightBracket;[]];
+                            RightBracket;[]];
+                            LeftBracket;[[];
+                            RightBracket;[]];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsNestedGenerics.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsNestedGenerics.cspans.txt
similarity index 75%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsNestedGenerics.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsNestedGenerics.cspans.txt
index 2b3f6f0879..4a73c4c8ca 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsNestedGenerics.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsNestedGenerics.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [87] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [87] )
 MetaCode span at (1:0,1 [8] ) (Accepts:None) - Parent: Directive block at (0:0,0 [87] )
-Code span at (9:0,9 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [87] )
-Code span at (10:0,10 [77] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [87] )
+Code span at (9:0,9 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [87] )
+Code span at (10:0,10 [77] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [87] )
 Markup span at (87:0,87 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [87] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsNestedGenerics.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsNestedGenerics.stree.txt
new file mode 100644
index 0000000000..b8cf6049cb
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsNestedGenerics.stree.txt
@@ -0,0 +1,34 @@
+RazorDocument - [0..87)::87 - [@inherits System.Web.Mvc.WebViewPage<IEnumerable<MvcApplication2.Models.RegisterModel>>]
+    MarkupBlock - [0..87)::87
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..87)::87
+            RazorDirective - [0..87)::87 - Directive:{inherits;SingleLine;FileScopedSinglyOccurring}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..87)::86
+                    RazorMetaCode - [1..9)::8 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[inherits];
+                    CSharpCodeBlock - [9..87)::78
+                        CSharpStatementLiteral - [9..10)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [10..87)::77 - [System.Web.Mvc.WebViewPage<IEnumerable<MvcApplication2.Models.RegisterModel>>] - Gen<DirectiveToken {TypeName;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[Web];
+                            Dot;[.];
+                            Identifier;[Mvc];
+                            Dot;[.];
+                            Identifier;[WebViewPage];
+                            LessThan;[<];
+                            Identifier;[IEnumerable];
+                            LessThan;[<];
+                            Identifier;[MvcApplication2];
+                            Dot;[.];
+                            Identifier;[Models];
+                            Dot;[.];
+                            Identifier;[RegisterModel];
+                            GreaterThan;[>];
+                            GreaterThan;[>];
+        MarkupTextLiteral - [87..87)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsTypeKeywords.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsTypeKeywords.cspans.txt
similarity index 75%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsTypeKeywords.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsTypeKeywords.cspans.txt
index 814c89b4eb..0be18525ff 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsTypeKeywords.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsTypeKeywords.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
 MetaCode span at (1:0,1 [8] ) (Accepts:None) - Parent: Directive block at (0:0,0 [16] )
-Code span at (9:0,9 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [16] )
-Code span at (10:0,10 [6] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [16] )
+Code span at (9:0,9 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [16] )
+Code span at (10:0,10 [6] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [16] )
 Markup span at (16:0,16 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsTypeKeywords.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsTypeKeywords.stree.txt
new file mode 100644
index 0000000000..12fe4f3b8b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/InheritsDirectiveSupportsTypeKeywords.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..16)::16 - [@inherits string]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            RazorDirective - [0..16)::16 - Directive:{inherits;SingleLine;FileScopedSinglyOccurring}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..16)::15
+                    RazorMetaCode - [1..9)::8 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[inherits];
+                    CSharpCodeBlock - [9..16)::7
+                        CSharpStatementLiteral - [9..10)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [10..16)::6 - [string] - Gen<DirectiveToken {TypeName;Type;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Keyword;[string];
+        MarkupTextLiteral - [16..16)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_AreSkipped.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_AreSkipped.cspans.txt
new file mode 100644
index 0000000000..2afc521ace
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_AreSkipped.cspans.txt
@@ -0,0 +1,5 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [8] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [8] )
+Markup span at (8:0,8 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_AreSkipped.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_AreSkipped.stree.txt
new file mode 100644
index 0000000000..592926662b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_AreSkipped.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..8)::8 - [@custom ]
+    MarkupBlock - [0..8)::8
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            RazorDirective - [0..8)::8 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..8)::7
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..8)::1
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+        MarkupTextLiteral - [8..8)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.cspans.txt
new file mode 100644
index 0000000000..1b7631b73f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [29] )
+Code span at (8:0,8 [21] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [29] )
+Markup span at (29:0,29 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.stree.txt
new file mode 100644
index 0000000000..455a063f9d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..29)::29 - [@custom "{formaction}?/{id}?"]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            RazorDirective - [0..29)::29 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..29)::28
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..29)::22
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..29)::21 - ["{formaction}?/{id}?"] - Gen<DirectiveToken {;String;Opt:True}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["{formaction}?/{id}?"];
+        MarkupTextLiteral - [29..29)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.cspans.txt
new file mode 100644
index 0000000000..d4a6305e23
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.cspans.txt
@@ -0,0 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [43] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [43] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [43] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [43] )
+Code span at (8:0,8 [21] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [43] )
+Code span at (29:0,29 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [43] )
+Code span at (30:0,30 [13] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [43] )
+Markup span at (43:0,43 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [43] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.stree.txt
new file mode 100644
index 0000000000..de4cde9da7
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.stree.txt
@@ -0,0 +1,24 @@
+RazorDocument - [0..43)::43 - [@custom "{formaction}?/{id}?" System.String]
+    MarkupBlock - [0..43)::43
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..43)::43
+            RazorDirective - [0..43)::43 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..43)::42
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..43)::36
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..29)::21 - ["{formaction}?/{id}?"] - Gen<DirectiveToken {;String;Opt:True}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["{formaction}?/{id}?"];
+                        CSharpStatementLiteral - [29..30)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [30..43)::13 - [System.String] - Gen<DirectiveToken {;Type;Opt:True}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[System];
+                            Dot;[.];
+                            Identifier;[String];
+        MarkupTextLiteral - [43..43)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.cspans.txt
new file mode 100644
index 0000000000..bd10c900ba
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
+Markup span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [22] )
+Code span at (8:0,8 [14] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.stree.txt
new file mode 100644
index 0000000000..ccd26b5cbe
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..22)::22 - [@custom "simple-value"]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            RazorDirective - [0..22)::22 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..22)::21
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..22)::15
+                        MarkupEphemeralTextLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..22)::14 - ["simple-value"] - Gen<DirectiveToken {;String;Opt:True}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            StringLiteral;["simple-value"];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.cspans.txt
new file mode 100644
index 0000000000..0fe58ec33c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
+MetaCode span at (1:0,1 [13] ) (Accepts:None) - Parent: Directive block at (0:0,0 [27] )
+Code span at (14:0,14 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [27] )
+Code span at (15:0,15 [12] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [27] )
+Markup span at (27:0,27 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.stree.txt
new file mode 100644
index 0000000000..adf43bdc9d
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..27)::27 - [@TestDirective PropertyName]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            RazorDirective - [0..27)::27 - Directive:{TestDirective;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..27)::26
+                    RazorMetaCode - [1..14)::13 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[TestDirective];
+                    CSharpCodeBlock - [14..27)::13
+                        CSharpStatementLiteral - [14..15)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [15..27)::12 - [PropertyName] - Gen<DirectiveToken {;Member;Opt:True}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[PropertyName];
+        MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.cspans.txt
new file mode 100644
index 0000000000..de71313701
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [15] )
+MetaCode span at (1:0,1 [13] ) (Accepts:None) - Parent: Directive block at (0:0,0 [15] )
+Code span at (14:0,14 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [15] )
+Code span at (15:0,15 [0] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [15] )
+Markup span at (15:0,15 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.stree.txt
new file mode 100644
index 0000000000..7a6be62a85
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..15)::15 - [@TestDirective ]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..15)::15
+            RazorDirective - [0..15)::15 - Directive:{TestDirective;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..15)::14
+                    RazorMetaCode - [1..14)::13 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[TestDirective];
+                    CSharpCodeBlock - [14..15)::1
+                        CSharpStatementLiteral - [14..15)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [15..15)::0 - [] - Gen<DirectiveToken {;Member;Opt:True}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Marker;[];
+        MarkupTextLiteral - [15..15)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_FunctionsDirective.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parse_FunctionsDirective.cspans.txt
similarity index 67%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_FunctionsDirective.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parse_FunctionsDirective.cspans.txt
index d5fc0c09b5..56124263ab 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_FunctionsDirective.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parse_FunctionsDirective.cspans.txt
@@ -1,6 +1,8 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [28] )
 MetaCode span at (1:0,1 [9] ) (Accepts:None) - Parent: Directive block at (0:0,0 [28] )
-Markup span at (10:0,10 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [28] )
+Markup span at (10:0,10 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [28] )
 MetaCode span at (11:0,11 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [28] )
 Code span at (12:0,12 [15] ) (Accepts:Any) - Parent: Directive block at (0:0,0 [28] )
 MetaCode span at (27:0,27 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [28] )
+Markup span at (28:0,28 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [28] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parse_FunctionsDirective.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parse_FunctionsDirective.stree.txt
new file mode 100644
index 0000000000..36812139f3
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parse_FunctionsDirective.stree.txt
@@ -0,0 +1,33 @@
+RazorDocument - [0..28)::28 - [@functions { foo(); bar(); }]
+    MarkupBlock - [0..28)::28
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..28)::28
+            RazorDirective - [0..28)::28 - Directive:{functions;CodeBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..28)::27
+                    RazorMetaCode - [1..10)::9 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[functions];
+                    CSharpCodeBlock - [10..28)::18
+                        MarkupTextLiteral - [10..11)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [11..12)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        CSharpCodeBlock - [12..27)::15
+                            CSharpStatementLiteral - [12..27)::15 - [ foo(); bar(); ] - Gen<Stmt> - CodeBlockEditHandler;Accepts:Any;CodeBlock
+                                Whitespace;[ ];
+                                Identifier;[foo];
+                                LeftParenthesis;[(];
+                                RightParenthesis;[)];
+                                Semicolon;[;];
+                                Whitespace;[ ];
+                                Identifier;[bar];
+                                LeftParenthesis;[(];
+                                RightParenthesis;[)];
+                                Semicolon;[;];
+                                Whitespace;[ ];
+                        RazorMetaCode - [27..28)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [28..28)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_SectionDirective.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parse_SectionDirective.cspans.txt
similarity index 70%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_SectionDirective.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parse_SectionDirective.cspans.txt
index 4e1fdc7d0c..ec566ae759 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_SectionDirective.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parse_SectionDirective.cspans.txt
@@ -1,8 +1,9 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
 MetaCode span at (1:0,1 [7] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
-Code span at (8:0,8 [1] ) (Accepts:WhiteSpace) - Parent: Directive block at (0:0,0 [32] )
-Code span at (9:0,9 [6] ) (Accepts:NonWhiteSpace) - Parent: Directive block at (0:0,0 [32] )
-Markup span at (15:0,15 [1] ) (Accepts:AllWhiteSpace) - Parent: Directive block at (0:0,0 [32] )
+Code span at (8:0,8 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [32] )
+Code span at (9:0,9 [6] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [32] )
+Markup span at (15:0,15 [1] ) (Accepts:AllWhitespace) - Parent: Directive block at (0:0,0 [32] )
 MetaCode span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
 Markup span at (17:0,17 [1] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [14] )
 Markup span at (18:0,18 [3] ) (Accepts:Any) - Parent: Tag block at (18:0,18 [3] )
@@ -10,3 +11,4 @@ Markup span at (21:0,21 [5] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [
 Markup span at (26:0,26 [4] ) (Accepts:Any) - Parent: Tag block at (26:0,26 [4] )
 Markup span at (30:0,30 [1] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [14] )
 MetaCode span at (31:0,31 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [32] )
+Markup span at (32:0,32 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parse_SectionDirective.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parse_SectionDirective.stree.txt
new file mode 100644
index 0000000000..44d06ee3a6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parse_SectionDirective.stree.txt
@@ -0,0 +1,46 @@
+RazorDocument - [0..32)::32 - [@section Header { <p>F{o}o</p> }]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            RazorDirective - [0..32)::32 - Directive:{section;RazorBlock;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..32)::31
+                    RazorMetaCode - [1..8)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[section];
+                    CSharpCodeBlock - [8..32)::24
+                        CSharpStatementLiteral - [8..9)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [9..15)::6 - [Header] - Gen<DirectiveToken {SectionName;Member;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[Header];
+                        MarkupTextLiteral - [15..16)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:AllWhitespace
+                            Whitespace;[ ];
+                        RazorMetaCode - [16..17)::1 - Gen<None> - AutoCompleteEditHandler;Accepts:None,AutoComplete:[<null>];AtEnd
+                            LeftBrace;[{];
+                        MarkupBlock - [17..31)::14
+                            MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTagBlock - [18..21)::3 - [<p>]
+                                MarkupTextLiteral - [18..21)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [21..26)::5 - [F{o}o] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[F];
+                                Text;[{];
+                                Text;[o];
+                                Text;[}];
+                                Text;[o];
+                            MarkupTagBlock - [26..30)::4 - [</p>]
+                                MarkupTextLiteral - [26..30)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                        RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            RightBrace;[}];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.cspans.txt
new file mode 100644
index 0000000000..93ef395357
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [29] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [29] )
+Code span at (8:0,8 [21] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [29] )
+Markup span at (29:0,29 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.stree.txt
new file mode 100644
index 0000000000..4e03f5befe
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..29)::29 - [@custom BaseNamespace.Foo.Bar]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            RazorDirective - [0..29)::29 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..29)::28
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..29)::22
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..29)::21 - [BaseNamespace.Foo.Bar] - Gen<DirectiveToken {;Namespace;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[BaseNamespace];
+                            Dot;[.];
+                            Identifier;[Foo];
+                            Dot;[.];
+                            Identifier;[Bar];
+        MarkupTextLiteral - [29..29)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.cspans.txt
new file mode 100644
index 0000000000..e096a23423
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.cspans.txt
@@ -0,0 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
+Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
+MetaCode span at (1:0,1 [6] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
+Code span at (7:0,7 [1] ) (Accepts:Whitespace) - Parent: Directive block at (0:0,0 [21] )
+Code span at (8:0,8 [13] ) (Accepts:NonWhitespace) - Parent: Directive block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.stree.txt
new file mode 100644
index 0000000000..1d64e3ae92
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..21)::21 - [@custom BaseNamespace]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            RazorDirective - [0..21)::21 - Directive:{custom;SingleLine;Unrestricted}
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..21)::20
+                    RazorMetaCode - [1..7)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[custom];
+                    CSharpCodeBlock - [7..21)::14
+                        CSharpStatementLiteral - [7..8)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Whitespace
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [8..21)::13 - [BaseNamespace] - Gen<DirectiveToken {;Namespace;Opt:False}> - DirectiveTokenEditHandler;Accepts:NonWhitespace
+                            Identifier;[BaseNamespace];
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
index 814a67e317..b0884a958a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
 MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
 Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
 Code span at (17:0,17 [4] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
new file mode 100644
index 0000000000..9ea983ad50
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..21)::21 - [@removeTagHelper Foo"]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            RazorDirective - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..21)::20
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[removeTagHelper];
+                    CSharpCodeBlock - [16..21)::5
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..21)::4 - [Foo"] - Gen<RemoveTagHelper:{Foo";Foo";;} [RZ1000(20:0,20 [1] ), RZ1019(17:0,17 [4] ), RZ1036(17:0,17 [4] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Identifier;[Foo];
+                            StringLiteral;["];RZ1000(20:0,20 [1] )
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.cspans.txt
index d6dde5b7a8..a3ad9a1394 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
 MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
 Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
 Code span at (17:0,17 [3] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [20] )
+Markup span at (20:0,20 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.stree.txt
new file mode 100644
index 0000000000..6ca3c0b460
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..20)::20 - [@removeTagHelper Foo]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            RazorDirective - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..20)::19
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[removeTagHelper];
+                    CSharpCodeBlock - [16..20)::4
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..20)::3 - [Foo] - Gen<RemoveTagHelper:{Foo;Foo;;} [RZ1036(17:0,17 [3] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Identifier;[Foo];
+        MarkupTextLiteral - [20..20)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.cspans.txt
index d847da62f5..0dfe38be7c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
 MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
 Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
 Code span at (17:0,17 [2] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [19] )
+Markup span at (19:0,19 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.stree.txt
new file mode 100644
index 0000000000..1fcd5587a5
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..19)::19 - [@removeTagHelper ""]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            RazorDirective - [0..19)::19
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..19)::18
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[removeTagHelper];
+                    CSharpCodeBlock - [16..19)::3
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..19)::2 - [""] - Gen<RemoveTagHelper:{"";;;} [RZ1036(18:0,18 [1] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;[""];
+        MarkupTextLiteral - [19..19)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_RequiresValue.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_RequiresValue.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_RequiresValue.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_RequiresValue.cspans.txt
index adc30c55d8..a8d324c3dc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_RequiresValue.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_RequiresValue.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
 MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
 Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
 Code span at (17:0,17 [0] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (17:0,17 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_RequiresValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_RequiresValue.stree.txt
new file mode 100644
index 0000000000..20a0666a00
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_RequiresValue.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..17)::17 - [@removeTagHelper ]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            RazorDirective - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..17)::16
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[removeTagHelper];
+                    CSharpCodeBlock - [16..17)::1
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..17)::0 - [] - Gen<RemoveTagHelper:{;;;} [RZ1018(1:0,1 [16] ), RZ1036(17:0,17 [1] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Marker;[];
+        MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.cspans.txt
index 82433192e9..d9553ee9ff 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [25] )
 MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [25] )
 Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [25] )
 Code span at (17:0,17 [8] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [25] )
+Markup span at (25:0,25 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.stree.txt
new file mode 100644
index 0000000000..7584b6d08b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..25)::25 - [@removeTagHelper '*, Foo']
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..25)::25
+            RazorDirective - [0..25)::25
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..25)::24
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[removeTagHelper];
+                    CSharpCodeBlock - [16..25)::9
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..25)::8 - ['*, Foo'] - Gen<RemoveTagHelper:{'*, Foo';'*, Foo';;} [RZ1036(17:0,17 [8] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            CharacterLiteral;['*, Foo'];
+        MarkupTextLiteral - [25..25)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
index 814a67e317..b0884a958a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
 MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
 Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
 Code span at (17:0,17 [4] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
new file mode 100644
index 0000000000..41c54a8e5b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..21)::21 - [@removeTagHelper "Foo]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            RazorDirective - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..21)::20
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[removeTagHelper];
+                    CSharpCodeBlock - [16..21)::5
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..21)::4 - ["Foo] - Gen<RemoveTagHelper:{"Foo;"Foo;;} [RZ1000(17:0,17 [1] ), RZ1019(17:0,17 [4] ), RZ1036(17:0,17 [4] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;["Foo];RZ1000(17:0,17 [1] )
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.cspans.txt
index 7047bf83e0..71bf30f73f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [35] )
 MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [35] )
 Markup span at (16:0,16 [5] ) (Accepts:None) - Parent: Directive block at (0:0,0 [35] )
 Code span at (21:0,21 [14] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [35] )
+Markup span at (35:0,35 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [35] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.stree.txt
new file mode 100644
index 0000000000..e3062d1894
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..35)::35 - [@removeTagHelper     Foo,   Bar    ]
+    MarkupBlock - [0..35)::35
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..35)::35
+            RazorDirective - [0..35)::35
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..35)::34
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[removeTagHelper];
+                    CSharpCodeBlock - [16..35)::19
+                        MarkupTextLiteral - [16..21)::5 - [     ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[     ];
+                        CSharpStatementLiteral - [21..35)::14 - [Foo,   Bar    ] - Gen<RemoveTagHelper:{Foo,   Bar;Foo,   Bar;Foo;Bar}> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Identifier;[Foo];
+                            Comma;[,];
+                            Whitespace;[   ];
+                            Identifier;[Bar];
+                            Whitespace;[    ];
+        MarkupTextLiteral - [35..35)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt
index e34deac84b..b919e2b98c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
 MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
 Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
 Code span at (17:0,17 [5] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt
new file mode 100644
index 0000000000..92659f0769
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..22)::22 - [@removeTagHelper "Foo"]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            RazorDirective - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..22)::21
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[removeTagHelper];
+                    CSharpCodeBlock - [16..22)::6
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..22)::5 - ["Foo"] - Gen<RemoveTagHelper:{"Foo";Foo;;} [RZ1036(18:0,18 [3] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;["Foo"];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
index 3de0fa6980..06a4f306a1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [24] )
 MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [24] )
 Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [24] )
 Code span at (17:0,17 [7] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [24] )
+Markup span at (24:0,24 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
new file mode 100644
index 0000000000..757c8c81f0
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.stree.txt
@@ -0,0 +1,20 @@
+RazorDocument - [0..24)::24 - [@tagHelperPrefix Foo   "]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..24)::24
+            RazorDirective - [0..24)::24
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..24)::23
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[tagHelperPrefix];
+                    CSharpCodeBlock - [16..24)::8
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..24)::7 - [Foo   "] - Gen<TagHelperPrefix:{Foo   ";Foo   "} [RZ1000(23:0,23 [1] ), RZ1019(17:0,17 [7] ), RZ1020(17:0,17 [7] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Identifier;[Foo];
+                            Whitespace;[   ];
+                            StringLiteral;["];RZ1000(23:0,23 [1] )
+        MarkupTextLiteral - [24..24)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.cspans.txt
index d847da62f5..0dfe38be7c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
 MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
 Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [19] )
 Code span at (17:0,17 [2] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [19] )
+Markup span at (19:0,19 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.stree.txt
new file mode 100644
index 0000000000..ee06179c7f
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..19)::19 - [@tagHelperPrefix ""]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            RazorDirective - [0..19)::19
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..19)::18
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[tagHelperPrefix];
+                    CSharpCodeBlock - [16..19)::3
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..19)::2 - [""] - Gen<TagHelperPrefix:{"";}> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;[""];
+        MarkupTextLiteral - [19..19)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_RequiresValue.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_RequiresValue.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_RequiresValue.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_RequiresValue.cspans.txt
index adc30c55d8..a8d324c3dc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_RequiresValue.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_RequiresValue.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
 MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
 Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [17] )
 Code span at (17:0,17 [0] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [17] )
+Markup span at (17:0,17 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_RequiresValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_RequiresValue.stree.txt
new file mode 100644
index 0000000000..0e86bb2dc2
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_RequiresValue.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..17)::17 - [@tagHelperPrefix ]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            RazorDirective - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..17)::16
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[tagHelperPrefix];
+                    CSharpCodeBlock - [16..17)::1
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..17)::0 - [] - Gen<TagHelperPrefix:{;} [RZ1018(1:0,1 [16] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Marker;[];
+        MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
index 814a67e317..b0884a958a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
 MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
 Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [21] )
 Code span at (17:0,17 [4] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [21] )
+Markup span at (21:0,21 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
new file mode 100644
index 0000000000..3e26d675c8
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..21)::21 - [@tagHelperPrefix "Foo]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            RazorDirective - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..21)::20
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[tagHelperPrefix];
+                    CSharpCodeBlock - [16..21)::5
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..21)::4 - ["Foo] - Gen<TagHelperPrefix:{"Foo;"Foo} [RZ1000(17:0,17 [1] ), RZ1019(17:0,17 [4] ), RZ1020(17:0,17 [4] )]> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;["Foo];RZ1000(17:0,17 [1] )
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_Succeeds.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_Succeeds.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_Succeeds.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_Succeeds.cspans.txt
index d6dde5b7a8..a3ad9a1394 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_Succeeds.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_Succeeds.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
 MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
 Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [20] )
 Code span at (17:0,17 [3] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [20] )
+Markup span at (20:0,20 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_Succeeds.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_Succeeds.stree.txt
new file mode 100644
index 0000000000..8b875e2851
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_Succeeds.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..20)::20 - [@tagHelperPrefix Foo]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            RazorDirective - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..20)::19
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[tagHelperPrefix];
+                    CSharpCodeBlock - [16..20)::4
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..20)::3 - [Foo] - Gen<TagHelperPrefix:{Foo;Foo}> - SpanEditHandler;Accepts:AnyExceptNewline
+                            Identifier;[Foo];
+        MarkupTextLiteral - [20..20)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.cspans.txt
similarity index 68%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.cspans.txt
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.cspans.txt
index e34deac84b..b919e2b98c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.cspans.txt
@@ -1,4 +1,6 @@
+Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
 MetaCode span at (1:0,1 [15] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
 Markup span at (16:0,16 [1] ) (Accepts:None) - Parent: Directive block at (0:0,0 [22] )
 Code span at (17:0,17 [5] ) (Accepts:AnyExceptNewline) - Parent: Directive block at (0:0,0 [22] )
+Markup span at (22:0,22 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.stree.txt
new file mode 100644
index 0000000000..1bbaa5ea09
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/RazorDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..22)::22 - [@tagHelperPrefix "Foo"]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            RazorDirective - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                RazorDirectiveBody - [1..22)::21
+                    RazorMetaCode - [1..16)::15 - Gen<None> - SpanEditHandler;Accepts:None
+                        Identifier;[tagHelperPrefix];
+                    CSharpCodeBlock - [16..22)::6
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:None
+                            Whitespace;[ ];
+                        CSharpStatementLiteral - [17..22)::5 - ["Foo"] - Gen<TagHelperPrefix:{"Foo";Foo}> - SpanEditHandler;Accepts:AnyExceptNewline
+                            StringLiteral;["Foo"];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures1.stree.txt
index 4dbeb051ae..b808d1118a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures1.stree.txt
@@ -1,3 +1,14 @@
-Markup block - Gen<None> - 15 - (0:0,0)
-    Tag block - Gen<TagHelper> - 15 - (0:0,0) - input - InputTagHelper1 - InputTagHelper2
-        StartTagAndEndTag - <input> ... </input>
+RazorDocument - [0..15)::15 - [<input></input>]
+    MarkupBlock - [0..15)::15
+        MarkupTagHelperElement - [0..15)::15 - input[StartTagAndEndTag] - InputTagHelper1 - InputTagHelper2
+            MarkupTagHelperStartTag - [0..7)::7
+                MarkupTextLiteral - [0..7)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [7..15)::8
+                MarkupTextLiteral - [7..15)::8 - [</input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[input];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures2.stree.txt
index b44a4b21d3..db3dcb1403 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures2.stree.txt
@@ -1,3 +1,10 @@
-Markup block - Gen<None> - 9 - (0:0,0)
-    Tag block - Gen<TagHelper> - 9 - (0:0,0) - input - InputTagHelper1 - InputTagHelper2
-        SelfClosing - <input />
+RazorDocument - [0..9)::9 - [<input />]
+    MarkupBlock - [0..9)::9
+        MarkupTagHelperElement - [0..9)::9 - input[SelfClosing] - InputTagHelper1 - InputTagHelper2
+            MarkupTagHelperStartTag - [0..9)::9
+                MarkupTextLiteral - [0..9)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.stree.txt
index 76589cff22..5ff3c5be23 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures3.stree.txt
@@ -1,6 +1,23 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Tag block - Gen<TagHelper> - 19 - (0:0,0) - input - InputTagHelper1 - InputTagHelper2
-        StartTagOnly - <input type='text'>
-        type - SingleQuotes
-            Markup span - Gen<Markup> - [text] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                HtmlTokenType.Text;[text];
+RazorDocument - [0..19)::19 - [<input type='text'>]
+    MarkupBlock - [0..19)::19
+        MarkupTagHelperElement - [0..19)::19 - input[StartTagOnly] - InputTagHelper1 - InputTagHelper2
+            MarkupTagHelperStartTag - [0..19)::19
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupTagHelperAttribute - [6..18)::12 - type - SingleQuotes - Unbound - [ type='text']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..11)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..17)::4
+                        MarkupLiteralAttributeValue - [13..17)::4 - [text]
+                            MarkupTextLiteral - [13..17)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[text];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [18..19)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures4.stree.txt
index ebca51245c..f1523da71e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures4.stree.txt
@@ -1,5 +1,14 @@
-Markup block - Gen<None> - 14 - (0:0,0)
-    Tag block - Gen<TagHelper> - 7 - (0:0,0) - input - InputTagHelper1 - InputTagHelper2
-        StartTagOnly - <input>
-    Tag block - Gen<TagHelper> - 7 - (7:0,7) - input - InputTagHelper1 - InputTagHelper2
-        StartTagOnly - <input>
+RazorDocument - [0..14)::14 - [<input><input>]
+    MarkupBlock - [0..14)::14
+        MarkupTagHelperElement - [0..7)::7 - input[StartTagOnly] - InputTagHelper1 - InputTagHelper2
+            MarkupTagHelperStartTag - [0..7)::7
+                MarkupTextLiteral - [0..7)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
+        MarkupTagHelperElement - [7..14)::7 - input[StartTagOnly] - InputTagHelper1 - InputTagHelper2
+            MarkupTagHelperStartTag - [7..14)::7
+                MarkupTextLiteral - [7..14)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.stree.txt
index e389558d82..01d07394e9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures5.stree.txt
@@ -1,6 +1,29 @@
-Markup block - Gen<None> - 27 - (0:0,0)
-    Tag block - Gen<TagHelper> - 27 - (0:0,0) - input - InputTagHelper1 - InputTagHelper2
-        StartTagAndEndTag - <input type='text'> ... </input>
-        type - SingleQuotes
-            Markup span - Gen<Markup> - [text] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                HtmlTokenType.Text;[text];
+RazorDocument - [0..27)::27 - [<input type='text'></input>]
+    MarkupBlock - [0..27)::27
+        MarkupTagHelperElement - [0..27)::27 - input[StartTagAndEndTag] - InputTagHelper1 - InputTagHelper2
+            MarkupTagHelperStartTag - [0..19)::19
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupTagHelperAttribute - [6..18)::12 - type - SingleQuotes - Unbound - [ type='text']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..11)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..17)::4
+                        MarkupLiteralAttributeValue - [13..17)::4 - [text]
+                            MarkupTextLiteral - [13..17)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[text];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [18..19)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [19..27)::8
+                MarkupTextLiteral - [19..27)::8 - [</input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[input];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures6.stree.txt
index b44a4b21d3..db3dcb1403 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures6.stree.txt
@@ -1,3 +1,10 @@
-Markup block - Gen<None> - 9 - (0:0,0)
-    Tag block - Gen<TagHelper> - 9 - (0:0,0) - input - InputTagHelper1 - InputTagHelper2
-        SelfClosing - <input />
+RazorDocument - [0..9)::9 - [<input />]
+    MarkupBlock - [0..9)::9
+        MarkupTagHelperElement - [0..9)::9 - input[SelfClosing] - InputTagHelper1 - InputTagHelper2
+            MarkupTagHelperStartTag - [0..9)::9
+                MarkupTextLiteral - [0..9)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures7.stree.txt
index b44a4b21d3..db3dcb1403 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/AllowsCompatibleTagStructures7.stree.txt
@@ -1,3 +1,10 @@
-Markup block - Gen<None> - 9 - (0:0,0)
-    Tag block - Gen<TagHelper> - 9 - (0:0,0) - input - InputTagHelper1 - InputTagHelper2
-        SelfClosing - <input />
+RazorDocument - [0..9)::9 - [<input />]
+    MarkupBlock - [0..9)::9
+        MarkupTagHelperElement - [0..9)::9 - input[SelfClosing] - InputTagHelper1 - InputTagHelper2
+            MarkupTagHelperStartTag - [0..9)::9
+                MarkupTextLiteral - [0..9)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.diag.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.diag.txt
new file mode 100644
index 0000000000..7854af144b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '*something' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '*something' because the name contains a '*' character.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.stree.txt
index e3468f1d96..a7cce27970 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes1.stree.txt
@@ -1,7 +1,35 @@
-Markup block - Gen<None> - 30 - (0:0,0)
-    Tag block - Gen<TagHelper> - 30 - (0:0,0) - ul - CatchAllTagHelper
-        StartTagAndEndTag - <ul bound [item]='items'> ... </ul>
-        bound - Minimized
-        [item] - SingleQuotes
-            Code span - Gen<Expr> - [items] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (18:0,18) - Tokens:1
-                HtmlTokenType.Text;[items];
+RazorDocument - [0..30)::30 - [<ul bound [item]='items'></ul>]
+    MarkupBlock - [0..30)::30
+        MarkupTagHelperElement - [0..30)::30 - ul[StartTagAndEndTag] - CatchAllTagHelper
+            MarkupTagHelperStartTag - [0..25)::25
+                MarkupTextLiteral - [0..3)::3 - [<ul] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[ul];
+                MarkupMinimizedTagHelperAttribute - [3..9)::6 - bound - Minimized - Unbound - [ bound]
+                    MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [4..9)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                MarkupTagHelperAttribute - [9..24)::15 - [item] - SingleQuotes - Bound - [ [item]='items']
+                    MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [10..16)::6 - [[item]] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        LeftBracket;[[];
+                        Text;[item];
+                        RightBracket;[]];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [18..23)::5
+                        CSharpExpressionLiteral - [18..23)::5 - [items] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[items];
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [24..25)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [25..30)::5
+                MarkupTextLiteral - [25..30)::5 - [</ul>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[ul];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.diag.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.diag.txt
new file mode 100644
index 0000000000..7854af144b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '*something' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '*something' because the name contains a '*' character.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.stree.txt
index f474d91d9f..d05b1ec9b1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes2.stree.txt
@@ -1,7 +1,35 @@
-Markup block - Gen<None> - 32 - (0:0,0)
-    Tag block - Gen<TagHelper> - 32 - (0:0,0) - ul - CatchAllTagHelper
-        StartTagAndEndTag - <ul bound [(item)]='items'> ... </ul>
-        bound - Minimized
-        [(item)] - SingleQuotes
-            Code span - Gen<Expr> - [items] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (20:0,20) - Tokens:1
-                HtmlTokenType.Text;[items];
+RazorDocument - [0..32)::32 - [<ul bound [(item)]='items'></ul>]
+    MarkupBlock - [0..32)::32
+        MarkupTagHelperElement - [0..32)::32 - ul[StartTagAndEndTag] - CatchAllTagHelper
+            MarkupTagHelperStartTag - [0..27)::27
+                MarkupTextLiteral - [0..3)::3 - [<ul] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[ul];
+                MarkupMinimizedTagHelperAttribute - [3..9)::6 - bound - Minimized - Unbound - [ bound]
+                    MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [4..9)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                MarkupTagHelperAttribute - [9..26)::17 - [(item)] - SingleQuotes - Bound - [ [(item)]='items']
+                    MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [10..18)::8 - [[(item)]] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        LeftBracket;[[];
+                        Text;[(item)];
+                        RightBracket;[]];
+                    Equals;[=];
+                    MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [20..25)::5
+                        CSharpExpressionLiteral - [20..25)::5 - [items] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[items];
+                    MarkupTextLiteral - [25..26)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [26..27)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [27..32)::5
+                MarkupTextLiteral - [27..32)::5 - [</ul>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[ul];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.diag.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.diag.txt
new file mode 100644
index 0000000000..7854af144b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '*something' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '*something' because the name contains a '*' character.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.stree.txt
index 366dbc6078..a039e44dfa 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes3.stree.txt
@@ -1,11 +1,37 @@
-Markup block - Gen<None> - 55 - (0:0,0)
-    Tag block - Gen<TagHelper> - 55 - (0:0,0) - button - CatchAllTagHelper
-        StartTagAndEndTag - <button bound (click)='doSomething()'> ... </button>
-        bound - Minimized
-        (click) - SingleQuotes
-            Code span - Gen<Expr> - [doSomething()] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (23:0,23) - Tokens:1
-                HtmlTokenType.Text;[doSomething()];
-        Markup span - Gen<Markup> - [Click Me] - SpanEditHandler;Accepts:Any - (38:0,38) - Tokens:3
-            HtmlTokenType.Text;[Click];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[Me];
+RazorDocument - [0..55)::55 - [<button bound (click)='doSomething()'>Click Me</button>]
+    MarkupBlock - [0..55)::55
+        MarkupTagHelperElement - [0..55)::55 - button[StartTagAndEndTag] - CatchAllTagHelper
+            MarkupTagHelperStartTag - [0..38)::38
+                MarkupTextLiteral - [0..7)::7 - [<button] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[button];
+                MarkupMinimizedTagHelperAttribute - [7..13)::6 - bound - Minimized - Unbound - [ bound]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..13)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                MarkupTagHelperAttribute - [13..37)::24 - (click) - SingleQuotes - Bound - [ (click)='doSomething()']
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..21)::7 - [(click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[(click)];
+                    Equals;[=];
+                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [23..36)::13
+                        CSharpExpressionLiteral - [23..36)::13 - [doSomething()] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[doSomething()];
+                    MarkupTextLiteral - [36..37)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [37..38)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [38..46)::8 - [Click Me] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Click];
+                Whitespace;[ ];
+                Text;[Me];
+            MarkupTagHelperEndTag - [46..55)::9
+                MarkupTextLiteral - [46..55)::9 - [</button>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[button];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.diag.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.diag.txt
new file mode 100644
index 0000000000..7854af144b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '*something' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '*something' because the name contains a '*' character.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.stree.txt
index cbf0f2b725..70377c3b3e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes4.stree.txt
@@ -1,11 +1,37 @@
-Markup block - Gen<None> - 56 - (0:0,0)
-    Tag block - Gen<TagHelper> - 56 - (0:0,0) - button - CatchAllTagHelper
-        StartTagAndEndTag - <button bound (^click)='doSomething()'> ... </button>
-        bound - Minimized
-        (^click) - SingleQuotes
-            Code span - Gen<Expr> - [doSomething()] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (24:0,24) - Tokens:1
-                HtmlTokenType.Text;[doSomething()];
-        Markup span - Gen<Markup> - [Click Me] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:3
-            HtmlTokenType.Text;[Click];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[Me];
+RazorDocument - [0..56)::56 - [<button bound (^click)='doSomething()'>Click Me</button>]
+    MarkupBlock - [0..56)::56
+        MarkupTagHelperElement - [0..56)::56 - button[StartTagAndEndTag] - CatchAllTagHelper
+            MarkupTagHelperStartTag - [0..39)::39
+                MarkupTextLiteral - [0..7)::7 - [<button] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[button];
+                MarkupMinimizedTagHelperAttribute - [7..13)::6 - bound - Minimized - Unbound - [ bound]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..13)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                MarkupTagHelperAttribute - [13..38)::25 - (^click) - SingleQuotes - Bound - [ (^click)='doSomething()']
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..22)::8 - [(^click)] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[(^click)];
+                    Equals;[=];
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [24..37)::13
+                        CSharpExpressionLiteral - [24..37)::13 - [doSomething()] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[doSomething()];
+                    MarkupTextLiteral - [37..38)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [38..39)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [39..47)::8 - [Click Me] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Click];
+                Whitespace;[ ];
+                Text;[Me];
+            MarkupTagHelperEndTag - [47..56)::9
+                MarkupTextLiteral - [47..56)::9 - [</button>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[button];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.diag.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.diag.txt
new file mode 100644
index 0000000000..7854af144b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '*something' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '*something' because the name contains a '*' character.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.stree.txt
index 575aa9fbb3..030c5524e7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes5.stree.txt
@@ -1,7 +1,33 @@
-Markup block - Gen<None> - 46 - (0:0,0)
-    Tag block - Gen<TagHelper> - 46 - (0:0,0) - template - CatchAllTagHelper
-        StartTagAndEndTag - <template bound *something='value'> ... </template>
-        bound - Minimized
-        *something - SingleQuotes
-            Markup span - Gen<Markup> - [value] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:1
-                HtmlTokenType.Text;[value];
+RazorDocument - [0..46)::46 - [<template bound *something='value'></template>]
+    MarkupBlock - [0..46)::46
+        MarkupTagHelperElement - [0..46)::46 - template[StartTagAndEndTag] - CatchAllTagHelper
+            MarkupTagHelperStartTag - [0..35)::35
+                MarkupTextLiteral - [0..9)::9 - [<template] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[template];
+                MarkupMinimizedTagHelperAttribute - [9..15)::6 - bound - Minimized - Unbound - [ bound]
+                    MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [10..15)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                MarkupTagHelperAttribute - [15..34)::19 - *something - SingleQuotes - Bound - [ *something='value']
+                    MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [16..26)::10 - [*something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[*something];
+                    Equals;[=];
+                    MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [28..33)::5
+                        MarkupTextLiteral - [28..33)::5 - [value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[value];
+                    MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [34..35)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [35..46)::11
+                MarkupTextLiteral - [35..46)::11 - [</template>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[template];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.diag.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.diag.txt
new file mode 100644
index 0000000000..7854af144b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '*something' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '*something' because the name contains a '*' character.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.stree.txt
index 011d30b1d9..b50fadba47 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes6.stree.txt
@@ -1,5 +1,25 @@
-Markup block - Gen<None> - 33 - (0:0,0)
-    Tag block - Gen<TagHelper> - 33 - (0:0,0) - div - CatchAllTagHelper
-        StartTagAndEndTag - <div bound #localminimized> ... </div>
-        bound - Minimized
-        #localminimized - Minimized
+RazorDocument - [0..33)::33 - [<div bound #localminimized></div>]
+    MarkupBlock - [0..33)::33
+        MarkupTagHelperElement - [0..33)::33 - div[StartTagAndEndTag] - CatchAllTagHelper
+            MarkupTagHelperStartTag - [0..27)::27
+                MarkupTextLiteral - [0..4)::4 - [<div] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                MarkupMinimizedTagHelperAttribute - [4..10)::6 - bound - Minimized - Unbound - [ bound]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                MarkupMinimizedTagHelperAttribute - [10..26)::16 - #localminimized - Minimized - Unbound - [ #localminimized]
+                    MarkupTextLiteral - [10..11)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [11..26)::15 - [#localminimized] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[#localminimized];
+                MarkupTextLiteral - [26..27)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [27..33)::6
+                MarkupTextLiteral - [27..33)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.diag.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.diag.txt
new file mode 100644
index 0000000000..7854af144b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[item]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[item]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a '[' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '[(item)]' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '[(item)]' because the name contains a ']' character.
+(0,0): Error RZ3003: Invalid tag helper bound property '*something' on tag helper 'CatchAllTagHelper'. Tag helpers cannot bind to HTML attributes with name '*something' because the name contains a '*' character.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.stree.txt
index 4b4dd4eacb..26f3690b15 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleSymbolBoundAttributes7.stree.txt
@@ -1,7 +1,33 @@
-Markup block - Gen<None> - 32 - (0:0,0)
-    Tag block - Gen<TagHelper> - 32 - (0:0,0) - div - CatchAllTagHelper
-        StartTagAndEndTag - <div bound #local='value'> ... </div>
-        bound - Minimized
-        #local - SingleQuotes
-            Markup span - Gen<Markup> - [value] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:1
-                HtmlTokenType.Text;[value];
+RazorDocument - [0..32)::32 - [<div bound #local='value'></div>]
+    MarkupBlock - [0..32)::32
+        MarkupTagHelperElement - [0..32)::32 - div[StartTagAndEndTag] - CatchAllTagHelper
+            MarkupTagHelperStartTag - [0..26)::26
+                MarkupTextLiteral - [0..4)::4 - [<div] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                MarkupMinimizedTagHelperAttribute - [4..10)::6 - bound - Minimized - Unbound - [ bound]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                MarkupTagHelperAttribute - [10..25)::15 - #local - SingleQuotes - Bound - [ #local='value']
+                    MarkupTextLiteral - [10..11)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [11..17)::6 - [#local] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[#local];
+                    Equals;[=];
+                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [19..24)::5
+                        MarkupTextLiteral - [19..24)::5 - [value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[value];
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [25..26)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [26..32)::6
+                MarkupTextLiteral - [26..32)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure1.stree.txt
index 64f951bb83..764c76b22e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure1.stree.txt
@@ -1,3 +1,8 @@
-Markup block - Gen<None> - 7 - (0:0,0)
-    Tag block - Gen<TagHelper> - 7 - (0:0,0) - input - InputTagHelper
-        StartTagOnly - <input>
+RazorDocument - [0..7)::7 - [<input>]
+    MarkupBlock - [0..7)::7
+        MarkupTagHelperElement - [0..7)::7 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [0..7)::7
+                MarkupTextLiteral - [0..7)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.stree.txt
index fb25d3d49d..ef3f989c7f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure2.stree.txt
@@ -1,6 +1,23 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Tag block - Gen<TagHelper> - 19 - (0:0,0) - input - InputTagHelper
-        StartTagOnly - <input type='text'>
-        type - SingleQuotes
-            Markup span - Gen<Markup> - [text] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                HtmlTokenType.Text;[text];
+RazorDocument - [0..19)::19 - [<input type='text'>]
+    MarkupBlock - [0..19)::19
+        MarkupTagHelperElement - [0..19)::19 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [0..19)::19
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupTagHelperAttribute - [6..18)::12 - type - SingleQuotes - Unbound - [ type='text']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..11)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..17)::4
+                        MarkupLiteralAttributeValue - [13..17)::4 - [text]
+                            MarkupTextLiteral - [13..17)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[text];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [18..19)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure3.stree.txt
index 5940efaad7..6ab1d8b0a5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure3.stree.txt
@@ -1,5 +1,14 @@
-Markup block - Gen<None> - 14 - (0:0,0)
-    Tag block - Gen<TagHelper> - 7 - (0:0,0) - input - InputTagHelper
-        StartTagOnly - <input>
-    Tag block - Gen<TagHelper> - 7 - (7:0,7) - input - InputTagHelper
-        StartTagOnly - <input>
+RazorDocument - [0..14)::14 - [<input><input>]
+    MarkupBlock - [0..14)::14
+        MarkupTagHelperElement - [0..7)::7 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [0..7)::7
+                MarkupTextLiteral - [0..7)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
+        MarkupTagHelperElement - [7..14)::7 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [7..14)::7
+                MarkupTextLiteral - [7..14)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.stree.txt
index a82132e817..a0ed923db2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure4.stree.txt
@@ -1,8 +1,29 @@
-Markup block - Gen<None> - 26 - (0:0,0)
-    Tag block - Gen<TagHelper> - 19 - (0:0,0) - input - InputTagHelper
-        StartTagOnly - <input type='text'>
-        type - SingleQuotes
-            Markup span - Gen<Markup> - [text] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                HtmlTokenType.Text;[text];
-    Tag block - Gen<TagHelper> - 7 - (19:0,19) - input - InputTagHelper
-        StartTagOnly - <input>
+RazorDocument - [0..26)::26 - [<input type='text'><input>]
+    MarkupBlock - [0..26)::26
+        MarkupTagHelperElement - [0..19)::19 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [0..19)::19
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupTagHelperAttribute - [6..18)::12 - type - SingleQuotes - Unbound - [ type='text']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..11)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..17)::4
+                        MarkupLiteralAttributeValue - [13..17)::4 - [text]
+                            MarkupTextLiteral - [13..17)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[text];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [18..19)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+        MarkupTagHelperElement - [19..26)::7 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [19..26)::7
+                MarkupTextLiteral - [19..26)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure5.stree.txt
index b8a32cfae8..39b59d94d6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CanHandleWithoutEndTagTagStructure5.stree.txt
@@ -1,16 +1,25 @@
-Markup block - Gen<None> - 25 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<div>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<TagHelper> - 7 - (5:0,5) - input - InputTagHelper
-        StartTagOnly - <input>
-    Tag block - Gen<TagHelper> - 7 - (12:0,12) - input - InputTagHelper
-        StartTagOnly - <input>
-    Tag block - Gen<None> - 6 - (19:0,19)
-        Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..25)::25 - [<div><input><input></div>]
+    MarkupBlock - [0..25)::25
+        MarkupTagBlock - [0..5)::5 - [<div>]
+            MarkupTextLiteral - [0..5)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTagHelperElement - [5..12)::7 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [5..12)::7
+                MarkupTextLiteral - [5..12)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
+        MarkupTagHelperElement - [12..19)::7 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [12..19)::7
+                MarkupTextLiteral - [12..19)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
+        MarkupTagBlock - [19..25)::6 - [</div>]
+            MarkupTextLiteral - [19..25)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.cspans.txt
index e69de29bb2..aa429ff6cb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.cspans.txt
@@ -0,0 +1 @@
+Code span at (13:0,13 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [17] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.stree.txt
index 94077ed99f..a68ddb1c11 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes1.stree.txt
@@ -1,5 +1,23 @@
-Markup block - Gen<None> - 17 - (0:0,0)
-    Tag block - Gen<TagHelper> - 17 - (0:0,0) - myth - mythTagHelper
-        SelfClosing - <myth bound='' />
-        bound - SingleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
+RazorDocument - [0..17)::17 - [<myth bound='' />]
+    MarkupBlock - [0..17)::17
+        MarkupTagHelperElement - [0..17)::17 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..17)::17
+                MarkupTextLiteral - [0..5)::5 - [<myth] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[myth];
+                MarkupTagHelperAttribute - [5..14)::9 - bound - SingleQuotes - Bound - [ bound='']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..13)::0
+                        CSharpExpressionLiteral - [13..13)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [14..17)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.cspans.txt
index e69de29bb2..aa429ff6cb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.cspans.txt
@@ -0,0 +1 @@
+Code span at (13:0,13 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [17] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.stree.txt
index 1e5707cb20..5b506a3479 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes10.stree.txt
@@ -1,5 +1,23 @@
-Markup block - Gen<None> - 17 - (0:0,0)
-    Tag block - Gen<TagHelper> - 17 - (0:0,0) - myth - mythTagHelper
-        SelfClosing - <myth BouND='' />
-        BouND - SingleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
+RazorDocument - [0..17)::17 - [<myth BouND='' />]
+    MarkupBlock - [0..17)::17
+        MarkupTagHelperElement - [0..17)::17 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..17)::17
+                MarkupTextLiteral - [0..5)::5 - [<myth] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[myth];
+                MarkupTagHelperAttribute - [5..14)::9 - BouND - SingleQuotes - Bound - [ BouND='']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [BouND] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[BouND];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..13)::0
+                        CSharpExpressionLiteral - [13..13)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [14..17)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.cspans.txt
index e69de29bb2..92552dfb4e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.cspans.txt
@@ -0,0 +1,2 @@
+Code span at (13:0,13 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [29] )
+Code span at (25:0,25 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [29] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.stree.txt
index 895d34342c..01b040e26e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes11.stree.txt
@@ -1,7 +1,35 @@
-Markup block - Gen<None> - 29 - (0:0,0)
-    Tag block - Gen<TagHelper> - 29 - (0:0,0) - myth - mythTagHelper
-        SelfClosing - <myth BOUND=''    bOUnd="" />
-        BOUND - SingleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
-        bOUnd - DoubleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
+RazorDocument - [0..29)::29 - [<myth BOUND=''    bOUnd="" />]
+    MarkupBlock - [0..29)::29
+        MarkupTagHelperElement - [0..29)::29 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..29)::29
+                MarkupTextLiteral - [0..5)::5 - [<myth] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[myth];
+                MarkupTagHelperAttribute - [5..14)::9 - BOUND - SingleQuotes - Bound - [ BOUND='']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [BOUND] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[BOUND];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..13)::0
+                        CSharpExpressionLiteral - [13..13)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTagHelperAttribute - [14..26)::12 - bOUnd - DoubleQuotes - Bound - [    bOUnd=""]
+                    MarkupTextLiteral - [14..18)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[    ];
+                    MarkupTextLiteral - [18..23)::5 - [bOUnd] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bOUnd];
+                    Equals;[=];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [25..25)::0
+                        CSharpExpressionLiteral - [25..25)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [26..29)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.stree.txt
index b978836c28..bfe9ad8359 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes12.stree.txt
@@ -1,8 +1,36 @@
-Markup block - Gen<None> - 32 - (0:0,0)
-    Tag block - Gen<TagHelper> - 32 - (0:0,0) - myth - mythTagHelper
-        StartTagAndEndTag - <myth BOUND= nAMe='john'> ... </myth>
-        BOUND - DoubleQuotes
-            Code span - Gen<None> - [] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (12:0,12) - Tokens:0
-        nAMe - SingleQuotes
-            Markup span - Gen<Markup> - [john] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:1
-                HtmlTokenType.Text;[john];
+RazorDocument - [0..32)::32 - [<myth BOUND= nAMe='john'></myth>]
+    MarkupBlock - [0..32)::32
+        MarkupTagHelperElement - [0..32)::32 - myth[StartTagAndEndTag] - mythTagHelper
+            MarkupTagHelperStartTag - [0..25)::25
+                MarkupTextLiteral - [0..5)::5 - [<myth] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[myth];
+                MarkupTagHelperAttribute - [5..12)::7 - BOUND - DoubleQuotes - Bound - [ BOUND=]
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [BOUND] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[BOUND];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        CSharpExpressionLiteral - [12..12)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                MarkupTagHelperAttribute - [12..24)::12 - nAMe - SingleQuotes - Bound - [ nAMe='john']
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..17)::4 - [nAMe] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[nAMe];
+                    Equals;[=];
+                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [19..23)::4
+                        MarkupTextLiteral - [19..23)::4 - [john] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[john];
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [24..25)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [25..32)::7
+                MarkupTextLiteral - [25..32)::7 - [</myth>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[myth];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.stree.txt
index 17d5a691e4..e246479730 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes13.stree.txt
@@ -1,15 +1,37 @@
-Markup block - Gen<None> - 28 - (0:0,0)
-    Tag block - Gen<TagHelper> - 28 - (0:0,0) - myth - mythTagHelper
-        SelfClosing - <myth bound='    @true  ' />
-        bound - SingleQuotes
-            Markup block - Gen<None> - 11 - (13:0,13)
-                Markup block - Gen<None> - 9 - (13:0,13)
-                    Code span - Gen<Expr> - [    ] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (13:0,13) - Tokens:1
-                        HtmlTokenType.WhiteSpace;[    ];
-                    Expression block - Gen<Expr> - 5 - (17:0,17)
-                        Code span - Gen<Expr> - [@] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (17:0,17) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [true] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (18:0,18) - Tokens:1
-                            CSharpTokenType.Keyword;[true];
-                Code span - Gen<Expr> - [  ] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (22:0,22) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[  ];
+RazorDocument - [0..28)::28 - [<myth bound='    @true  ' />]
+    MarkupBlock - [0..28)::28
+        MarkupTagHelperElement - [0..28)::28 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..28)::28
+                MarkupTextLiteral - [0..5)::5 - [<myth] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[myth];
+                MarkupTagHelperAttribute - [5..25)::20 - bound - SingleQuotes - Bound - [ bound='    @true  ']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..24)::11
+                        MarkupBlock - [13..22)::9
+                            CSharpExpressionLiteral - [13..17)::4 - [    ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Whitespace;[    ];
+                            CSharpCodeBlock - [17..22)::5
+                                CSharpImplicitExpression - [17..22)::5
+                                    CSharpTransition - [17..17)::0
+                                        Transition;[<Missing>];
+                                    CSharpImplicitExpressionBody - [17..22)::5
+                                        CSharpCodeBlock - [17..22)::5
+                                            CSharpExpressionLiteral - [17..18)::1 - [@] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Transition;[@];
+                                            CSharpExpressionLiteral - [18..22)::4 - [true] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Keyword;[true];
+                        CSharpExpressionLiteral - [22..24)::2 - [  ] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[  ];
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [25..28)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.stree.txt
index 6d6c06d2b4..eba1d7ab62 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes14.stree.txt
@@ -1,19 +1,41 @@
-Markup block - Gen<None> - 30 - (0:0,0)
-    Tag block - Gen<TagHelper> - 30 - (0:0,0) - myth - mythTagHelper
-        SelfClosing - <myth bound='    @(true)  ' />
-        bound - SingleQuotes
-            Markup block - Gen<None> - 13 - (13:0,13)
-                Markup block - Gen<None> - 11 - (13:0,13)
-                    Code span - Gen<Expr> - [    ] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (13:0,13) - Tokens:1
-                        HtmlTokenType.WhiteSpace;[    ];
-                    Expression block - Gen<Expr> - 7 - (17:0,17)
-                        Code span - Gen<Expr> - [@] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (17:0,17) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [(] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (18:0,18) - Tokens:1
-                            CSharpTokenType.LeftParenthesis;[(];
-                        Code span - Gen<Expr> - [true] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (19:0,19) - Tokens:1
-                            CSharpTokenType.Keyword;[true];
-                        Code span - Gen<Expr> - [)] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (23:0,23) - Tokens:1
-                            CSharpTokenType.RightParenthesis;[)];
-                Code span - Gen<Expr> - [  ] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (24:0,24) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[  ];
+RazorDocument - [0..30)::30 - [<myth bound='    @(true)  ' />]
+    MarkupBlock - [0..30)::30
+        MarkupTagHelperElement - [0..30)::30 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..30)::30
+                MarkupTextLiteral - [0..5)::5 - [<myth] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[myth];
+                MarkupTagHelperAttribute - [5..27)::22 - bound - SingleQuotes - Bound - [ bound='    @(true)  ']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..26)::13
+                        MarkupBlock - [13..24)::11
+                            CSharpExpressionLiteral - [13..17)::4 - [    ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Whitespace;[    ];
+                            CSharpCodeBlock - [17..24)::7
+                                CSharpImplicitExpression - [17..24)::7
+                                    CSharpTransition - [17..17)::0
+                                        Transition;[<Missing>];
+                                    CSharpImplicitExpressionBody - [17..24)::7
+                                        CSharpCodeBlock - [17..24)::7
+                                            CSharpExpressionLiteral - [17..18)::1 - [@] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Transition;[@];
+                                            CSharpExpressionLiteral - [18..19)::1 - [(] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                LeftParenthesis;[(];
+                                            CSharpExpressionLiteral - [19..23)::4 - [true] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Keyword;[true];
+                                            CSharpExpressionLiteral - [23..24)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                RightParenthesis;[)];
+                        CSharpExpressionLiteral - [24..26)::2 - [  ] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[  ];
+                    MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [27..30)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.stree.txt
index 8fc9db733e..57eb5f5e21 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes2.stree.txt
@@ -1,7 +1,25 @@
-Markup block - Gen<None> - 25 - (0:0,0)
-    Tag block - Gen<TagHelper> - 25 - (0:0,0) - myth - mythTagHelper
-        SelfClosing - <myth bound='    true' />
-        bound - SingleQuotes
-            Code span - Gen<Expr> - [    true] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (13:0,13) - Tokens:2
-                HtmlTokenType.WhiteSpace;[    ];
-                HtmlTokenType.Text;[true];
+RazorDocument - [0..25)::25 - [<myth bound='    true' />]
+    MarkupBlock - [0..25)::25
+        MarkupTagHelperElement - [0..25)::25 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..25)::25
+                MarkupTextLiteral - [0..5)::5 - [<myth] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[myth];
+                MarkupTagHelperAttribute - [5..22)::17 - bound - SingleQuotes - Bound - [ bound='    true']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..21)::8
+                        CSharpExpressionLiteral - [13..21)::8 - [    true] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[    ];
+                            Text;[true];
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [22..25)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.stree.txt
index b0514b64a3..f231f9a735 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes3.stree.txt
@@ -1,6 +1,24 @@
-Markup block - Gen<None> - 21 - (0:0,0)
-    Tag block - Gen<TagHelper> - 21 - (0:0,0) - myth - mythTagHelper
-        SelfClosing - <myth bound='    ' />
-        bound - SingleQuotes
-            Code span - Gen<Expr> - [    ] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (13:0,13) - Tokens:1
-                HtmlTokenType.WhiteSpace;[    ];
+RazorDocument - [0..21)::21 - [<myth bound='    ' />]
+    MarkupBlock - [0..21)::21
+        MarkupTagHelperElement - [0..21)::21 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..21)::21
+                MarkupTextLiteral - [0..5)::5 - [<myth] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[myth];
+                MarkupTagHelperAttribute - [5..18)::13 - bound - SingleQuotes - Bound - [ bound='    ']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..17)::4
+                        CSharpExpressionLiteral - [13..17)::4 - [    ] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[    ];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [18..21)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.cspans.txt
index e69de29bb2..dddc839de0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.cspans.txt
@@ -0,0 +1,2 @@
+Code span at (13:0,13 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [27] )
+Code span at (23:0,23 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [27] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.stree.txt
index 969f962e57..847c8f4e8c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes4.stree.txt
@@ -1,7 +1,35 @@
-Markup block - Gen<None> - 27 - (0:0,0)
-    Tag block - Gen<TagHelper> - 27 - (0:0,0) - myth - mythTagHelper
-        SelfClosing - <myth bound=''  bound="" />
-        bound - SingleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
-        bound - DoubleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
+RazorDocument - [0..27)::27 - [<myth bound=''  bound="" />]
+    MarkupBlock - [0..27)::27
+        MarkupTagHelperElement - [0..27)::27 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..27)::27
+                MarkupTextLiteral - [0..5)::5 - [<myth] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[myth];
+                MarkupTagHelperAttribute - [5..14)::9 - bound - SingleQuotes - Bound - [ bound='']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..13)::0
+                        CSharpExpressionLiteral - [13..13)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTagHelperAttribute - [14..24)::10 - bound - DoubleQuotes - Bound - [  bound=""]
+                    MarkupTextLiteral - [14..16)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[  ];
+                    MarkupTextLiteral - [16..21)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [22..23)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [23..23)::0
+                        CSharpExpressionLiteral - [23..23)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [24..27)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.stree.txt
index 8ebae2b0cc..6a180b1e55 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes5.stree.txt
@@ -1,9 +1,37 @@
-Markup block - Gen<None> - 30 - (0:0,0)
-    Tag block - Gen<TagHelper> - 30 - (0:0,0) - myth - mythTagHelper
-        SelfClosing - <myth bound=' '  bound="  " />
-        bound - SingleQuotes
-            Code span - Gen<Expr> - [ ] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (13:0,13) - Tokens:1
-                HtmlTokenType.WhiteSpace;[ ];
-        bound - DoubleQuotes
-            Code span - Gen<Markup> - [  ] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (24:0,24) - Tokens:1
-                HtmlTokenType.WhiteSpace;[  ];
+RazorDocument - [0..30)::30 - [<myth bound=' '  bound="  " />]
+    MarkupBlock - [0..30)::30
+        MarkupTagHelperElement - [0..30)::30 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..30)::30
+                MarkupTextLiteral - [0..5)::5 - [<myth] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[myth];
+                MarkupTagHelperAttribute - [5..15)::10 - bound - SingleQuotes - Bound - [ bound=' ']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..14)::1
+                        CSharpExpressionLiteral - [13..14)::1 - [ ] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[ ];
+                    MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTagHelperAttribute - [15..27)::12 - bound - DoubleQuotes - Bound - [  bound="  "]
+                    MarkupTextLiteral - [15..17)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[  ];
+                    MarkupTextLiteral - [17..22)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [24..26)::2
+                        CSharpExpressionLiteral - [24..26)::2 - [  ] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[  ];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [27..30)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.stree.txt
index 89b1ef374a..6d2664ae0e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes6.stree.txt
@@ -1,8 +1,32 @@
-Markup block - Gen<None> - 29 - (0:0,0)
-    Tag block - Gen<TagHelper> - 29 - (0:0,0) - myth - mythTagHelper
-        SelfClosing - <myth bound='true' bound=  />
-        bound - SingleQuotes
-            Code span - Gen<Expr> - [true] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (13:0,13) - Tokens:1
-                HtmlTokenType.Text;[true];
-        bound - DoubleQuotes
-            Code span - Gen<None> - [] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (25:0,25) - Tokens:0
+RazorDocument - [0..29)::29 - [<myth bound='true' bound=  />]
+    MarkupBlock - [0..29)::29
+        MarkupTagHelperElement - [0..29)::29 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..29)::29
+                MarkupTextLiteral - [0..5)::5 - [<myth] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[myth];
+                MarkupTagHelperAttribute - [5..18)::13 - bound - SingleQuotes - Bound - [ bound='true']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..17)::4
+                        CSharpExpressionLiteral - [13..17)::4 - [true] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[true];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTagHelperAttribute - [18..25)::7 - bound - DoubleQuotes - Bound - [ bound=]
+                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [19..24)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [25..25)::0
+                        CSharpExpressionLiteral - [25..25)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                MarkupTextLiteral - [25..29)::4 - [  />] - Gen<None> - SpanEditHandler;Accepts:Any
+                    Whitespace;[  ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.cspans.txt
index 247b797cee..ebd5438288 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.cspans.txt
@@ -1 +1,2 @@
 Code span at (12:0,12 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [23] )
+Markup span at (19:0,19 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [23] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.stree.txt
index a8883ba894..2a5a6dce26 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes7.stree.txt
@@ -1,7 +1,31 @@
-Markup block - Gen<None> - 23 - (0:0,0)
-    Tag block - Gen<TagHelper> - 23 - (0:0,0) - myth - mythTagHelper
-        SelfClosing - <myth bound= name='' />
-        bound - DoubleQuotes
-            Code span - Gen<None> - [] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (12:0,12) - Tokens:0
-        name - SingleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
+RazorDocument - [0..23)::23 - [<myth bound= name='' />]
+    MarkupBlock - [0..23)::23
+        MarkupTagHelperElement - [0..23)::23 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..23)::23
+                MarkupTextLiteral - [0..5)::5 - [<myth] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[myth];
+                MarkupTagHelperAttribute - [5..12)::7 - bound - DoubleQuotes - Bound - [ bound=]
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        CSharpExpressionLiteral - [12..12)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                MarkupTagHelperAttribute - [12..20)::8 - name - SingleQuotes - Bound - [ name='']
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..17)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [19..19)::0
+                        MarkupTextLiteral - [19..19)::0 - []
+                    MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [20..23)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.stree.txt
index 7d1d68e4ff..e42c4f27cf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes8.stree.txt
@@ -1,8 +1,32 @@
-Markup block - Gen<None> - 25 - (0:0,0)
-    Tag block - Gen<TagHelper> - 25 - (0:0,0) - myth - mythTagHelper
-        SelfClosing - <myth bound= name='  ' />
-        bound - DoubleQuotes
-            Code span - Gen<None> - [] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (12:0,12) - Tokens:0
-        name - SingleQuotes
-            Markup span - Gen<Markup> - [  ] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:1
-                HtmlTokenType.WhiteSpace;[  ];
+RazorDocument - [0..25)::25 - [<myth bound= name='  ' />]
+    MarkupBlock - [0..25)::25
+        MarkupTagHelperElement - [0..25)::25 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..25)::25
+                MarkupTextLiteral - [0..5)::5 - [<myth] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[myth];
+                MarkupTagHelperAttribute - [5..12)::7 - bound - DoubleQuotes - Bound - [ bound=]
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        CSharpExpressionLiteral - [12..12)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                MarkupTagHelperAttribute - [12..22)::10 - name - SingleQuotes - Bound - [ name='  ']
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..17)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTextLiteral - [18..19)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [19..21)::2
+                        MarkupTextLiteral - [19..21)::2 - [  ]
+                            Whitespace;[  ];
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [22..25)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.stree.txt
index 61b79e8652..005e8ca3f5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForEmptyTagHelperBoundAttributes9.stree.txt
@@ -1,13 +1,53 @@
-Markup block - Gen<None> - 46 - (0:0,0)
-    Tag block - Gen<TagHelper> - 46 - (0:0,0) - myth - mythTagHelper
-        SelfClosing - <myth bound='true' name='john' bound= name= />
-        bound - SingleQuotes
-            Code span - Gen<Expr> - [true] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (13:0,13) - Tokens:1
-                HtmlTokenType.Text;[true];
-        name - SingleQuotes
-            Markup span - Gen<Markup> - [john] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
-                HtmlTokenType.Text;[john];
-        bound - DoubleQuotes
-            Code span - Gen<None> - [] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (37:0,37) - Tokens:0
-        name - DoubleQuotes
-            Markup span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:0
+RazorDocument - [0..46)::46 - [<myth bound='true' name='john' bound= name= />]
+    MarkupBlock - [0..46)::46
+        MarkupTagHelperElement - [0..46)::46 - myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..46)::46
+                MarkupTextLiteral - [0..5)::5 - [<myth] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[myth];
+                MarkupTagHelperAttribute - [5..18)::13 - bound - SingleQuotes - Bound - [ bound='true']
+                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [6..11)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [13..17)::4
+                        CSharpExpressionLiteral - [13..17)::4 - [true] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[true];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTagHelperAttribute - [18..30)::12 - name - SingleQuotes - Bound - [ name='john']
+                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [19..23)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [25..29)::4
+                        MarkupTextLiteral - [25..29)::4 - [john] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[john];
+                    MarkupTextLiteral - [29..30)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTagHelperAttribute - [30..37)::7 - bound - DoubleQuotes - Bound - [ bound=]
+                    MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [31..36)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [37..37)::0
+                        CSharpExpressionLiteral - [37..37)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                MarkupTagHelperAttribute - [37..43)::6 - name - DoubleQuotes - Bound - [ name=]
+                    MarkupTextLiteral - [37..38)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [38..42)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [43..43)::0
+                        MarkupTextLiteral - [43..43)::0 - []
+                MarkupTextLiteral - [43..46)::3 - [ />] - Gen<None> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.stree.txt
index a6461887d3..2ecc046686 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper1.stree.txt
@@ -1,3 +1,7 @@
-Markup block - Gen<None> - 2 - (0:0,0)
-    Tag block - Gen<TagHelper> - 2 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p
+RazorDocument - [0..2)::2 - [<p]
+    MarkupBlock - [0..2)::2
+        MarkupTagHelperElement - [0..2)::2 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..2)::2
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.stree.txt
index fde439812a..186cf6f22a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper2.stree.txt
@@ -1,3 +1,13 @@
-Markup block - Gen<None> - 6 - (0:0,0)
-    Tag block - Gen<TagHelper> - 6 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p
+RazorDocument - [0..6)::6 - [<p></p]
+    MarkupBlock - [0..6)::6
+        MarkupTagHelperElement - [0..6)::6 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [3..6)::3
+                MarkupTextLiteral - [3..6)::3 - [</p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.stree.txt
index ca5b20b10a..03d64a0250 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper3.stree.txt
@@ -1,5 +1,13 @@
-Markup block - Gen<None> - 10 - (0:0,0)
-    Tag block - Gen<TagHelper> - 10 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p>
-        Tag block - Gen<TagHelper> - 7 - (3:0,3) - strong - strongtaghelper
-            StartTagAndEndTag - <strong
+RazorDocument - [0..10)::10 - [<p><strong]
+    MarkupBlock - [0..10)::10
+        MarkupTagHelperElement - [0..10)::10 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..10)::7 - strong[StartTagAndEndTag] - strongtaghelper
+                MarkupTagHelperStartTag - [3..10)::7
+                    MarkupTextLiteral - [3..10)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.stree.txt
index e3c28c4d4a..a2c7689c07 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper4.stree.txt
@@ -1,5 +1,14 @@
-Markup block - Gen<None> - 11 - (0:0,0)
-    Tag block - Gen<TagHelper> - 11 - (0:0,0) - strong - strongtaghelper
-        StartTagAndEndTag - <strong 
-        Tag block - Gen<TagHelper> - 3 - (8:0,8) - p - ptaghelper
-            StartTagAndEndTag - <p>
+RazorDocument - [0..11)::11 - [<strong <p>]
+    MarkupBlock - [0..11)::11
+        MarkupTagHelperElement - [0..11)::11 - strong[StartTagAndEndTag] - strongtaghelper
+            MarkupTagHelperStartTag - [0..8)::8
+                MarkupTextLiteral - [0..8)::8 - [<strong ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    Whitespace;[ ];
+            MarkupTagHelperElement - [8..11)::3 - p[StartTagAndEndTag] - ptaghelper
+                MarkupTagHelperStartTag - [8..11)::3
+                    MarkupTextLiteral - [8..11)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.stree.txt
index 605e599c38..257185be8c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper5.stree.txt
@@ -1,3 +1,13 @@
-Markup block - Gen<None> - 16 - (0:0,0)
-    Tag block - Gen<TagHelper> - 16 - (0:0,0) - strong - strongtaghelper
-        StartTagAndEndTag - <strong  ... </strong
+RazorDocument - [0..16)::16 - [<strong </strong]
+    MarkupBlock - [0..16)::16
+        MarkupTagHelperElement - [0..16)::16 - strong[StartTagAndEndTag] - strongtaghelper
+            MarkupTagHelperStartTag - [0..8)::8
+                MarkupTextLiteral - [0..8)::8 - [<strong ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    Whitespace;[ ];
+            MarkupTagHelperEndTag - [8..16)::8
+                MarkupTextLiteral - [8..16)::8 - [</strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.stree.txt
index fe4a84da78..eb31c82401 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper6.stree.txt
@@ -1,20 +1,25 @@
-Markup block - Gen<None> - 16 - (0:0,0)
-    Tag block - Gen<None> - 1 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-    Tag block - Gen<None> - 1 - (1:0,1)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-    Tag block - Gen<None> - 9 - (2:0,2)
-        Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<None> - 1 - (12:0,12)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-    Tag block - Gen<TagHelper> - 3 - (13:0,13) - p - ptaghelper
-        StartTagAndEndTag - <p>
+RazorDocument - [0..16)::16 - [<<</strong> <<p>]
+    MarkupBlock - [0..16)::16
+        MarkupTagBlock - [0..1)::1 - [<]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+        MarkupTagBlock - [1..2)::1 - [<]
+            MarkupTextLiteral - [1..2)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+        MarkupTagBlock - [2..11)::9 - [</strong>]
+            MarkupTextLiteral - [2..11)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
+        MarkupTextLiteral - [11..12)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagBlock - [12..13)::1 - [<]
+            MarkupTextLiteral - [12..13)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+        MarkupTagHelperElement - [13..16)::3 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [13..16)::3
+                MarkupTextLiteral - [13..16)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.stree.txt
index 7be3a33a3d..978081f9be 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper7.stree.txt
@@ -1,21 +1,26 @@
-Markup block - Gen<None> - 16 - (0:0,0)
-    Tag block - Gen<None> - 1 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-    Tag block - Gen<None> - 1 - (1:0,1)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-    Tag block - Gen<TagHelper> - 14 - (2:0,2) - strong - strongtaghelper
-        StartTagAndEndTag - <strong>
-        Markup span - Gen<Markup> - [> ] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:2
-            HtmlTokenType.CloseAngle;[>];
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 1 - (12:0,12)
-            Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                HtmlTokenType.OpenAngle;[<];
-        Tag block - Gen<None> - 2 - (13:0,13)
-            Markup span - Gen<Markup> - [<>] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..16)::16 - [<<<strong>> <<>>]
+    MarkupBlock - [0..16)::16
+        MarkupTagBlock - [0..1)::1 - [<]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+        MarkupTagBlock - [1..2)::1 - [<]
+            MarkupTextLiteral - [1..2)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+        MarkupTagHelperElement - [2..16)::14 - strong[StartTagAndEndTag] - strongtaghelper
+            MarkupTagHelperStartTag - [2..10)::8
+                MarkupTextLiteral - [2..10)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [10..12)::2 - [> ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+                Whitespace;[ ];
+            MarkupTagBlock - [12..13)::1 - [<]
+                MarkupTextLiteral - [12..13)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+            MarkupTagBlock - [13..15)::2 - [<>]
+                MarkupTextLiteral - [13..15)::2 - [<>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [15..16)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.stree.txt
index ed47467fab..3cf0bb56b1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelper8.stree.txt
@@ -1,13 +1,24 @@
-Markup block - Gen<None> - 25 - (0:0,0)
-    Tag block - Gen<None> - 4 - (0:0,0)
-        Markup span - Gen<Markup> - [<str] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[str];
-    Tag block - Gen<TagHelper> - 21 - (4:0,4) - strong - strongtaghelper
-        StartTagAndEndTag - <strong> ... </strong>
-        Tag block - Gen<None> - 4 - (12:0,12)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..25)::25 - [<str<strong></p></strong>]
+    MarkupBlock - [0..25)::25
+        MarkupTagBlock - [0..4)::4 - [<str]
+            MarkupTextLiteral - [0..4)::4 - [<str] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[str];
+        MarkupTagHelperElement - [4..25)::21 - strong[StartTagAndEndTag] - strongtaghelper
+            MarkupTagHelperStartTag - [4..12)::8
+                MarkupTextLiteral - [4..12)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagBlock - [12..16)::4 - [</p>]
+                MarkupTextLiteral - [12..16)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [16..25)::9
+                MarkupTextLiteral - [16..25)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.stree.txt
index 22d283205f..8d96abb6a4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes1.stree.txt
@@ -1,5 +1,17 @@
-Markup block - Gen<None> - 10 - (0:0,0)
-    Tag block - Gen<TagHelper> - 10 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class='
-        class - SingleQuotes
-            Markup span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:0
+RazorDocument - [0..10)::10 - [<p class=']
+    MarkupBlock - [0..10)::10
+        MarkupTagHelperElement - [0..10)::10 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..10)::10
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..10)::8 - class - SingleQuotes - Unbound - [ class=']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [10..10)::0
+                        MarkupTextLiteral - [10..10)::0 - []
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.stree.txt
index 3f32cddd30..a51c32805b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes10.stree.txt
@@ -1,6 +1,28 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<TagHelper> - 31 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class=btn" bar="foo"<strong>
-        class - NoQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..31)::31 - [<p class=btn" bar="foo"<strong>]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..31)::31
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class - DoubleQuotes - Unbound - [ class=btn]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..12)::3
+                        MarkupLiteralAttributeValue - [9..12)::3 - [btn]
+                            MarkupTextLiteral - [9..12)::3 - [btn] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                MarkupTextLiteral - [12..31)::19 - [" bar="foo"<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+                    Whitespace;[ ];
+                    Text;[bar];
+                    Equals;[=];
+                    DoubleQuote;["];
+                    Text;[foo];
+                    DoubleQuote;["];
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.stree.txt
index d321fb8907..b557217f0f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes11.stree.txt
@@ -1,14 +1,37 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<TagHelper> - 31 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class="btn bar="foo"
-        class - DoubleQuotes
-            Markup block - Gen<None> - 8 - (10:0,10)
-                Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                    HtmlTokenType.Text;[btn];
-                Markup span - Gen<Markup> - [ bar=] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:3
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[bar];
-                    HtmlTokenType.Equals;[=];
-        foo - Minimized
-        Tag block - Gen<TagHelper> - 8 - (23:0,23) - strong - strongtaghelper
-            StartTagAndEndTag - <strong>
+RazorDocument - [0..31)::31 - [<p class="btn bar="foo"<strong>]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..23)::23
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..19)::17 - class - DoubleQuotes - Unbound - [ class="btn bar="]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..18)::8
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                        MarkupLiteralAttributeValue - [13..18)::5 - [ bar=]
+                            MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [14..18)::4 - [bar=] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[bar];
+                                Equals;[=];
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMinimizedTagHelperAttribute - [19..23)::4 - foo" - Minimized - Unbound - [foo"]
+                    MarkupTextLiteral - [19..23)::4 - [foo"] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[foo];
+                        DoubleQuote;["];
+            MarkupTagHelperElement - [23..31)::8 - strong[StartTagAndEndTag] - strongtaghelper
+                MarkupTagHelperStartTag - [23..31)::8
+                    MarkupTextLiteral - [23..31)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.stree.txt
index a5b2272381..a1e7d384bc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes12.stree.txt
@@ -1,12 +1,39 @@
-Markup block - Gen<None> - 28 - (0:0,0)
-    Tag block - Gen<TagHelper> - 28 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class="btn bar="foo"> ... </p>
-        class - DoubleQuotes
-            Markup block - Gen<None> - 8 - (10:0,10)
-                Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                    HtmlTokenType.Text;[btn];
-                Markup span - Gen<Markup> - [ bar=] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:3
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[bar];
-                    HtmlTokenType.Equals;[=];
-        foo - Minimized
+RazorDocument - [0..28)::28 - [<p class="btn bar="foo"></p>]
+    MarkupBlock - [0..28)::28
+        MarkupTagHelperElement - [0..28)::28 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..24)::24
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..19)::17 - class - DoubleQuotes - Unbound - [ class="btn bar="]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..18)::8
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                        MarkupLiteralAttributeValue - [13..18)::5 - [ bar=]
+                            MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [14..18)::4 - [bar=] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[bar];
+                                Equals;[=];
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupMinimizedTagHelperAttribute - [19..23)::4 - foo" - Minimized - Unbound - [foo"]
+                    MarkupTextLiteral - [19..23)::4 - [foo"] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[foo];
+                        DoubleQuote;["];
+                MarkupTextLiteral - [23..24)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [24..28)::4
+                MarkupTextLiteral - [24..28)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.stree.txt
index d1b413266d..9fddb8a454 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.stree.txt
@@ -1,3 +1,32 @@
-Markup block - Gen<None> - 33 - (0:0,0)
-    Tag block - Gen<TagHelper> - 33 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p @DateTime.Now class="btn"> ... </p>
+RazorDocument - [0..33)::33 - [<p @DateTime.Now class="btn"></p>]
+    MarkupBlock - [0..33)::33
+        MarkupTagHelperElement - [0..33)::33 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..29)::29
+                MarkupTextLiteral - [0..3)::3 - [<p ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    Whitespace;[ ];
+                CSharpCodeBlock - [3..16)::13
+                    CSharpImplicitExpression - [3..16)::13
+                        CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [4..16)::12
+                            CSharpCodeBlock - [4..16)::12
+                                CSharpExpressionLiteral - [4..16)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                    Identifier;[DateTime];
+                                    Dot;[.];
+                                    Identifier;[Now];
+                MarkupTextLiteral - [16..29)::13 - [ class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    Text;[class];
+                    Equals;[=];
+                    DoubleQuote;["];
+                    Text;[btn];
+                    DoubleQuote;["];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [29..33)::4
+                MarkupTextLiteral - [29..33)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.stree.txt
index 1f20b3328e..8fd1e19d16 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.stree.txt
@@ -1,3 +1,30 @@
-Markup block - Gen<None> - 27 - (0:0,0)
-    Tag block - Gen<TagHelper> - 27 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p @DateTime.Now="btn"> ... </p>
+RazorDocument - [0..27)::27 - [<p @DateTime.Now="btn"></p>]
+    MarkupBlock - [0..27)::27
+        MarkupTagHelperElement - [0..27)::27 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..23)::23
+                MarkupTextLiteral - [0..3)::3 - [<p ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    Whitespace;[ ];
+                CSharpCodeBlock - [3..16)::13
+                    CSharpImplicitExpression - [3..16)::13
+                        CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [4..16)::12
+                            CSharpCodeBlock - [4..16)::12
+                                CSharpExpressionLiteral - [4..16)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                    Identifier;[DateTime];
+                                    Dot;[.];
+                                    Identifier;[Now];
+                MarkupTextLiteral - [16..23)::7 - [="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Equals;[=];
+                    DoubleQuote;["];
+                    Text;[btn];
+                    DoubleQuote;["];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [23..27)::4
+                MarkupTextLiteral - [23..27)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.cspans.txt
index cb302835f1..e109b92089 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (9:0,9 [1] ) (Accepts:None) - Parent: Expression block at (9:0,9 [13] )
-Code span at (10:0,10 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (9:0,9 [13] )
+Code span at (10:0,10 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (9:0,9 [13] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.stree.txt
index df5586227f..c5701d7caf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes15.stree.txt
@@ -1,13 +1,33 @@
-Markup block - Gen<None> - 28 - (0:0,0)
-    Tag block - Gen<TagHelper> - 28 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class=@DateTime.Now"></p>
-        class - DoubleQuotes
-            Markup block - Gen<None> - 13 - (9:0,9)
-                Markup block - Gen<DynAttr:@(9:0,9)> - 13 - (9:0,9)
-                    Expression block - Gen<Expr> - 13 - (9:0,9)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (10:0,10) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
+RazorDocument - [0..28)::28 - [<p class=@DateTime.Now"></p>]
+    MarkupBlock - [0..28)::28
+        MarkupTagHelperElement - [0..28)::28 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..28)::28
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..22)::20 - class - DoubleQuotes - Unbound - [ class=@DateTime.Now]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..22)::13
+                        MarkupDynamicAttributeValue - [9..22)::13 - [@DateTime.Now]
+                            GenericBlock - [9..22)::13
+                                CSharpCodeBlock - [9..22)::13
+                                    CSharpImplicitExpression - [9..22)::13
+                                        CSharpTransition - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [10..22)::12
+                                            CSharpCodeBlock - [10..22)::12
+                                                CSharpExpressionLiteral - [10..22)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                MarkupTextLiteral - [22..28)::6 - ["></p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+                    CloseAngle;[>];
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.stree.txt
index a8ad3db4e6..14dbf9afaf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes16.stree.txt
@@ -1,13 +1,25 @@
-Markup block - Gen<None> - 15 - (0:0,0)
-    Tag block - Gen<TagHelper> - 15 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class="@do {
-        class - DoubleQuotes
-            Markup block - Gen<None> - 5 - (10:0,10)
-                Markup block - Gen<DynAttr:@(10:0,10)> - 5 - (10:0,10)
-                    Statement block - Gen<None> - 5 - (10:0,10)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Stmt> - [do {] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:3
-                            CSharpTokenType.Keyword;[do];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.LeftBrace;[{];
+RazorDocument - [0..15)::15 - [<p class="@do {]
+    MarkupBlock - [0..15)::15
+        MarkupTagHelperElement - [0..15)::15 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..15)::15
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..15)::13 - class - DoubleQuotes - Unbound - [ class="@do {]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..15)::5
+                        MarkupDynamicAttributeValue - [10..15)::5 - [@do {]
+                            GenericBlock - [10..15)::5
+                                CSharpCodeBlock - [10..15)::5
+                                    CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [11..15)::4 - [do {] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[do];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.stree.txt
index 7f9905a76b..6647fcda09 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes17.stree.txt
@@ -1,14 +1,26 @@
-Markup block - Gen<None> - 21 - (0:0,0)
-    Tag block - Gen<TagHelper> - 21 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class="@do {"></p>
-        class - DoubleQuotes
-            Markup block - Gen<None> - 11 - (10:0,10)
-                Markup block - Gen<DynAttr:@(10:0,10)> - 11 - (10:0,10)
-                    Statement block - Gen<None> - 11 - (10:0,10)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Stmt> - [do {"></p>] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:4
-                            CSharpTokenType.Keyword;[do];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.LeftBrace;[{];
-                            CSharpTokenType.StringLiteral;["></p>];RZ1000(15:0,15 [1] )
+RazorDocument - [0..21)::21 - [<p class="@do {"></p>]
+    MarkupBlock - [0..21)::21
+        MarkupTagHelperElement - [0..21)::21 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..21)::21
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..21)::19 - class - DoubleQuotes - Unbound - [ class="@do {"></p>]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..21)::11
+                        MarkupDynamicAttributeValue - [10..21)::11 - [@do {"></p>]
+                            GenericBlock - [10..21)::11
+                                CSharpCodeBlock - [10..21)::11
+                                    CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [11..21)::10 - [do {"></p>] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[do];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
+                                        StringLiteral;["></p>];RZ1000(15:0,15 [1] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.stree.txt
index 1903f8d6b7..fee2f382b3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes18.stree.txt
@@ -1,3 +1,29 @@
-Markup block - Gen<None> - 33 - (0:0,0)
-    Tag block - Gen<TagHelper> - 33 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p @do { someattribute="btn"></p>
+RazorDocument - [0..33)::33 - [<p @do { someattribute="btn"></p>]
+    MarkupBlock - [0..33)::33
+        MarkupTagHelperElement - [0..33)::33 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..33)::33
+                MarkupTextLiteral - [0..3)::3 - [<p ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    Whitespace;[ ];
+                CSharpCodeBlock - [3..33)::30
+                    CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpStatementLiteral - [4..29)::25 - [do { someattribute="btn">] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                        Keyword;[do];
+                        Whitespace;[ ];
+                        LeftBrace;[{];
+                        Whitespace;[ ];
+                        Identifier;[someattribute];
+                        Assign;[=];
+                        StringLiteral;["btn"];
+                        GreaterThan;[>];
+                    MarkupBlock - [29..33)::4
+                        MarkupTagBlock - [29..33)::4 - [</p>]
+                            MarkupTextLiteral - [29..33)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                    CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                        Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.stree.txt
index 6a67ac58a3..a06593475e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes19.stree.txt
@@ -1,6 +1,41 @@
-Markup block - Gen<None> - 38 - (0:0,0)
-    Tag block - Gen<TagHelper> - 38 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class=some=thing attr="@value"> ... </p>
-        class - NoQuotes
-            Markup span - Gen<Markup> - [some] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-                HtmlTokenType.Text;[some];
+RazorDocument - [0..38)::38 - [<p class=some=thing attr="@value"></p>]
+    MarkupBlock - [0..38)::38
+        MarkupTagHelperElement - [0..38)::38 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..34)::34
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..13)::11 - class - DoubleQuotes - Unbound - [ class=some]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..13)::4
+                        MarkupLiteralAttributeValue - [9..13)::4 - [some]
+                            MarkupTextLiteral - [9..13)::4 - [some] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[some];
+                MarkupTextLiteral - [13..26)::13 - [=thing attr="] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Equals;[=];
+                    Text;[thing];
+                    Whitespace;[ ];
+                    Text;[attr];
+                    Equals;[=];
+                    DoubleQuote;["];
+                CSharpCodeBlock - [26..32)::6
+                    CSharpImplicitExpression - [26..32)::6
+                        CSharpTransition - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [27..32)::5
+                            CSharpCodeBlock - [27..32)::5
+                                CSharpExpressionLiteral - [27..32)::5 - [value] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                    Identifier;[value];
+                MarkupTextLiteral - [32..34)::2 - [">] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [34..38)::4
+                MarkupTextLiteral - [34..38)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.stree.txt
index a416d8da2e..74ca653cef 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes2.stree.txt
@@ -1,6 +1,27 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Tag block - Gen<TagHelper> - 24 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p bar="false"" <strong>
-        bar - DoubleQuotes
-            Markup span - Gen<Markup> - [false] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:1
-                HtmlTokenType.Text;[false];
+RazorDocument - [0..24)::24 - [<p bar="false"" <strong>]
+    MarkupBlock - [0..24)::24
+        MarkupTagHelperElement - [0..24)::24 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..24)::24
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - bar - DoubleQuotes - Unbound - [ bar="false"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..6)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bar];
+                    Equals;[=];
+                    MarkupTextLiteral - [7..8)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [8..13)::5
+                        MarkupLiteralAttributeValue - [8..13)::5 - [false]
+                            MarkupTextLiteral - [8..13)::5 - [false] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[false];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [14..24)::10 - [" <strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+                    Whitespace;[ ];
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.stree.txt
index 4ec71067a0..dc36bfdead 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes3.stree.txt
@@ -1,12 +1,26 @@
-Markup block - Gen<None> - 23 - (0:0,0)
-    Tag block - Gen<TagHelper> - 23 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p bar='false  <strong>
-        bar - SingleQuotes
-            Markup block - Gen<None> - 15 - (8:0,8)
-                Markup span - Gen<Markup> - [false] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:1
-                    HtmlTokenType.Text;[false];
-                Markup span - Gen<Markup> - [  <strong>] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[  ];
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[strong];
-                    HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..23)::23 - [<p bar='false  <strong>]
+    MarkupBlock - [0..23)::23
+        MarkupTagHelperElement - [0..23)::23 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..23)::23
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..23)::21 - bar - SingleQuotes - Unbound - [ bar='false  <strong>]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..6)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bar];
+                    Equals;[=];
+                    MarkupTextLiteral - [7..8)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [8..23)::15
+                        MarkupLiteralAttributeValue - [8..13)::5 - [false]
+                            MarkupTextLiteral - [8..13)::5 - [false] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[false];
+                        MarkupLiteralAttributeValue - [13..23)::10 - [  <strong>]
+                            MarkupTextLiteral - [13..15)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[  ];
+                            MarkupTextLiteral - [15..23)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                OpenAngle;[<];
+                                Text;[strong];
+                                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.stree.txt
index 94152358d9..61bff8f7af 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes4.stree.txt
@@ -1,11 +1,27 @@
-Markup block - Gen<None> - 23 - (0:0,0)
-    Tag block - Gen<TagHelper> - 23 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p bar='false  <strong'
-        bar - SingleQuotes
-            Markup block - Gen<None> - 14 - (8:0,8)
-                Markup span - Gen<Markup> - [false] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:1
-                    HtmlTokenType.Text;[false];
-                Markup span - Gen<Markup> - [  <strong] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:3
-                    HtmlTokenType.WhiteSpace;[  ];
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[strong];
+RazorDocument - [0..23)::23 - [<p bar='false  <strong']
+    MarkupBlock - [0..23)::23
+        MarkupTagHelperElement - [0..23)::23 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..23)::23
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..23)::21 - bar - SingleQuotes - Unbound - [ bar='false  <strong']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..6)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bar];
+                    Equals;[=];
+                    MarkupTextLiteral - [7..8)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [8..22)::14
+                        MarkupLiteralAttributeValue - [8..13)::5 - [false]
+                            MarkupTextLiteral - [8..13)::5 - [false] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[false];
+                        MarkupLiteralAttributeValue - [13..22)::9 - [  <strong]
+                            MarkupTextLiteral - [13..15)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[  ];
+                            MarkupTextLiteral - [15..22)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                OpenAngle;[<];
+                                Text;[strong];
+                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.stree.txt
index d66de796e0..47350779b4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes5.stree.txt
@@ -1,6 +1,19 @@
-Markup block - Gen<None> - 13 - (0:0,0)
-    Tag block - Gen<TagHelper> - 13 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p bar=false'
-        bar - NoQuotes
-            Markup span - Gen<Markup> - [false] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:1
-                HtmlTokenType.Text;[false];
+RazorDocument - [0..13)::13 - [<p bar=false']
+    MarkupBlock - [0..13)::13
+        MarkupTagHelperElement - [0..13)::13 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..13)::13
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - bar - DoubleQuotes - Unbound - [ bar=false]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..6)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bar];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [7..12)::5
+                        MarkupLiteralAttributeValue - [7..12)::5 - [false]
+                            MarkupTextLiteral - [7..12)::5 - [false] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[false];
+                MarkupTextLiteral - [12..13)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.stree.txt
index 17bca16918..3faff3a989 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes6.stree.txt
@@ -1,7 +1,20 @@
-Markup block - Gen<None> - 14 - (0:0,0)
-    Tag block - Gen<TagHelper> - 14 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p bar="false'
-        bar - DoubleQuotes
-            Markup span - Gen<Markup> - [false'] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:2
-                HtmlTokenType.Text;[false];
-                HtmlTokenType.SingleQuote;['];
+RazorDocument - [0..14)::14 - [<p bar="false']
+    MarkupBlock - [0..14)::14
+        MarkupTagHelperElement - [0..14)::14 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..14)::14
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - bar - DoubleQuotes - Unbound - [ bar="false']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..6)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bar];
+                    Equals;[=];
+                    MarkupTextLiteral - [7..8)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [8..14)::6
+                        MarkupLiteralAttributeValue - [8..14)::6 - [false']
+                            MarkupTextLiteral - [8..14)::6 - [false'] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[false];
+                                SingleQuote;['];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.stree.txt
index a5e90eeec5..6b63b10230 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes7.stree.txt
@@ -1,15 +1,29 @@
-Markup block - Gen<None> - 20 - (0:0,0)
-    Tag block - Gen<TagHelper> - 20 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p bar="false' ></p>
-        bar - DoubleQuotes
-            Markup block - Gen<None> - 12 - (8:0,8)
-                Markup span - Gen<Markup> - [false'] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:2
-                    HtmlTokenType.Text;[false];
-                    HtmlTokenType.SingleQuote;['];
-                Markup span - Gen<Markup> - [ ></p>] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:6
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.CloseAngle;[>];
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..20)::20 - [<p bar="false' ></p>]
+    MarkupBlock - [0..20)::20
+        MarkupTagHelperElement - [0..20)::20 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..20)::20
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..20)::18 - bar - DoubleQuotes - Unbound - [ bar="false' ></p>]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..6)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bar];
+                    Equals;[=];
+                    MarkupTextLiteral - [7..8)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [8..20)::12
+                        MarkupLiteralAttributeValue - [8..14)::6 - [false']
+                            MarkupTextLiteral - [8..14)::6 - [false'] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[false];
+                                SingleQuote;['];
+                        MarkupLiteralAttributeValue - [14..20)::6 - [ ></p>]
+                            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [15..20)::5 - [></p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                CloseAngle;[>];
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.stree.txt
index 7fea4843e0..6fcfe9a119 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes8.stree.txt
@@ -1,7 +1,23 @@
-Markup block - Gen<None> - 18 - (0:0,0)
-    Tag block - Gen<TagHelper> - 18 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p foo bar
-        foo - Minimized
-        bar - Minimized
-        Tag block - Gen<TagHelper> - 8 - (10:0,10) - strong - strongtaghelper
-            StartTagAndEndTag - <strong>
+RazorDocument - [0..18)::18 - [<p foo bar<strong>]
+    MarkupBlock - [0..18)::18
+        MarkupTagHelperElement - [0..18)::18 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..10)::10
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..6)::4 - foo - Minimized - Unbound - [ foo]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..6)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[foo];
+                MarkupMinimizedTagHelperAttribute - [6..10)::4 - bar - Minimized - Unbound - [ bar]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..10)::3 - [bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bar];
+            MarkupTagHelperElement - [10..18)::8 - strong[StartTagAndEndTag] - strongtaghelper
+                MarkupTagHelperStartTag - [10..18)::8
+                    MarkupTextLiteral - [10..18)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.stree.txt
index c95d919901..7f50d841b6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes9.stree.txt
@@ -1,6 +1,24 @@
-Markup block - Gen<None> - 25 - (0:0,0)
-    Tag block - Gen<TagHelper> - 25 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class=btn" bar<strong>
-        class - NoQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..25)::25 - [<p class=btn" bar<strong>]
+    MarkupBlock - [0..25)::25
+        MarkupTagHelperElement - [0..25)::25 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..25)::25
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class - DoubleQuotes - Unbound - [ class=btn]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..12)::3
+                        MarkupLiteralAttributeValue - [9..12)::3 - [btn]
+                            MarkupTextLiteral - [9..12)::3 - [btn] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                MarkupTextLiteral - [12..25)::13 - [" bar<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+                    Whitespace;[ ];
+                    Text;[bar];
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.stree.txt
index d20c1e4669..515061b10a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes1.stree.txt
@@ -1,6 +1,24 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Tag block - Gen<TagHelper> - 19 - (0:0,0) - person - PersonTagHelper
-        SelfClosing - <person age="12" />
-        age - DoubleQuotes
-            Code span - Gen<Expr> - [12] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (13:0,13) - Tokens:1
-                HtmlTokenType.Text;[12];
+RazorDocument - [0..19)::19 - [<person age="12" />]
+    MarkupBlock - [0..19)::19
+        MarkupTagHelperElement - [0..19)::19 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..19)::19
+                MarkupTextLiteral - [0..7)::7 - [<person] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[person];
+                MarkupTagHelperAttribute - [7..16)::9 - age - DoubleQuotes - Bound - [ age="12"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[age];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [13..15)::2
+                        CSharpExpressionLiteral - [13..15)::2 - [12] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[12];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [16..19)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.stree.txt
index f86beabd36..08d34db896 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes10.stree.txt
@@ -1,18 +1,55 @@
-Markup block - Gen<None> - 73 - (0:0,0)
-    Tag block - Gen<TagHelper> - 73 - (0:0,0) - person - PersonTagHelper
-        SelfClosing - <person age="12" birthday="DateTime.Now" name="@@BoundStringAttribute" />
-        age - DoubleQuotes
-            Code span - Gen<Expr> - [12] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (13:0,13) - Tokens:1
-                HtmlTokenType.Text;[12];
-        birthday - DoubleQuotes
-            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (27:0,27) - Tokens:1
-                HtmlTokenType.Text;[DateTime.Now];
-        name - DoubleQuotes
-            Markup block - Gen<None> - 22 - (47:0,47)
-                Markup block - Gen<None> - 2 - (47:0,47)
-                    Markup span - Gen<Markup> - [@] - SpanEditHandler;Accepts:None - (47:0,47) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (48:0,48) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                Markup span - Gen<Markup> - [BoundStringAttribute] - SpanEditHandler;Accepts:Any - (49:0,49) - Tokens:1
-                    HtmlTokenType.Text;[BoundStringAttribute];
+RazorDocument - [0..73)::73 - [<person age="12" birthday="DateTime.Now" name="@@BoundStringAttribute" />]
+    MarkupBlock - [0..73)::73
+        MarkupTagHelperElement - [0..73)::73 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..73)::73
+                MarkupTextLiteral - [0..7)::7 - [<person] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[person];
+                MarkupTagHelperAttribute - [7..16)::9 - age - DoubleQuotes - Bound - [ age="12"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[age];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [13..15)::2
+                        CSharpExpressionLiteral - [13..15)::2 - [12] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[12];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [16..40)::24 - birthday - DoubleQuotes - Bound - [ birthday="DateTime.Now"]
+                    MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [17..25)::8 - [birthday] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[birthday];
+                    Equals;[=];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [27..39)::12
+                        CSharpExpressionLiteral - [27..39)::12 - [DateTime.Now] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[DateTime.Now];
+                    MarkupTextLiteral - [39..40)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [40..70)::30 - name - DoubleQuotes - Bound - [ name="@@BoundStringAttribute"]
+                    MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [41..45)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTextLiteral - [46..47)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [47..69)::22
+                        MarkupBlock - [47..49)::2
+                            MarkupTextLiteral - [47..48)::1 - [@] - Gen<LitAttr:@(47:0,47)> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [48..49)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                        MarkupTextLiteral - [49..69)::20 - [BoundStringAttribute] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[BoundStringAttribute];
+                    MarkupTextLiteral - [69..70)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [70..73)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.cspans.txt
index e92aa9ad94..7d194474a8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.cspans.txt
@@ -9,4 +9,4 @@ Code span at (34:0,34 [12] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (
 Markup span at (54:0,54 [5] ) (Accepts:Any) - Parent: Markup block at (54:0,54 [19] )
 Markup span at (59:0,59 [1] ) (Accepts:Any) - Parent: Markup block at (59:0,59 [14] )
 Transition span at (60:0,60 [1] ) (Accepts:None) - Parent: Expression block at (60:0,60 [13] )
-Code span at (61:0,61 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (60:0,60 [13] )
+Code span at (61:0,61 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (60:0,60 [13] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.stree.txt
index 11338b3558..704d84f6d5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes11.stree.txt
@@ -1,41 +1,85 @@
-Markup block - Gen<None> - 77 - (0:0,0)
-    Tag block - Gen<TagHelper> - 77 - (0:0,0) - person - PersonTagHelper
-        SelfClosing - <person age="@@@(11+1)" birthday="DateTime.Now" name="Time: @DateTime.Now" />
-        age - DoubleQuotes
-            Markup block - Gen<None> - 9 - (13:0,13)
-                Markup block - Gen<None> - 2 - (13:0,13)
-                    Code span - Gen<Expr> - [@] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (13:0,13) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                    Code span - Gen<None> - [@] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (14:0,14) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                Markup block - Gen<None> - 7 - (15:0,15)
-                    Code span - Gen<Expr> - [] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (15:0,15) - Tokens:1
-                        HtmlTokenType.Unknown;[];
-                    Expression block - Gen<Expr> - 7 - (15:0,15)
-                        Code span - Gen<Expr> - [@] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (15:0,15) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [(] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (16:0,16) - Tokens:1
-                            CSharpTokenType.LeftParenthesis;[(];
-                        Code span - Gen<Expr> - [11+1] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (17:0,17) - Tokens:3
-                            CSharpTokenType.IntegerLiteral;[11];
-                            CSharpTokenType.Plus;[+];
-                            CSharpTokenType.IntegerLiteral;[1];
-                        Code span - Gen<Expr> - [)] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (21:0,21) - Tokens:1
-                            CSharpTokenType.RightParenthesis;[)];
-        birthday - DoubleQuotes
-            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (34:0,34) - Tokens:1
-                HtmlTokenType.Text;[DateTime.Now];
-        name - DoubleQuotes
-            Markup block - Gen<None> - 19 - (54:0,54)
-                Markup span - Gen<Markup> - [Time:] - SpanEditHandler;Accepts:Any - (54:0,54) - Tokens:1
-                    HtmlTokenType.Text;[Time:];
-                Markup block - Gen<None> - 14 - (59:0,59)
-                    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (59:0,59) - Tokens:1
-                        HtmlTokenType.WhiteSpace;[ ];
-                    Expression block - Gen<Expr> - 13 - (60:0,60)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (60:0,60) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (61:0,61) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
+RazorDocument - [0..77)::77 - [<person age="@@@(11+1)" birthday="DateTime.Now" name="Time: @DateTime.Now" />]
+    MarkupBlock - [0..77)::77
+        MarkupTagHelperElement - [0..77)::77 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..77)::77
+                MarkupTextLiteral - [0..7)::7 - [<person] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[person];
+                MarkupTagHelperAttribute - [7..23)::16 - age - DoubleQuotes - Bound - [ age="@@@(11+1)"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[age];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [13..22)::9
+                        MarkupBlock - [13..15)::2
+                            CSharpExpressionLiteral - [13..14)::1 - [@] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Transition;[@];
+                            CSharpEphemeralTextLiteral - [14..15)::1 - [@] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Transition;[@];
+                        MarkupBlock - [15..22)::7
+                            CSharpExpressionLiteral - [15..15)::0 - [] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Marker;[];
+                            CSharpCodeBlock - [15..22)::7
+                                CSharpImplicitExpression - [15..22)::7
+                                    CSharpTransition - [15..15)::0
+                                        Transition;[<Missing>];
+                                    CSharpImplicitExpressionBody - [15..22)::7
+                                        CSharpCodeBlock - [15..22)::7
+                                            CSharpExpressionLiteral - [15..16)::1 - [@] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Transition;[@];
+                                            CSharpExpressionLiteral - [16..17)::1 - [(] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                LeftParenthesis;[(];
+                                            CSharpExpressionLiteral - [17..21)::4 - [11+1] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                IntegerLiteral;[11];
+                                                Plus;[+];
+                                                IntegerLiteral;[1];
+                                            CSharpExpressionLiteral - [21..22)::1 - [)] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                RightParenthesis;[)];
+                    MarkupTextLiteral - [22..23)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [23..47)::24 - birthday - DoubleQuotes - Bound - [ birthday="DateTime.Now"]
+                    MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [24..32)::8 - [birthday] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[birthday];
+                    Equals;[=];
+                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [34..46)::12
+                        CSharpExpressionLiteral - [34..46)::12 - [DateTime.Now] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[DateTime.Now];
+                    MarkupTextLiteral - [46..47)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [47..74)::27 - name - DoubleQuotes - Bound - [ name="Time: @DateTime.Now"]
+                    MarkupTextLiteral - [47..48)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [48..52)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTextLiteral - [53..54)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [54..73)::19
+                        MarkupTextLiteral - [54..59)::5 - [Time:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Time:];
+                        MarkupBlock - [59..73)::14
+                            MarkupTextLiteral - [59..60)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [60..73)::13
+                                CSharpImplicitExpression - [60..73)::13
+                                    CSharpTransition - [60..61)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [61..73)::12
+                                        CSharpCodeBlock - [61..73)::12
+                                            CSharpExpressionLiteral - [61..73)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                    MarkupTextLiteral - [73..74)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [74..77)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.stree.txt
index 0614945953..6e8c7c180d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes2.stree.txt
@@ -1,6 +1,24 @@
-Markup block - Gen<None> - 34 - (0:0,0)
-    Tag block - Gen<TagHelper> - 34 - (0:0,0) - person - PersonTagHelper
-        SelfClosing - <person birthday="DateTime.Now" />
-        birthday - DoubleQuotes
-            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (18:0,18) - Tokens:1
-                HtmlTokenType.Text;[DateTime.Now];
+RazorDocument - [0..34)::34 - [<person birthday="DateTime.Now" />]
+    MarkupBlock - [0..34)::34
+        MarkupTagHelperElement - [0..34)::34 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..34)::34
+                MarkupTextLiteral - [0..7)::7 - [<person] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[person];
+                MarkupTagHelperAttribute - [7..31)::24 - birthday - DoubleQuotes - Bound - [ birthday="DateTime.Now"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [birthday] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[birthday];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..30)::12
+                        CSharpExpressionLiteral - [18..30)::12 - [DateTime.Now] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[DateTime.Now];
+                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [31..34)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.stree.txt
index 0b8817819d..e113316a46 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes3.stree.txt
@@ -1,15 +1,35 @@
-Markup block - Gen<None> - 35 - (0:0,0)
-    Tag block - Gen<TagHelper> - 35 - (0:0,0) - person - PersonTagHelper
-        SelfClosing - <person age="@DateTime.Now.Year" />
-        age - DoubleQuotes
-            Markup block - Gen<None> - 18 - (13:0,13)
-                Markup block - Gen<None> - 18 - (13:0,13)
-                    Expression block - Gen<Expr> - 18 - (13:0,13)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now.Year] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (14:0,14) - Tokens:5
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Year];
+RazorDocument - [0..35)::35 - [<person age="@DateTime.Now.Year" />]
+    MarkupBlock - [0..35)::35
+        MarkupTagHelperElement - [0..35)::35 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..35)::35
+                MarkupTextLiteral - [0..7)::7 - [<person] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[person];
+                MarkupTagHelperAttribute - [7..32)::25 - age - DoubleQuotes - Bound - [ age="@DateTime.Now.Year"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[age];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [13..31)::18
+                        MarkupBlock - [13..31)::18
+                            CSharpCodeBlock - [13..31)::18
+                                CSharpImplicitExpression - [13..31)::18
+                                    CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [14..31)::17
+                                        CSharpCodeBlock - [14..31)::17
+                                            CSharpExpressionLiteral - [14..31)::17 - [DateTime.Now.Year] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                                                Dot;[.];
+                                                Identifier;[Year];
+                    MarkupTextLiteral - [31..32)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [32..35)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.stree.txt
index c7ac7e9429..b961b93a68 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes4.stree.txt
@@ -1,17 +1,39 @@
-Markup block - Gen<None> - 36 - (0:0,0)
-    Tag block - Gen<TagHelper> - 36 - (0:0,0) - person - PersonTagHelper
-        SelfClosing - <person age=" @DateTime.Now.Year" />
-        age - DoubleQuotes
-            Markup block - Gen<None> - 19 - (13:0,13)
-                Markup block - Gen<None> - 19 - (13:0,13)
-                    Code span - Gen<Expr> - [ ] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (13:0,13) - Tokens:1
-                        HtmlTokenType.WhiteSpace;[ ];
-                    Expression block - Gen<Expr> - 18 - (14:0,14)
-                        Code span - Gen<Expr> - [@] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (14:0,14) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now.Year] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (15:0,15) - Tokens:5
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Year];
+RazorDocument - [0..36)::36 - [<person age=" @DateTime.Now.Year" />]
+    MarkupBlock - [0..36)::36
+        MarkupTagHelperElement - [0..36)::36 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..36)::36
+                MarkupTextLiteral - [0..7)::7 - [<person] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[person];
+                MarkupTagHelperAttribute - [7..33)::26 - age - DoubleQuotes - Bound - [ age=" @DateTime.Now.Year"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[age];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [13..32)::19
+                        MarkupBlock - [13..32)::19
+                            CSharpExpressionLiteral - [13..14)::1 - [ ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [14..32)::18
+                                CSharpImplicitExpression - [14..32)::18
+                                    CSharpTransition - [14..14)::0
+                                        Transition;[<Missing>];
+                                    CSharpImplicitExpressionBody - [14..32)::18
+                                        CSharpCodeBlock - [14..32)::18
+                                            CSharpExpressionLiteral - [14..15)::1 - [@] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Transition;[@];
+                                            CSharpExpressionLiteral - [15..32)::17 - [DateTime.Now.Year] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                                                Dot;[.];
+                                                Identifier;[Year];
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [33..36)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.stree.txt
index 64552a5865..b117ddf3b1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes5.stree.txt
@@ -1,6 +1,24 @@
-Markup block - Gen<None> - 22 - (0:0,0)
-    Tag block - Gen<TagHelper> - 22 - (0:0,0) - person - PersonTagHelper
-        SelfClosing - <person name="John" />
-        name - DoubleQuotes
-            Markup span - Gen<Markup> - [John] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.Text;[John];
+RazorDocument - [0..22)::22 - [<person name="John" />]
+    MarkupBlock - [0..22)::22
+        MarkupTagHelperElement - [0..22)::22 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..22)::22
+                MarkupTextLiteral - [0..7)::7 - [<person] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[person];
+                MarkupTagHelperAttribute - [7..19)::12 - name - DoubleQuotes - Bound - [ name="John"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..12)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [14..18)::4
+                        MarkupTextLiteral - [14..18)::4 - [John] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[John];
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [19..22)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.cspans.txt
index 1ef97bb729..fff411360a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.cspans.txt
@@ -1,4 +1,4 @@
 Markup span at (14:0,14 [5] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [19] )
 Markup span at (19:0,19 [1] ) (Accepts:Any) - Parent: Markup block at (19:0,19 [14] )
 Transition span at (20:0,20 [1] ) (Accepts:None) - Parent: Expression block at (20:0,20 [13] )
-Code span at (21:0,21 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (20:0,20 [13] )
+Code span at (21:0,21 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (20:0,20 [13] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.stree.txt
index 23604433e8..de5aec1554 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes6.stree.txt
@@ -1,17 +1,37 @@
-Markup block - Gen<None> - 37 - (0:0,0)
-    Tag block - Gen<TagHelper> - 37 - (0:0,0) - person - PersonTagHelper
-        SelfClosing - <person name="Time: @DateTime.Now" />
-        name - DoubleQuotes
-            Markup block - Gen<None> - 19 - (14:0,14)
-                Markup span - Gen<Markup> - [Time:] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                    HtmlTokenType.Text;[Time:];
-                Markup block - Gen<None> - 14 - (19:0,19)
-                    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:1
-                        HtmlTokenType.WhiteSpace;[ ];
-                    Expression block - Gen<Expr> - 13 - (20:0,20)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (21:0,21) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
+RazorDocument - [0..37)::37 - [<person name="Time: @DateTime.Now" />]
+    MarkupBlock - [0..37)::37
+        MarkupTagHelperElement - [0..37)::37 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..37)::37
+                MarkupTextLiteral - [0..7)::7 - [<person] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[person];
+                MarkupTagHelperAttribute - [7..34)::27 - name - DoubleQuotes - Bound - [ name="Time: @DateTime.Now"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..12)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [14..33)::19
+                        MarkupTextLiteral - [14..19)::5 - [Time:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Time:];
+                        MarkupBlock - [19..33)::14
+                            MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [20..33)::13
+                                CSharpImplicitExpression - [20..33)::13
+                                    CSharpTransition - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [21..33)::12
+                                        CSharpCodeBlock - [21..33)::12
+                                            CSharpExpressionLiteral - [21..33)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [34..37)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.stree.txt
index 30ee2647fe..da33e60293 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes7.stree.txt
@@ -1,61 +1,101 @@
-Markup block - Gen<None> - 88 - (0:0,0)
-    Tag block - Gen<TagHelper> - 88 - (0:0,0) - person - PersonTagHelper
-        SelfClosing - <person age="1 + @value + 2" birthday='(bool)@Bag["val"] ? @@DateTime : @DateTime.Now'/>
-        age - DoubleQuotes
-            Markup block - Gen<None> - 14 - (13:0,13)
-                Code span - Gen<Expr> - [1] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (13:0,13) - Tokens:1
-                    HtmlTokenType.Text;[1];
-                Code span - Gen<Expr> - [ +] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (14:0,14) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[+];
-                Markup block - Gen<None> - 7 - (16:0,16)
-                    Code span - Gen<Expr> - [ ] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (16:0,16) - Tokens:1
-                        HtmlTokenType.WhiteSpace;[ ];
-                    Expression block - Gen<Expr> - 6 - (17:0,17)
-                        Code span - Gen<Expr> - [@] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (17:0,17) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [value] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (18:0,18) - Tokens:1
-                            CSharpTokenType.Identifier;[value];
-                Code span - Gen<Expr> - [ +] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (23:0,23) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[+];
-                Code span - Gen<Expr> - [ 2] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (25:0,25) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[2];
-        birthday - SingleQuotes
-            Markup block - Gen<None> - 46 - (39:0,39)
-                Code span - Gen<Expr> - [(bool)] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (39:0,39) - Tokens:1
-                    HtmlTokenType.Text;[(bool)];
-                Markup block - Gen<None> - 11 - (45:0,45)
-                    Expression block - Gen<Expr> - 11 - (45:0,45)
-                        Code span - Gen<Expr> - [@] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (45:0,45) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [Bag["val"]] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (46:0,46) - Tokens:4
-                            CSharpTokenType.Identifier;[Bag];
-                            CSharpTokenType.LeftBracket;[[];
-                            CSharpTokenType.StringLiteral;["val"];
-                            CSharpTokenType.RightBracket;[]];
-                Code span - Gen<Expr> - [ ?] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (56:0,56) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.QuestionMark;[?];
-                Markup block - Gen<None> - 3 - (58:0,58)
-                    Code span - Gen<Expr> - [ @] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (58:0,58) - Tokens:2
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Transition;[@];
-                    Code span - Gen<None> - [@] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (60:0,60) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                Code span - Gen<Expr> - [DateTime] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (61:0,61) - Tokens:1
-                    HtmlTokenType.Text;[DateTime];
-                Code span - Gen<Expr> - [ :] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (69:0,69) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[:];
-                Markup block - Gen<None> - 14 - (71:0,71)
-                    Code span - Gen<Expr> - [ ] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (71:0,71) - Tokens:1
-                        HtmlTokenType.WhiteSpace;[ ];
-                    Expression block - Gen<Expr> - 13 - (72:0,72)
-                        Code span - Gen<Expr> - [@] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (72:0,72) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (73:0,73) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
+RazorDocument - [0..88)::88 - [<person age="1 + @value + 2" birthday='(bool)@Bag["val"] ? @@DateTime : @DateTime.Now'/>]
+    MarkupBlock - [0..88)::88
+        MarkupTagHelperElement - [0..88)::88 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..88)::88
+                MarkupTextLiteral - [0..7)::7 - [<person] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[person];
+                MarkupTagHelperAttribute - [7..28)::21 - age - DoubleQuotes - Bound - [ age="1 + @value + 2"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[age];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [13..27)::14
+                        CSharpExpressionLiteral - [13..14)::1 - [1] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[1];
+                        CSharpExpressionLiteral - [14..16)::2 - [ +] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[ ];
+                            Text;[+];
+                        MarkupBlock - [16..23)::7
+                            CSharpExpressionLiteral - [16..17)::1 - [ ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [17..23)::6
+                                CSharpImplicitExpression - [17..23)::6
+                                    CSharpTransition - [17..17)::0
+                                        Transition;[<Missing>];
+                                    CSharpImplicitExpressionBody - [17..23)::6
+                                        CSharpCodeBlock - [17..23)::6
+                                            CSharpExpressionLiteral - [17..18)::1 - [@] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Transition;[@];
+                                            CSharpExpressionLiteral - [18..23)::5 - [value] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Identifier;[value];
+                        CSharpExpressionLiteral - [23..25)::2 - [ +] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[ ];
+                            Text;[+];
+                        CSharpExpressionLiteral - [25..27)::2 - [ 2] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[ ];
+                            Text;[2];
+                    MarkupTextLiteral - [27..28)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [28..86)::58 - birthday - SingleQuotes - Bound - [ birthday='(bool)@Bag["val"] ? @@DateTime : @DateTime.Now']
+                    MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [29..37)::8 - [birthday] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[birthday];
+                    Equals;[=];
+                    MarkupTextLiteral - [38..39)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [39..85)::46
+                        CSharpExpressionLiteral - [39..45)::6 - [(bool)] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[(bool)];
+                        MarkupBlock - [45..56)::11
+                            CSharpCodeBlock - [45..56)::11
+                                CSharpImplicitExpression - [45..56)::11
+                                    CSharpTransition - [45..45)::0
+                                        Transition;[<Missing>];
+                                    CSharpImplicitExpressionBody - [45..56)::11
+                                        CSharpCodeBlock - [45..56)::11
+                                            CSharpExpressionLiteral - [45..46)::1 - [@] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Transition;[@];
+                                            CSharpExpressionLiteral - [46..56)::10 - [Bag["val"]] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Identifier;[Bag];
+                                                LeftBracket;[[];
+                                                StringLiteral;["val"];
+                                                RightBracket;[]];
+                        CSharpExpressionLiteral - [56..58)::2 - [ ?] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[ ];
+                            QuestionMark;[?];
+                        MarkupBlock - [58..61)::3
+                            CSharpExpressionLiteral - [58..60)::2 - [ @] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Whitespace;[ ];
+                                Transition;[@];
+                            CSharpEphemeralTextLiteral - [60..61)::1 - [@] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Transition;[@];
+                        CSharpExpressionLiteral - [61..69)::8 - [DateTime] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[DateTime];
+                        CSharpExpressionLiteral - [69..71)::2 - [ :] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Whitespace;[ ];
+                            Text;[:];
+                        MarkupBlock - [71..85)::14
+                            CSharpExpressionLiteral - [71..72)::1 - [ ] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [72..85)::13
+                                CSharpImplicitExpression - [72..85)::13
+                                    CSharpTransition - [72..72)::0
+                                        Transition;[<Missing>];
+                                    CSharpImplicitExpressionBody - [72..85)::13
+                                        CSharpCodeBlock - [72..85)::13
+                                            CSharpExpressionLiteral - [72..73)::1 - [@] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Transition;[@];
+                                            CSharpExpressionLiteral - [73..85)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                    MarkupTextLiteral - [85..86)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [86..88)::2 - [/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.cspans.txt
index 1b96328a9c..14eb11f1cf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.cspans.txt
@@ -3,4 +3,4 @@ Code span at (27:0,27 [12] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (
 Markup span at (47:0,47 [5] ) (Accepts:Any) - Parent: Markup block at (47:0,47 [19] )
 Markup span at (52:0,52 [1] ) (Accepts:Any) - Parent: Markup block at (52:0,52 [14] )
 Transition span at (53:0,53 [1] ) (Accepts:None) - Parent: Expression block at (53:0,53 [13] )
-Code span at (54:0,54 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (53:0,53 [13] )
+Code span at (54:0,54 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (53:0,53 [13] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.stree.txt
index 8460103772..62779fb1dc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes8.stree.txt
@@ -1,23 +1,63 @@
-Markup block - Gen<None> - 70 - (0:0,0)
-    Tag block - Gen<TagHelper> - 70 - (0:0,0) - person - PersonTagHelper
-        SelfClosing - <person age="12" birthday="DateTime.Now" name="Time: @DateTime.Now" />
-        age - DoubleQuotes
-            Code span - Gen<Expr> - [12] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (13:0,13) - Tokens:1
-                HtmlTokenType.Text;[12];
-        birthday - DoubleQuotes
-            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (27:0,27) - Tokens:1
-                HtmlTokenType.Text;[DateTime.Now];
-        name - DoubleQuotes
-            Markup block - Gen<None> - 19 - (47:0,47)
-                Markup span - Gen<Markup> - [Time:] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:1
-                    HtmlTokenType.Text;[Time:];
-                Markup block - Gen<None> - 14 - (52:0,52)
-                    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (52:0,52) - Tokens:1
-                        HtmlTokenType.WhiteSpace;[ ];
-                    Expression block - Gen<Expr> - 13 - (53:0,53)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (53:0,53) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (54:0,54) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
+RazorDocument - [0..70)::70 - [<person age="12" birthday="DateTime.Now" name="Time: @DateTime.Now" />]
+    MarkupBlock - [0..70)::70
+        MarkupTagHelperElement - [0..70)::70 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..70)::70
+                MarkupTextLiteral - [0..7)::7 - [<person] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[person];
+                MarkupTagHelperAttribute - [7..16)::9 - age - DoubleQuotes - Bound - [ age="12"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[age];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [13..15)::2
+                        CSharpExpressionLiteral - [13..15)::2 - [12] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[12];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [16..40)::24 - birthday - DoubleQuotes - Bound - [ birthday="DateTime.Now"]
+                    MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [17..25)::8 - [birthday] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[birthday];
+                    Equals;[=];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [27..39)::12
+                        CSharpExpressionLiteral - [27..39)::12 - [DateTime.Now] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[DateTime.Now];
+                    MarkupTextLiteral - [39..40)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [40..67)::27 - name - DoubleQuotes - Bound - [ name="Time: @DateTime.Now"]
+                    MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [41..45)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTextLiteral - [46..47)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [47..66)::19
+                        MarkupTextLiteral - [47..52)::5 - [Time:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Time:];
+                        MarkupBlock - [52..66)::14
+                            MarkupTextLiteral - [52..53)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [53..66)::13
+                                CSharpImplicitExpression - [53..66)::13
+                                    CSharpTransition - [53..54)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [54..66)::12
+                                        CSharpCodeBlock - [54..66)::12
+                                            CSharpExpressionLiteral - [54..66)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                    MarkupTextLiteral - [66..67)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [67..70)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.cspans.txt
index 99004693d6..b593b2e5bc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.cspans.txt
@@ -5,4 +5,4 @@ Markup span at (52:0,52 [2] ) (Accepts:None) - Parent: Markup block at (52:0,52
 Markup span at (54:0,54 [1] ) (Accepts:None) - Parent: Markup block at (52:0,52 [3] )
 Markup span at (55:0,55 [1] ) (Accepts:Any) - Parent: Markup block at (55:0,55 [14] )
 Transition span at (56:0,56 [1] ) (Accepts:None) - Parent: Expression block at (56:0,56 [13] )
-Code span at (57:0,57 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (56:0,56 [13] )
+Code span at (57:0,57 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (56:0,56 [13] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.stree.txt
index 008217ba19..1c2449a0b5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/CreatesMarkupCodeSpansForNonStringTagHelperAttributes9.stree.txt
@@ -1,29 +1,69 @@
-Markup block - Gen<None> - 73 - (0:0,0)
-    Tag block - Gen<TagHelper> - 73 - (0:0,0) - person - PersonTagHelper
-        SelfClosing - <person age="12" birthday="DateTime.Now" name="Time: @@ @DateTime.Now" />
-        age - DoubleQuotes
-            Code span - Gen<Expr> - [12] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (13:0,13) - Tokens:1
-                HtmlTokenType.Text;[12];
-        birthday - DoubleQuotes
-            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (27:0,27) - Tokens:1
-                HtmlTokenType.Text;[DateTime.Now];
-        name - DoubleQuotes
-            Markup block - Gen<None> - 22 - (47:0,47)
-                Markup span - Gen<Markup> - [Time:] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:1
-                    HtmlTokenType.Text;[Time:];
-                Markup block - Gen<None> - 3 - (52:0,52)
-                    Markup span - Gen<Markup> - [ @] - SpanEditHandler;Accepts:None - (52:0,52) - Tokens:2
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (54:0,54) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                Markup block - Gen<None> - 14 - (55:0,55)
-                    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (55:0,55) - Tokens:1
-                        HtmlTokenType.WhiteSpace;[ ];
-                    Expression block - Gen<Expr> - 13 - (56:0,56)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (56:0,56) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (57:0,57) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
+RazorDocument - [0..73)::73 - [<person age="12" birthday="DateTime.Now" name="Time: @@ @DateTime.Now" />]
+    MarkupBlock - [0..73)::73
+        MarkupTagHelperElement - [0..73)::73 - person[SelfClosing] - PersonTagHelper
+            MarkupTagHelperStartTag - [0..73)::73
+                MarkupTextLiteral - [0..7)::7 - [<person] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[person];
+                MarkupTagHelperAttribute - [7..16)::9 - age - DoubleQuotes - Bound - [ age="12"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..11)::3 - [age] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[age];
+                    Equals;[=];
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [13..15)::2
+                        CSharpExpressionLiteral - [13..15)::2 - [12] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[12];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [16..40)::24 - birthday - DoubleQuotes - Bound - [ birthday="DateTime.Now"]
+                    MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [17..25)::8 - [birthday] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[birthday];
+                    Equals;[=];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [27..39)::12
+                        CSharpExpressionLiteral - [27..39)::12 - [DateTime.Now] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[DateTime.Now];
+                    MarkupTextLiteral - [39..40)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [40..70)::30 - name - DoubleQuotes - Bound - [ name="Time: @@ @DateTime.Now"]
+                    MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [41..45)::4 - [name] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[name];
+                    Equals;[=];
+                    MarkupTextLiteral - [46..47)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [47..69)::22
+                        MarkupTextLiteral - [47..52)::5 - [Time:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Time:];
+                        MarkupBlock - [52..55)::3
+                            MarkupTextLiteral - [52..54)::2 - [ @] - Gen<LitAttr: @(52:0,52)> - SpanEditHandler;Accepts:None
+                                Whitespace;[ ];
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [54..55)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                        MarkupBlock - [55..69)::14
+                            MarkupTextLiteral - [55..56)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            CSharpCodeBlock - [56..69)::13
+                                CSharpImplicitExpression - [56..69)::13
+                                    CSharpTransition - [56..57)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [57..69)::12
+                                        CSharpCodeBlock - [57..69)::12
+                                            CSharpExpressionLiteral - [57..69)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                    MarkupTextLiteral - [69..70)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [70..73)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.stree.txt
index 8ff170117e..1d5ebc5e25 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/FeatureDisabled_AddsErrorForMinimizedBooleanBoundAttributes.stree.txt
@@ -1,5 +1,21 @@
-Markup block - Gen<None> - 37 - (0:0,0)
-    Tag block - Gen<TagHelper> - 37 - (0:0,0) - input - InputTagHelper
-        SelfClosing - <input boundbool boundbooldict-key />
-        boundbool - Minimized
-        boundbooldict-key - Minimized
+RazorDocument - [0..37)::37 - [<input boundbool boundbooldict-key />]
+    MarkupBlock - [0..37)::37
+        MarkupTagHelperElement - [0..37)::37 - input[SelfClosing] - InputTagHelper
+            MarkupTagHelperStartTag - [0..37)::37
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..16)::10 - boundbool - Minimized - Bound - [ boundbool]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..16)::9 - [boundbool] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[boundbool];
+                MarkupMinimizedTagHelperAttribute - [16..34)::18 - boundbooldict-key - Minimized - Bound - [ boundbooldict-key]
+                    MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [17..34)::17 - [boundbooldict-key] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[boundbooldict-key];
+                MarkupTextLiteral - [34..37)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.cspans.txt
index 203f39e413..0391bc3c6c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.cspans.txt
@@ -2,7 +2,7 @@ Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42]
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
 MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
 Transition span at (24:0,24 [1] ) (Accepts:None) - Parent: Expression block at (24:0,24 [13] )
-Code span at (25:0,25 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (24:0,24 [13] )
+Code span at (25:0,25 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (24:0,24 [13] )
 Code span at (41:0,41 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [42] )
 MetaCode span at (41:0,41 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [42] )
 Markup span at (42:0,42 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [42] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.stree.txt
index 49754c0723..cc1abe49f1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block1.stree.txt
@@ -1,26 +1,49 @@
-Markup block - Gen<None> - 42 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 42 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 39 - (2:0,2)
-            Tag block - Gen<TagHelper> - 39 - (2:0,2) - input - inputtaghelper
-                SelfClosing - <input data-required='@DateTime.Now' />
-                data-required - SingleQuotes
-                    Markup block - Gen<None> - 13 - (24:0,24)
-                        Expression block - Gen<Expr> - 13 - (24:0,24)
-                            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:1
-                                CSharpTokenType.Transition;[@];
-                            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (25:0,25) - Tokens:3
-                                CSharpTokenType.Identifier;[DateTime];
-                                CSharpTokenType.Dot;[.];
-                                CSharpTokenType.Identifier;[Now];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (41:0,41) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (42:0,42) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..42)::42 - [@{<input data-required='@DateTime.Now' />}]
+    MarkupBlock - [0..42)::42
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..42)::42
+            CSharpStatement - [0..42)::42
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..42)::41
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..41)::39
+                        MarkupBlock - [2..41)::39
+                            MarkupTagHelperElement - [2..41)::39 - input[SelfClosing] - inputtaghelper
+                                MarkupTagHelperStartTag - [2..41)::39
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupTagHelperAttribute - [8..38)::30 - data-required - SingleQuotes - Unbound - [ data-required='@DateTime.Now']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..22)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-required];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [24..37)::13
+                                            CSharpCodeBlock - [24..37)::13
+                                                CSharpImplicitExpression - [24..37)::13
+                                                    CSharpTransition - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [25..37)::12
+                                                        CSharpCodeBlock - [25..37)::12
+                                                            CSharpExpressionLiteral - [25..37)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[DateTime];
+                                                                Dot;[.];
+                                                                Identifier;[Now];
+                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupTextLiteral - [38..41)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [41..41)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [41..42)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [42..42)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block2.stree.txt
index 6ef4498ba9..6544486590 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block2.stree.txt
@@ -1,20 +1,41 @@
-Markup block - Gen<None> - 34 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 34 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 31 - (2:0,2)
-            Tag block - Gen<TagHelper> - 31 - (2:0,2) - input - inputtaghelper
-                SelfClosing - <input data-required='value' />
-                data-required - SingleQuotes
-                    Markup span - Gen<Markup> - [value] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
-                        HtmlTokenType.Text;[value];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (33:0,33) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..34)::34 - [@{<input data-required='value' />}]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        MarkupBlock - [2..33)::31
+                            MarkupTagHelperElement - [2..33)::31 - input[SelfClosing] - inputtaghelper
+                                MarkupTagHelperStartTag - [2..33)::31
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupTagHelperAttribute - [8..30)::22 - data-required - SingleQuotes - Unbound - [ data-required='value']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..22)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-required];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [24..29)::5
+                                            MarkupTextLiteral - [24..29)::5 - [value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[value];
+                                        MarkupTextLiteral - [29..30)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupTextLiteral - [30..33)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.cspans.txt
index fa56e72569..b42754acf3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.cspans.txt
@@ -3,7 +3,7 @@ Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0
 MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [49] )
 Markup span at (24:0,24 [7] ) (Accepts:Any) - Parent: Markup block at (24:0,24 [20] )
 Transition span at (31:0,31 [1] ) (Accepts:None) - Parent: Expression block at (31:0,31 [13] )
-Code span at (32:0,32 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (31:0,31 [13] )
+Code span at (32:0,32 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (31:0,31 [13] )
 Code span at (48:0,48 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [49] )
 MetaCode span at (48:0,48 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [49] )
 Markup span at (49:0,49 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [49] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.stree.txt
index 6bb0ea89ed..3875da9904 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block3.stree.txt
@@ -1,29 +1,52 @@
-Markup block - Gen<None> - 49 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 49 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 46 - (2:0,2)
-            Tag block - Gen<TagHelper> - 46 - (2:0,2) - input - inputtaghelper
-                SelfClosing - <input data-required='prefix @DateTime.Now' />
-                data-required - SingleQuotes
-                    Markup block - Gen<None> - 20 - (24:0,24)
-                        Markup span - Gen<Markup> - [prefix ] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:2
-                            HtmlTokenType.Text;[prefix];
-                            HtmlTokenType.WhiteSpace;[ ];
-                        Expression block - Gen<Expr> - 13 - (31:0,31)
-                            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:1
-                                CSharpTokenType.Transition;[@];
-                            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (32:0,32) - Tokens:3
-                                CSharpTokenType.Identifier;[DateTime];
-                                CSharpTokenType.Dot;[.];
-                                CSharpTokenType.Identifier;[Now];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (48:0,48) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (48:0,48) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (49:0,49) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..49)::49 - [@{<input data-required='prefix @DateTime.Now' />}]
+    MarkupBlock - [0..49)::49
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..49)::49
+            CSharpStatement - [0..49)::49
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..49)::48
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..48)::46
+                        MarkupBlock - [2..48)::46
+                            MarkupTagHelperElement - [2..48)::46 - input[SelfClosing] - inputtaghelper
+                                MarkupTagHelperStartTag - [2..48)::46
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupTagHelperAttribute - [8..45)::37 - data-required - SingleQuotes - Unbound - [ data-required='prefix @DateTime.Now']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..22)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-required];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [24..44)::20
+                                            MarkupTextLiteral - [24..31)::7 - [prefix ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[prefix];
+                                                Whitespace;[ ];
+                                            CSharpCodeBlock - [31..44)::13
+                                                CSharpImplicitExpression - [31..44)::13
+                                                    CSharpTransition - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [32..44)::12
+                                                        CSharpCodeBlock - [32..44)::12
+                                                            CSharpExpressionLiteral - [32..44)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[DateTime];
+                                                                Dot;[.];
+                                                                Identifier;[Now];
+                                        MarkupTextLiteral - [44..45)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupTextLiteral - [45..48)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [48..48)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [48..49)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [49..49)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.cspans.txt
index 91e4a6a92a..90cbfa0f75 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.cspans.txt
@@ -2,7 +2,7 @@ Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [49]
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [49] )
 MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [49] )
 Transition span at (24:0,24 [1] ) (Accepts:None) - Parent: Expression block at (24:0,24 [13] )
-Code span at (25:0,25 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (24:0,24 [13] )
+Code span at (25:0,25 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (24:0,24 [13] )
 Markup span at (37:0,37 [7] ) (Accepts:Any) - Parent: Markup block at (24:0,24 [20] )
 Code span at (48:0,48 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [49] )
 MetaCode span at (48:0,48 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [49] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.stree.txt
index e031272f9f..a5dc4c1307 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block4.stree.txt
@@ -1,29 +1,52 @@
-Markup block - Gen<None> - 49 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 49 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 46 - (2:0,2)
-            Tag block - Gen<TagHelper> - 46 - (2:0,2) - input - inputtaghelper
-                SelfClosing - <input data-required='@DateTime.Now suffix' />
-                data-required - SingleQuotes
-                    Markup block - Gen<None> - 20 - (24:0,24)
-                        Expression block - Gen<Expr> - 13 - (24:0,24)
-                            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:1
-                                CSharpTokenType.Transition;[@];
-                            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (25:0,25) - Tokens:3
-                                CSharpTokenType.Identifier;[DateTime];
-                                CSharpTokenType.Dot;[.];
-                                CSharpTokenType.Identifier;[Now];
-                        Markup span - Gen<Markup> - [ suffix] - SpanEditHandler;Accepts:Any - (37:0,37) - Tokens:2
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Text;[suffix];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (48:0,48) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (48:0,48) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (49:0,49) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..49)::49 - [@{<input data-required='@DateTime.Now suffix' />}]
+    MarkupBlock - [0..49)::49
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..49)::49
+            CSharpStatement - [0..49)::49
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..49)::48
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..48)::46
+                        MarkupBlock - [2..48)::46
+                            MarkupTagHelperElement - [2..48)::46 - input[SelfClosing] - inputtaghelper
+                                MarkupTagHelperStartTag - [2..48)::46
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupTagHelperAttribute - [8..45)::37 - data-required - SingleQuotes - Unbound - [ data-required='@DateTime.Now suffix']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..22)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-required];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [24..44)::20
+                                            CSharpCodeBlock - [24..37)::13
+                                                CSharpImplicitExpression - [24..37)::13
+                                                    CSharpTransition - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [25..37)::12
+                                                        CSharpCodeBlock - [25..37)::12
+                                                            CSharpExpressionLiteral - [25..37)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[DateTime];
+                                                                Dot;[.];
+                                                                Identifier;[Now];
+                                            MarkupTextLiteral - [37..44)::7 - [ suffix] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                                Text;[suffix];
+                                        MarkupTextLiteral - [44..45)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupTextLiteral - [45..48)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [48..48)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [48..49)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [49..49)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.cspans.txt
index 1177f5d688..912f6a9910 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.cspans.txt
@@ -3,7 +3,7 @@ Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0
 MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [56] )
 Markup span at (24:0,24 [7] ) (Accepts:Any) - Parent: Markup block at (24:0,24 [27] )
 Transition span at (31:0,31 [1] ) (Accepts:None) - Parent: Expression block at (31:0,31 [13] )
-Code span at (32:0,32 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (31:0,31 [13] )
+Code span at (32:0,32 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (31:0,31 [13] )
 Markup span at (44:0,44 [7] ) (Accepts:Any) - Parent: Markup block at (24:0,24 [27] )
 Code span at (55:0,55 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [56] )
 MetaCode span at (55:0,55 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [56] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.stree.txt
index 2e9623d9f8..684f596021 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block5.stree.txt
@@ -1,32 +1,55 @@
-Markup block - Gen<None> - 56 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 56 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 53 - (2:0,2)
-            Tag block - Gen<TagHelper> - 53 - (2:0,2) - input - inputtaghelper
-                SelfClosing - <input data-required='prefix @DateTime.Now suffix' />
-                data-required - SingleQuotes
-                    Markup block - Gen<None> - 27 - (24:0,24)
-                        Markup span - Gen<Markup> - [prefix ] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:2
-                            HtmlTokenType.Text;[prefix];
-                            HtmlTokenType.WhiteSpace;[ ];
-                        Expression block - Gen<Expr> - 13 - (31:0,31)
-                            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:1
-                                CSharpTokenType.Transition;[@];
-                            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (32:0,32) - Tokens:3
-                                CSharpTokenType.Identifier;[DateTime];
-                                CSharpTokenType.Dot;[.];
-                                CSharpTokenType.Identifier;[Now];
-                        Markup span - Gen<Markup> - [ suffix] - SpanEditHandler;Accepts:Any - (44:0,44) - Tokens:2
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Text;[suffix];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (55:0,55) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (55:0,55) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (56:0,56) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..56)::56 - [@{<input data-required='prefix @DateTime.Now suffix' />}]
+    MarkupBlock - [0..56)::56
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..56)::56
+            CSharpStatement - [0..56)::56
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..56)::55
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..55)::53
+                        MarkupBlock - [2..55)::53
+                            MarkupTagHelperElement - [2..55)::53 - input[SelfClosing] - inputtaghelper
+                                MarkupTagHelperStartTag - [2..55)::53
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupTagHelperAttribute - [8..52)::44 - data-required - SingleQuotes - Unbound - [ data-required='prefix @DateTime.Now suffix']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..22)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-required];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [24..51)::27
+                                            MarkupTextLiteral - [24..31)::7 - [prefix ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[prefix];
+                                                Whitespace;[ ];
+                                            CSharpCodeBlock - [31..44)::13
+                                                CSharpImplicitExpression - [31..44)::13
+                                                    CSharpTransition - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [32..44)::12
+                                                        CSharpCodeBlock - [32..44)::12
+                                                            CSharpExpressionLiteral - [32..44)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[DateTime];
+                                                                Dot;[.];
+                                                                Identifier;[Now];
+                                            MarkupTextLiteral - [44..51)::7 - [ suffix] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                                Text;[suffix];
+                                        MarkupTextLiteral - [51..52)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupTextLiteral - [52..55)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [55..55)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [55..56)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [56..56)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.cspans.txt
index 2157796b85..a02a857505 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.cspans.txt
@@ -3,7 +3,7 @@ Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0
 MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [85] )
 Markup span at (38:0,38 [7] ) (Accepts:Any) - Parent: Markup block at (38:0,38 [27] )
 Transition span at (45:0,45 [1] ) (Accepts:None) - Parent: Expression block at (45:0,45 [13] )
-Code span at (46:0,46 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (45:0,45 [13] )
+Code span at (46:0,46 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (45:0,45 [13] )
 Markup span at (58:0,58 [7] ) (Accepts:Any) - Parent: Markup block at (38:0,38 [27] )
 Code span at (84:0,84 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [85] )
 MetaCode span at (84:0,84 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [85] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.stree.txt
index 20b282c6d5..61dfa75376 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block6.stree.txt
@@ -1,34 +1,65 @@
-Markup block - Gen<None> - 85 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 85 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 82 - (2:0,2)
-            Tag block - Gen<TagHelper> - 82 - (2:0,2) - input - inputtaghelper
-                SelfClosing - <input pre-attribute data-required='prefix @DateTime.Now suffix' post-attribute />
-                pre-attribute - Minimized
-                data-required - SingleQuotes
-                    Markup block - Gen<None> - 27 - (38:0,38)
-                        Markup span - Gen<Markup> - [prefix ] - SpanEditHandler;Accepts:Any - (38:0,38) - Tokens:2
-                            HtmlTokenType.Text;[prefix];
-                            HtmlTokenType.WhiteSpace;[ ];
-                        Expression block - Gen<Expr> - 13 - (45:0,45)
-                            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (45:0,45) - Tokens:1
-                                CSharpTokenType.Transition;[@];
-                            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (46:0,46) - Tokens:3
-                                CSharpTokenType.Identifier;[DateTime];
-                                CSharpTokenType.Dot;[.];
-                                CSharpTokenType.Identifier;[Now];
-                        Markup span - Gen<Markup> - [ suffix] - SpanEditHandler;Accepts:Any - (58:0,58) - Tokens:2
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Text;[suffix];
-                post-attribute - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (84:0,84) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (84:0,84) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (85:0,85) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..85)::85 - [@{<input pre-attribute data-required='prefix @DateTime.Now suffix' post-attribute />}]
+    MarkupBlock - [0..85)::85
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..85)::85
+            CSharpStatement - [0..85)::85
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..85)::84
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..84)::82
+                        MarkupBlock - [2..84)::82
+                            MarkupTagHelperElement - [2..84)::82 - input[SelfClosing] - inputtaghelper
+                                MarkupTagHelperStartTag - [2..84)::82
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..22)::14 - pre-attribute - Minimized - Unbound - [ pre-attribute]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..22)::13 - [pre-attribute] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[pre-attribute];
+                                    MarkupTagHelperAttribute - [22..66)::44 - data-required - SingleQuotes - Unbound - [ data-required='prefix @DateTime.Now suffix']
+                                        MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [23..36)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-required];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [38..65)::27
+                                            MarkupTextLiteral - [38..45)::7 - [prefix ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[prefix];
+                                                Whitespace;[ ];
+                                            CSharpCodeBlock - [45..58)::13
+                                                CSharpImplicitExpression - [45..58)::13
+                                                    CSharpTransition - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [46..58)::12
+                                                        CSharpCodeBlock - [46..58)::12
+                                                            CSharpExpressionLiteral - [46..58)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[DateTime];
+                                                                Dot;[.];
+                                                                Identifier;[Now];
+                                            MarkupTextLiteral - [58..65)::7 - [ suffix] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                                Text;[suffix];
+                                        MarkupTextLiteral - [65..66)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [66..81)::15 - post-attribute - Minimized - Unbound - [ post-attribute]
+                                        MarkupTextLiteral - [66..67)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [67..81)::14 - [post-attribute] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[post-attribute];
+                                    MarkupTextLiteral - [81..84)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [84..84)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [84..85)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [85..85)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.cspans.txt
index 822b7288e1..636e0fa0e0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.cspans.txt
@@ -2,10 +2,10 @@ Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [63]
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [63] )
 MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [63] )
 Transition span at (24:0,24 [1] ) (Accepts:None) - Parent: Expression block at (24:0,24 [13] )
-Code span at (25:0,25 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (24:0,24 [13] )
+Code span at (25:0,25 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (24:0,24 [13] )
 Markup span at (37:0,37 [8] ) (Accepts:Any) - Parent: Markup block at (24:0,24 [34] )
 Transition span at (45:0,45 [1] ) (Accepts:None) - Parent: Expression block at (45:0,45 [13] )
-Code span at (46:0,46 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (45:0,45 [13] )
+Code span at (46:0,46 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (45:0,45 [13] )
 Code span at (62:0,62 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [63] )
 MetaCode span at (62:0,62 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [63] )
 Markup span at (63:0,63 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [63] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.stree.txt
index 3cf5a4c572..3374274c2a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Block7.stree.txt
@@ -1,37 +1,63 @@
-Markup block - Gen<None> - 63 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 63 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 60 - (2:0,2)
-            Tag block - Gen<TagHelper> - 60 - (2:0,2) - input - inputtaghelper
-                SelfClosing - <input data-required='@DateTime.Now middle @DateTime.Now' />
-                data-required - SingleQuotes
-                    Markup block - Gen<None> - 34 - (24:0,24)
-                        Expression block - Gen<Expr> - 13 - (24:0,24)
-                            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:1
-                                CSharpTokenType.Transition;[@];
-                            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (25:0,25) - Tokens:3
-                                CSharpTokenType.Identifier;[DateTime];
-                                CSharpTokenType.Dot;[.];
-                                CSharpTokenType.Identifier;[Now];
-                        Markup span - Gen<Markup> - [ middle ] - SpanEditHandler;Accepts:Any - (37:0,37) - Tokens:3
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Text;[middle];
-                            HtmlTokenType.WhiteSpace;[ ];
-                        Expression block - Gen<Expr> - 13 - (45:0,45)
-                            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (45:0,45) - Tokens:1
-                                CSharpTokenType.Transition;[@];
-                            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (46:0,46) - Tokens:3
-                                CSharpTokenType.Identifier;[DateTime];
-                                CSharpTokenType.Dot;[.];
-                                CSharpTokenType.Identifier;[Now];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (62:0,62) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (62:0,62) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (63:0,63) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..63)::63 - [@{<input data-required='@DateTime.Now middle @DateTime.Now' />}]
+    MarkupBlock - [0..63)::63
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..63)::63
+            CSharpStatement - [0..63)::63
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..63)::62
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..62)::60
+                        MarkupBlock - [2..62)::60
+                            MarkupTagHelperElement - [2..62)::60 - input[SelfClosing] - inputtaghelper
+                                MarkupTagHelperStartTag - [2..62)::60
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupTagHelperAttribute - [8..59)::51 - data-required - SingleQuotes - Unbound - [ data-required='@DateTime.Now middle @DateTime.Now']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..22)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[data-required];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [23..24)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [24..58)::34
+                                            CSharpCodeBlock - [24..37)::13
+                                                CSharpImplicitExpression - [24..37)::13
+                                                    CSharpTransition - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [25..37)::12
+                                                        CSharpCodeBlock - [25..37)::12
+                                                            CSharpExpressionLiteral - [25..37)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[DateTime];
+                                                                Dot;[.];
+                                                                Identifier;[Now];
+                                            MarkupTextLiteral - [37..45)::8 - [ middle ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                                Text;[middle];
+                                                Whitespace;[ ];
+                                            CSharpCodeBlock - [45..58)::13
+                                                CSharpImplicitExpression - [45..58)::13
+                                                    CSharpTransition - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                        Transition;[@];
+                                                    CSharpImplicitExpressionBody - [46..58)::12
+                                                        CSharpCodeBlock - [46..58)::12
+                                                            CSharpExpressionLiteral - [46..58)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                Identifier;[DateTime];
+                                                                Dot;[.];
+                                                                Identifier;[Now];
+                                        MarkupTextLiteral - [58..59)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupTextLiteral - [59..62)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [62..62)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [62..63)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [63..63)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.cspans.txt
index 8b7eb337cd..0f363fa410 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (22:0,22 [1] ) (Accepts:None) - Parent: Expression block at (22:0,22 [13] )
-Code span at (23:0,23 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (22:0,22 [13] )
+Code span at (23:0,23 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (22:0,22 [13] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.stree.txt
index 0aeaef9bf8..1712c5a148 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document1.stree.txt
@@ -1,12 +1,32 @@
-Markup block - Gen<None> - 39 - (0:0,0)
-    Tag block - Gen<TagHelper> - 39 - (0:0,0) - input - inputtaghelper
-        SelfClosing - <input data-required='@DateTime.Now' />
-        data-required - SingleQuotes
-            Markup block - Gen<None> - 13 - (22:0,22)
-                Expression block - Gen<Expr> - 13 - (22:0,22)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (23:0,23) - Tokens:3
-                        CSharpTokenType.Identifier;[DateTime];
-                        CSharpTokenType.Dot;[.];
-                        CSharpTokenType.Identifier;[Now];
+RazorDocument - [0..39)::39 - [<input data-required='@DateTime.Now' />]
+    MarkupBlock - [0..39)::39
+        MarkupTagHelperElement - [0..39)::39 - input[SelfClosing] - inputtaghelper
+            MarkupTagHelperStartTag - [0..39)::39
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupTagHelperAttribute - [6..36)::30 - data-required - SingleQuotes - Unbound - [ data-required='@DateTime.Now']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..20)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[data-required];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [22..35)::13
+                        CSharpCodeBlock - [22..35)::13
+                            CSharpImplicitExpression - [22..35)::13
+                                CSharpTransition - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [23..35)::12
+                                    CSharpCodeBlock - [23..35)::12
+                                        CSharpExpressionLiteral - [23..35)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                                            Identifier;[Now];
+                    MarkupTextLiteral - [35..36)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [36..39)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document2.stree.txt
index d290d61cf2..aa98bf8785 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document2.stree.txt
@@ -1,6 +1,24 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<TagHelper> - 31 - (0:0,0) - input - inputtaghelper
-        SelfClosing - <input data-required='value' />
-        data-required - SingleQuotes
-            Markup span - Gen<Markup> - [value] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-                HtmlTokenType.Text;[value];
+RazorDocument - [0..31)::31 - [<input data-required='value' />]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - input[SelfClosing] - inputtaghelper
+            MarkupTagHelperStartTag - [0..31)::31
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupTagHelperAttribute - [6..28)::22 - data-required - SingleQuotes - Unbound - [ data-required='value']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..20)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[data-required];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [22..27)::5
+                        MarkupTextLiteral - [22..27)::5 - [value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[value];
+                    MarkupTextLiteral - [27..28)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [28..31)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.cspans.txt
index 11bdabe121..1500c5924f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.cspans.txt
@@ -1,3 +1,3 @@
 Markup span at (22:0,22 [7] ) (Accepts:Any) - Parent: Markup block at (22:0,22 [20] )
 Transition span at (29:0,29 [1] ) (Accepts:None) - Parent: Expression block at (29:0,29 [13] )
-Code span at (30:0,30 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (29:0,29 [13] )
+Code span at (30:0,30 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (29:0,29 [13] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.stree.txt
index 1d0d312810..81c87a341b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document3.stree.txt
@@ -1,15 +1,35 @@
-Markup block - Gen<None> - 46 - (0:0,0)
-    Tag block - Gen<TagHelper> - 46 - (0:0,0) - input - inputtaghelper
-        SelfClosing - <input data-required='prefix @DateTime.Now' />
-        data-required - SingleQuotes
-            Markup block - Gen<None> - 20 - (22:0,22)
-                Markup span - Gen<Markup> - [prefix ] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:2
-                    HtmlTokenType.Text;[prefix];
-                    HtmlTokenType.WhiteSpace;[ ];
-                Expression block - Gen<Expr> - 13 - (29:0,29)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (29:0,29) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (30:0,30) - Tokens:3
-                        CSharpTokenType.Identifier;[DateTime];
-                        CSharpTokenType.Dot;[.];
-                        CSharpTokenType.Identifier;[Now];
+RazorDocument - [0..46)::46 - [<input data-required='prefix @DateTime.Now' />]
+    MarkupBlock - [0..46)::46
+        MarkupTagHelperElement - [0..46)::46 - input[SelfClosing] - inputtaghelper
+            MarkupTagHelperStartTag - [0..46)::46
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupTagHelperAttribute - [6..43)::37 - data-required - SingleQuotes - Unbound - [ data-required='prefix @DateTime.Now']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..20)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[data-required];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [22..42)::20
+                        MarkupTextLiteral - [22..29)::7 - [prefix ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[prefix];
+                            Whitespace;[ ];
+                        CSharpCodeBlock - [29..42)::13
+                            CSharpImplicitExpression - [29..42)::13
+                                CSharpTransition - [29..30)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [30..42)::12
+                                    CSharpCodeBlock - [30..42)::12
+                                        CSharpExpressionLiteral - [30..42)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                                            Identifier;[Now];
+                    MarkupTextLiteral - [42..43)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [43..46)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.cspans.txt
index c82360f0e1..7a49d77d28 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.cspans.txt
@@ -1,3 +1,3 @@
 Transition span at (22:0,22 [1] ) (Accepts:None) - Parent: Expression block at (22:0,22 [13] )
-Code span at (23:0,23 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (22:0,22 [13] )
+Code span at (23:0,23 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (22:0,22 [13] )
 Markup span at (35:0,35 [7] ) (Accepts:Any) - Parent: Markup block at (22:0,22 [20] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.stree.txt
index 5e29e46178..975e485558 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document4.stree.txt
@@ -1,15 +1,35 @@
-Markup block - Gen<None> - 46 - (0:0,0)
-    Tag block - Gen<TagHelper> - 46 - (0:0,0) - input - inputtaghelper
-        SelfClosing - <input data-required='@DateTime.Now suffix' />
-        data-required - SingleQuotes
-            Markup block - Gen<None> - 20 - (22:0,22)
-                Expression block - Gen<Expr> - 13 - (22:0,22)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (23:0,23) - Tokens:3
-                        CSharpTokenType.Identifier;[DateTime];
-                        CSharpTokenType.Dot;[.];
-                        CSharpTokenType.Identifier;[Now];
-                Markup span - Gen<Markup> - [ suffix] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[suffix];
+RazorDocument - [0..46)::46 - [<input data-required='@DateTime.Now suffix' />]
+    MarkupBlock - [0..46)::46
+        MarkupTagHelperElement - [0..46)::46 - input[SelfClosing] - inputtaghelper
+            MarkupTagHelperStartTag - [0..46)::46
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupTagHelperAttribute - [6..43)::37 - data-required - SingleQuotes - Unbound - [ data-required='@DateTime.Now suffix']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..20)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[data-required];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [22..42)::20
+                        CSharpCodeBlock - [22..35)::13
+                            CSharpImplicitExpression - [22..35)::13
+                                CSharpTransition - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [23..35)::12
+                                    CSharpCodeBlock - [23..35)::12
+                                        CSharpExpressionLiteral - [23..35)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                                            Identifier;[Now];
+                        MarkupTextLiteral - [35..42)::7 - [ suffix] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            Text;[suffix];
+                    MarkupTextLiteral - [42..43)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [43..46)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.cspans.txt
index e47e1750dc..4ffa71d61f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.cspans.txt
@@ -1,4 +1,4 @@
 Markup span at (22:0,22 [7] ) (Accepts:Any) - Parent: Markup block at (22:0,22 [27] )
 Transition span at (29:0,29 [1] ) (Accepts:None) - Parent: Expression block at (29:0,29 [13] )
-Code span at (30:0,30 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (29:0,29 [13] )
+Code span at (30:0,30 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (29:0,29 [13] )
 Markup span at (42:0,42 [7] ) (Accepts:Any) - Parent: Markup block at (22:0,22 [27] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.stree.txt
index 7ebea4b181..9d2dfb5cf3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document5.stree.txt
@@ -1,18 +1,38 @@
-Markup block - Gen<None> - 53 - (0:0,0)
-    Tag block - Gen<TagHelper> - 53 - (0:0,0) - input - inputtaghelper
-        SelfClosing - <input data-required='prefix @DateTime.Now suffix' />
-        data-required - SingleQuotes
-            Markup block - Gen<None> - 27 - (22:0,22)
-                Markup span - Gen<Markup> - [prefix ] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:2
-                    HtmlTokenType.Text;[prefix];
-                    HtmlTokenType.WhiteSpace;[ ];
-                Expression block - Gen<Expr> - 13 - (29:0,29)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (29:0,29) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (30:0,30) - Tokens:3
-                        CSharpTokenType.Identifier;[DateTime];
-                        CSharpTokenType.Dot;[.];
-                        CSharpTokenType.Identifier;[Now];
-                Markup span - Gen<Markup> - [ suffix] - SpanEditHandler;Accepts:Any - (42:0,42) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[suffix];
+RazorDocument - [0..53)::53 - [<input data-required='prefix @DateTime.Now suffix' />]
+    MarkupBlock - [0..53)::53
+        MarkupTagHelperElement - [0..53)::53 - input[SelfClosing] - inputtaghelper
+            MarkupTagHelperStartTag - [0..53)::53
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupTagHelperAttribute - [6..50)::44 - data-required - SingleQuotes - Unbound - [ data-required='prefix @DateTime.Now suffix']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..20)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[data-required];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [22..49)::27
+                        MarkupTextLiteral - [22..29)::7 - [prefix ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[prefix];
+                            Whitespace;[ ];
+                        CSharpCodeBlock - [29..42)::13
+                            CSharpImplicitExpression - [29..42)::13
+                                CSharpTransition - [29..30)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [30..42)::12
+                                    CSharpCodeBlock - [30..42)::12
+                                        CSharpExpressionLiteral - [30..42)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                                            Identifier;[Now];
+                        MarkupTextLiteral - [42..49)::7 - [ suffix] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            Text;[suffix];
+                    MarkupTextLiteral - [49..50)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [50..53)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.cspans.txt
index bd5b5e69d2..72d6434606 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.cspans.txt
@@ -1,4 +1,4 @@
 Markup span at (36:0,36 [7] ) (Accepts:Any) - Parent: Markup block at (36:0,36 [27] )
 Transition span at (43:0,43 [1] ) (Accepts:None) - Parent: Expression block at (43:0,43 [13] )
-Code span at (44:0,44 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (43:0,43 [13] )
+Code span at (44:0,44 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (43:0,43 [13] )
 Markup span at (56:0,56 [7] ) (Accepts:Any) - Parent: Markup block at (36:0,36 [27] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.stree.txt
index bbb5489d8c..f7880750f9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document6.stree.txt
@@ -1,20 +1,48 @@
-Markup block - Gen<None> - 82 - (0:0,0)
-    Tag block - Gen<TagHelper> - 82 - (0:0,0) - input - inputtaghelper
-        SelfClosing - <input pre-attribute data-required='prefix @DateTime.Now suffix' post-attribute />
-        pre-attribute - Minimized
-        data-required - SingleQuotes
-            Markup block - Gen<None> - 27 - (36:0,36)
-                Markup span - Gen<Markup> - [prefix ] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:2
-                    HtmlTokenType.Text;[prefix];
-                    HtmlTokenType.WhiteSpace;[ ];
-                Expression block - Gen<Expr> - 13 - (43:0,43)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (43:0,43) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (44:0,44) - Tokens:3
-                        CSharpTokenType.Identifier;[DateTime];
-                        CSharpTokenType.Dot;[.];
-                        CSharpTokenType.Identifier;[Now];
-                Markup span - Gen<Markup> - [ suffix] - SpanEditHandler;Accepts:Any - (56:0,56) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[suffix];
-        post-attribute - Minimized
+RazorDocument - [0..82)::82 - [<input pre-attribute data-required='prefix @DateTime.Now suffix' post-attribute />]
+    MarkupBlock - [0..82)::82
+        MarkupTagHelperElement - [0..82)::82 - input[SelfClosing] - inputtaghelper
+            MarkupTagHelperStartTag - [0..82)::82
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..20)::14 - pre-attribute - Minimized - Unbound - [ pre-attribute]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..20)::13 - [pre-attribute] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[pre-attribute];
+                MarkupTagHelperAttribute - [20..64)::44 - data-required - SingleQuotes - Unbound - [ data-required='prefix @DateTime.Now suffix']
+                    MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [21..34)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[data-required];
+                    Equals;[=];
+                    MarkupTextLiteral - [35..36)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [36..63)::27
+                        MarkupTextLiteral - [36..43)::7 - [prefix ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[prefix];
+                            Whitespace;[ ];
+                        CSharpCodeBlock - [43..56)::13
+                            CSharpImplicitExpression - [43..56)::13
+                                CSharpTransition - [43..44)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [44..56)::12
+                                    CSharpCodeBlock - [44..56)::12
+                                        CSharpExpressionLiteral - [44..56)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                                            Identifier;[Now];
+                        MarkupTextLiteral - [56..63)::7 - [ suffix] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            Text;[suffix];
+                    MarkupTextLiteral - [63..64)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [64..79)::15 - post-attribute - Minimized - Unbound - [ post-attribute]
+                    MarkupTextLiteral - [64..65)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [65..79)::14 - [post-attribute] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[post-attribute];
+                MarkupTextLiteral - [79..82)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.cspans.txt
index 64046a4214..4cf3018f98 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.cspans.txt
@@ -1,5 +1,5 @@
 Transition span at (22:0,22 [1] ) (Accepts:None) - Parent: Expression block at (22:0,22 [13] )
-Code span at (23:0,23 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (22:0,22 [13] )
+Code span at (23:0,23 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (22:0,22 [13] )
 Markup span at (35:0,35 [8] ) (Accepts:Any) - Parent: Markup block at (22:0,22 [34] )
 Transition span at (43:0,43 [1] ) (Accepts:None) - Parent: Expression block at (43:0,43 [13] )
-Code span at (44:0,44 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (43:0,43 [13] )
+Code span at (44:0,44 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (43:0,43 [13] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.stree.txt
index fcfe20481d..b0278691b3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/GeneratesExpectedOutputForUnboundDataDashAttributes_Document7.stree.txt
@@ -1,23 +1,46 @@
-Markup block - Gen<None> - 60 - (0:0,0)
-    Tag block - Gen<TagHelper> - 60 - (0:0,0) - input - inputtaghelper
-        SelfClosing - <input data-required='@DateTime.Now middle @DateTime.Now' />
-        data-required - SingleQuotes
-            Markup block - Gen<None> - 34 - (22:0,22)
-                Expression block - Gen<Expr> - 13 - (22:0,22)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (23:0,23) - Tokens:3
-                        CSharpTokenType.Identifier;[DateTime];
-                        CSharpTokenType.Dot;[.];
-                        CSharpTokenType.Identifier;[Now];
-                Markup span - Gen<Markup> - [ middle ] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:3
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[middle];
-                    HtmlTokenType.WhiteSpace;[ ];
-                Expression block - Gen<Expr> - 13 - (43:0,43)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (43:0,43) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (44:0,44) - Tokens:3
-                        CSharpTokenType.Identifier;[DateTime];
-                        CSharpTokenType.Dot;[.];
-                        CSharpTokenType.Identifier;[Now];
+RazorDocument - [0..60)::60 - [<input data-required='@DateTime.Now middle @DateTime.Now' />]
+    MarkupBlock - [0..60)::60
+        MarkupTagHelperElement - [0..60)::60 - input[SelfClosing] - inputtaghelper
+            MarkupTagHelperStartTag - [0..60)::60
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupTagHelperAttribute - [6..57)::51 - data-required - SingleQuotes - Unbound - [ data-required='@DateTime.Now middle @DateTime.Now']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..20)::13 - [data-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[data-required];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [22..56)::34
+                        CSharpCodeBlock - [22..35)::13
+                            CSharpImplicitExpression - [22..35)::13
+                                CSharpTransition - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [23..35)::12
+                                    CSharpCodeBlock - [23..35)::12
+                                        CSharpExpressionLiteral - [23..35)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                                            Identifier;[Now];
+                        MarkupTextLiteral - [35..43)::8 - [ middle ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            Text;[middle];
+                            Whitespace;[ ];
+                        CSharpCodeBlock - [43..56)::13
+                            CSharpImplicitExpression - [43..56)::13
+                                CSharpTransition - [43..44)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [44..56)::12
+                                    CSharpCodeBlock - [44..56)::12
+                                        CSharpExpressionLiteral - [44..56)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                                            Identifier;[Now];
+                    MarkupTextLiteral - [56..57)::1 - ['] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [57..60)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml1.stree.txt
index 691f1ef5f0..2dd3c5e0db 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml1.stree.txt
@@ -1,12 +1,23 @@
-Markup block - Gen<None> - 11 - (0:0,0)
-    Tag block - Gen<None> - 1 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-    Tag block - Gen<None> - 1 - (1:0,1)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-    Tag block - Gen<TagHelper> - 9 - (2:0,2) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [>>] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:2
-            HtmlTokenType.CloseAngle;[>];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..11)::11 - [<<<p>>></p>]
+    MarkupBlock - [0..11)::11
+        MarkupTagBlock - [0..1)::1 - [<]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+        MarkupTagBlock - [1..2)::1 - [<]
+            MarkupTextLiteral - [1..2)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+        MarkupTagHelperElement - [2..11)::9 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [2..5)::3
+                MarkupTextLiteral - [2..5)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [5..7)::2 - [>>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [7..11)::4
+                MarkupTextLiteral - [7..11)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.cspans.txt
index 0d278c8e7b..2961977bf2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.cspans.txt
@@ -1,8 +1,8 @@
 Markup span at (3:0,3 [2] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [17] )
 Transition span at (5:0,5 [1] ) (Accepts:None) - Parent: Expression block at (5:0,5 [13] )
-Code span at (6:0,6 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (5:0,5 [13] )
+Code span at (6:0,6 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (5:0,5 [13] )
 Markup span at (18:0,18 [2] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [17] )
 Markup span at (20:0,20 [3] ) (Accepts:Any) - Parent: Tag block at (20:0,20 [3] )
 Transition span at (23:0,23 [1] ) (Accepts:None) - Parent: Expression block at (23:0,23 [13] )
-Code span at (24:0,24 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (23:0,23 [13] )
+Code span at (24:0,24 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (23:0,23 [13] )
 Markup span at (36:0,36 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [42] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.stree.txt
index 3bd9e0da8b..d2c472f3b7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.stree.txt
@@ -1,32 +1,49 @@
-Markup block - Gen<None> - 42 - (0:0,0)
-    Tag block - Gen<TagHelper> - 42 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 17 - (3:0,3)
-            Markup span - Gen<Markup> - [< ] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.WhiteSpace;[ ];
-            Expression block - Gen<Expr> - 13 - (5:0,5)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (6:0,6) - Tokens:3
-                    CSharpTokenType.Identifier;[DateTime];
-                    CSharpTokenType.Dot;[.];
-                    CSharpTokenType.Identifier;[Now];
-            Markup span - Gen<Markup> - [ >] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:2
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 3 - (20:0,20)
-            Markup span - Gen<Markup> - [</ ] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.WhiteSpace;[ ];
-        Expression block - Gen<Expr> - 13 - (23:0,23)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (24:0,24) - Tokens:3
-                CSharpTokenType.Identifier;[DateTime];
-                CSharpTokenType.Dot;[.];
-                CSharpTokenType.Identifier;[Now];
-        Markup span - Gen<Markup> - [ >] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:2
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..42)::42 - [<p>< @DateTime.Now ></ @DateTime.Now ></p>]
+    MarkupBlock - [0..42)::42
+        MarkupTagHelperElement - [0..42)::42 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [3..20)::17 - [< @DateTime.Now >]
+                MarkupTextLiteral - [3..5)::2 - [< ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Whitespace;[ ];
+                CSharpCodeBlock - [5..18)::13
+                    CSharpImplicitExpression - [5..18)::13
+                        CSharpTransition - [5..6)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [6..18)::12
+                            CSharpCodeBlock - [6..18)::12
+                                CSharpExpressionLiteral - [6..18)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                    Identifier;[DateTime];
+                                    Dot;[.];
+                                    Identifier;[Now];
+                MarkupTextLiteral - [18..20)::2 - [ >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    CloseAngle;[>];
+            MarkupTagBlock - [20..23)::3 - [</ ]
+                MarkupTextLiteral - [20..23)::3 - [</ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Whitespace;[ ];
+            CSharpCodeBlock - [23..36)::13
+                CSharpImplicitExpression - [23..36)::13
+                    CSharpTransition - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [24..36)::12
+                        CSharpCodeBlock - [24..36)::12
+                            CSharpExpressionLiteral - [24..36)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[DateTime];
+                                Dot;[.];
+                                Identifier;[Now];
+            MarkupTextLiteral - [36..38)::2 - [ >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [38..42)::4
+                MarkupTextLiteral - [38..42)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml2.stree.txt
index 91418b24dc..585e25bb51 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml2.stree.txt
@@ -1,6 +1,13 @@
-Markup block - Gen<None> - 6 - (0:0,0)
-    Tag block - Gen<None> - 1 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-    Tag block - Gen<TagHelper> - 5 - (1:0,1) - p - ptaghelper
-        SelfClosing - <p />
+RazorDocument - [0..6)::6 - [<<p />]
+    MarkupBlock - [0..6)::6
+        MarkupTagBlock - [0..1)::1 - [<]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+        MarkupTagHelperElement - [1..6)::5 - p[SelfClosing] - ptaghelper
+            MarkupTagHelperStartTag - [1..6)::5
+                MarkupTextLiteral - [1..6)::5 - [<p />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml3.stree.txt
index fddd53be95..aefc907305 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml3.stree.txt
@@ -1,12 +1,14 @@
-Markup block - Gen<None> - 6 - (0:0,0)
-    Tag block - Gen<None> - 6 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        Markup block - Gen<None> - 2 - (1:0,1)
-            Markup span - Gen<Markup> - [ p] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[p];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..6)::6 - [< p />]
+    MarkupBlock - [0..6)::6
+        MarkupTagBlock - [0..6)::6 - [< p />]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            MarkupMinimizedAttributeBlock - [1..3)::2 - [ p]
+                MarkupTextLiteral - [1..2)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [2..3)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[p];
+            MarkupTextLiteral - [3..6)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml4.stree.txt
index 9a6011af0c..26cda9df43 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml4.stree.txt
@@ -1,8 +1,15 @@
-Markup block - Gen<None> - 12 - (0:0,0)
-    Tag block - Gen<None> - 7 - (0:0,0)
-        Markup span - Gen<Markup> - [<input ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[input];
-            HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<TagHelper> - 5 - (7:0,7) - p - ptaghelper
-        SelfClosing - <p />
+RazorDocument - [0..12)::12 - [<input <p />]
+    MarkupBlock - [0..12)::12
+        MarkupTagBlock - [0..7)::7 - [<input ]
+            MarkupTextLiteral - [0..7)::7 - [<input ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                Whitespace;[ ];
+        MarkupTagHelperElement - [7..12)::5 - p[SelfClosing] - ptaghelper
+            MarkupTagHelperStartTag - [7..12)::5
+                MarkupTextLiteral - [7..12)::5 - [<p />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.stree.txt
index 598825b35e..4e4800e1a4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml5.stree.txt
@@ -1,18 +1,29 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Tag block - Gen<None> - 14 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        Markup block - Gen<Attr:class, class="@(1:0,1),"@(12:0,12)> - 12 - (1:0,1)
-            Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[class];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<LitAttr:@(9:0,9)> - [foo] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-                HtmlTokenType.Text;[foo];
-            Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                HtmlTokenType.DoubleQuote;["];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<TagHelper> - 5 - (14:0,14) - p - ptaghelper
-        SelfClosing - <p />
+RazorDocument - [0..19)::19 - [< class="foo" <p />]
+    MarkupBlock - [0..19)::19
+        MarkupTagBlock - [0..14)::14 - [< class="foo" ]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            MarkupAttributeBlock - [1..13)::12 - [ class="foo"]
+                MarkupTextLiteral - [1..2)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [2..7)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[class];
+                Equals;[=];
+                MarkupTextLiteral - [8..9)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+                GenericBlock - [9..12)::3
+                    MarkupLiteralAttributeValue - [9..12)::3 - [foo]
+                        MarkupTextLiteral - [9..12)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[foo];
+                MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+            MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+        MarkupTagHelperElement - [14..19)::5 - p[SelfClosing] - ptaghelper
+            MarkupTagHelperStartTag - [14..19)::5
+                MarkupTextLiteral - [14..19)::5 - [<p />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml6.stree.txt
index 205fa19ad5..993705be5d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml6.stree.txt
@@ -1,15 +1,26 @@
-Markup block - Gen<None> - 13 - (0:0,0)
-    Tag block - Gen<None> - 2 - (0:0,0)
-        Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-    Tag block - Gen<None> - 1 - (2:0,2)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-    Tag block - Gen<TagHelper> - 9 - (3:0,3) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [/>] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:2
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-        HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..13)::13 - [</<<p>/></p>>]
+    MarkupBlock - [0..13)::13
+        MarkupTagBlock - [0..2)::2 - [</]
+            MarkupTextLiteral - [0..2)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+        MarkupTagBlock - [2..3)::1 - [<]
+            MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+        MarkupTagHelperElement - [3..12)::9 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [3..6)::3
+                MarkupTextLiteral - [3..6)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [6..8)::2 - [/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                ForwardSlash;[/];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [8..12)::4
+                MarkupTextLiteral - [8..12)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [12..13)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml7.stree.txt
index 08d08394e4..5beba63c38 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml7.stree.txt
@@ -1,20 +1,31 @@
-Markup block - Gen<None> - 21 - (0:0,0)
-    Tag block - Gen<None> - 2 - (0:0,0)
-        Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-    Tag block - Gen<None> - 1 - (2:0,2)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-    Tag block - Gen<TagHelper> - 17 - (3:0,3) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [/>] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:2
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 8 - (8:0,8)
-            Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-        HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..21)::21 - [</<<p>/><strong></p>>]
+    MarkupBlock - [0..21)::21
+        MarkupTagBlock - [0..2)::2 - [</]
+            MarkupTextLiteral - [0..2)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+        MarkupTagBlock - [2..3)::1 - [<]
+            MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+        MarkupTagHelperElement - [3..20)::17 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [3..6)::3
+                MarkupTextLiteral - [3..6)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [6..8)::2 - [/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                ForwardSlash;[/];
+                CloseAngle;[>];
+            MarkupTagBlock - [8..16)::8 - [<strong>]
+                MarkupTextLiteral - [8..16)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [16..20)::4
+                MarkupTextLiteral - [16..20)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [20..21)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.cspans.txt
index d21ef18563..31aa41b4cd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.cspans.txt
@@ -1,7 +1,7 @@
 Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [2] )
 Markup span at (2:0,2 [1] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [1] )
 Transition span at (6:0,6 [1] ) (Accepts:None) - Parent: Expression block at (6:0,6 [13] )
-Code span at (7:0,7 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (6:0,6 [13] )
+Code span at (7:0,7 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (6:0,6 [13] )
 Markup span at (19:0,19 [2] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [30] )
 Markup span at (21:0,21 [8] ) (Accepts:Any) - Parent: Tag block at (21:0,21 [8] )
 Markup span at (33:0,33 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.stree.txt
index 5b8eb5624a..f0a3fe94d8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml8.stree.txt
@@ -1,27 +1,41 @@
-Markup block - Gen<None> - 34 - (0:0,0)
-    Tag block - Gen<None> - 2 - (0:0,0)
-        Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-    Tag block - Gen<None> - 1 - (2:0,2)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-    Tag block - Gen<TagHelper> - 30 - (3:0,3) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Expression block - Gen<Expr> - 13 - (6:0,6)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (7:0,7) - Tokens:3
-                CSharpTokenType.Identifier;[DateTime];
-                CSharpTokenType.Dot;[.];
-                CSharpTokenType.Identifier;[Now];
-        Markup span - Gen<Markup> - [/>] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:2
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 8 - (21:0,21)
-            Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1
-        HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..34)::34 - [</<<p>@DateTime.Now/><strong></p>>]
+    MarkupBlock - [0..34)::34
+        MarkupTagBlock - [0..2)::2 - [</]
+            MarkupTextLiteral - [0..2)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+        MarkupTagBlock - [2..3)::1 - [<]
+            MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+        MarkupTagHelperElement - [3..33)::30 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [3..6)::3
+                MarkupTextLiteral - [3..6)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            CSharpCodeBlock - [6..19)::13
+                CSharpImplicitExpression - [6..19)::13
+                    CSharpTransition - [6..7)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [7..19)::12
+                        CSharpCodeBlock - [7..19)::12
+                            CSharpExpressionLiteral - [7..19)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[DateTime];
+                                Dot;[.];
+                                Identifier;[Now];
+            MarkupTextLiteral - [19..21)::2 - [/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                ForwardSlash;[/];
+                CloseAngle;[>];
+            MarkupTagBlock - [21..29)::8 - [<strong>]
+                MarkupTextLiteral - [21..29)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [29..33)::4
+                MarkupTextLiteral - [29..33)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [33..34)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.cspans.txt
index cfccb8525d..38e6112313 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.cspans.txt
@@ -2,7 +2,7 @@ Markup span at (0:0,0 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [4] )
 Markup span at (4:0,4 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [52] )
 Markup span at (5:0,5 [4] ) (Accepts:Any) - Parent: Tag block at (5:0,5 [4] )
 Transition span at (12:0,12 [1] ) (Accepts:None) - Parent: Expression block at (12:0,12 [13] )
-Code span at (13:0,13 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (12:0,12 [13] )
+Code span at (13:0,13 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (12:0,12 [13] )
 Markup span at (25:0,25 [4] ) (Accepts:Any) - Parent: Tag block at (9:0,9 [32] )
 Markup span at (29:0,29 [8] ) (Accepts:Any) - Parent: Tag block at (29:0,29 [8] )
 Markup span at (41:0,41 [11] ) (Accepts:Any) - Parent: Tag block at (41:0,41 [11] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.stree.txt
index be1f5cade9..3cccfeb309 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml9.stree.txt
@@ -1,38 +1,52 @@
-Markup block - Gen<None> - 52 - (0:0,0)
-    Tag block - Gen<None> - 4 - (0:0,0)
-        Markup span - Gen<Markup> - [</  ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.WhiteSpace;[  ];
-    Markup span - Gen<Markup> - [/] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-        HtmlTokenType.ForwardSlash;[/];
-    Tag block - Gen<None> - 4 - (5:0,5)
-        Markup span - Gen<Markup> - [<  >] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.WhiteSpace;[  ];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<TagHelper> - 32 - (9:0,9) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Expression block - Gen<Expr> - 13 - (12:0,12)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (13:0,13) - Tokens:3
-                CSharpTokenType.Identifier;[DateTime];
-                CSharpTokenType.Dot;[.];
-                CSharpTokenType.Identifier;[Now];
-        Markup span - Gen<Markup> - [ / >] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:4
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 8 - (29:0,29)
-            Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 11 - (41:0,41)
-        Markup span - Gen<Markup> - [</        >] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.WhiteSpace;[        ];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..52)::52 - [</  /<  ><p>@DateTime.Now / ><strong></p></        >]
+    MarkupBlock - [0..52)::52
+        MarkupTagBlock - [0..4)::4 - [</  ]
+            MarkupTextLiteral - [0..4)::4 - [</  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Whitespace;[  ];
+        MarkupTextLiteral - [4..5)::1 - [/] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            ForwardSlash;[/];
+        MarkupTagBlock - [5..9)::4 - [<  >]
+            MarkupTextLiteral - [5..9)::4 - [<  >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Whitespace;[  ];
+                CloseAngle;[>];
+        MarkupTagHelperElement - [9..41)::32 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [9..12)::3
+                MarkupTextLiteral - [9..12)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            CSharpCodeBlock - [12..25)::13
+                CSharpImplicitExpression - [12..25)::13
+                    CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [13..25)::12
+                        CSharpCodeBlock - [13..25)::12
+                            CSharpExpressionLiteral - [13..25)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[DateTime];
+                                Dot;[.];
+                                Identifier;[Now];
+            MarkupTextLiteral - [25..29)::4 - [ / >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                Whitespace;[ ];
+                CloseAngle;[>];
+            MarkupTagBlock - [29..37)::8 - [<strong>]
+                MarkupTextLiteral - [29..37)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [37..41)::4
+                MarkupTextLiteral - [37..41)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTagBlock - [41..52)::11 - [</        >]
+            MarkupTextLiteral - [41..52)::11 - [</        >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Whitespace;[        ];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.cspans.txt
index 4b8ff158e9..e3af2600c1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.cspans.txt
@@ -1,5 +1,5 @@
 Markup span at (9:0,9 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [64] )
 Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [13] )
-Code span at (22:0,22 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (21:0,21 [13] )
+Code span at (22:0,22 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [13] )
 Markup span at (41:0,41 [10] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [64] )
 Markup span at (64:0,64 [9] ) (Accepts:Any) - Parent: Tag block at (64:0,64 [9] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.stree.txt
index 232ad6c96d..a2ca91149a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper1.stree.txt
@@ -1,27 +1,66 @@
-Markup block - Gen<None> - 73 - (0:0,0)
-    Tag block - Gen<TagHelper> - 64 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class=foo dynamic=@DateTime.Now style=color:red;> ... </p>
-        class - NoQuotes
-            Markup span - Gen<Markup> - [foo] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-                HtmlTokenType.Text;[foo];
-        dynamic - DoubleQuotes
-            Markup block - Gen<None> - 13 - (21:0,21)
-                Markup block - Gen<DynAttr:@(21:0,21)> - 13 - (21:0,21)
-                    Expression block - Gen<Expr> - 13 - (21:0,21)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (22:0,22) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        style - NoQuotes
-            Markup span - Gen<Markup> - [color:red;] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:1
-                HtmlTokenType.Text;[color:red;];
-        Tag block - Gen<TagHelper> - 8 - (52:0,52) - strong - strongtaghelper
-            StartTagAndEndTag - <strong>
-    Tag block - Gen<None> - 9 - (64:0,64)
-        Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (64:0,64) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..73)::73 - [<p class=foo dynamic=@DateTime.Now style=color:red;><strong></p></strong>]
+    MarkupBlock - [0..73)::73
+        MarkupTagHelperElement - [0..64)::64 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..52)::52
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class - DoubleQuotes - Unbound - [ class=foo]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..12)::3
+                        MarkupLiteralAttributeValue - [9..12)::3 - [foo]
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                MarkupTagHelperAttribute - [12..34)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..20)::7 - [dynamic] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[dynamic];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [21..34)::13
+                        MarkupDynamicAttributeValue - [21..34)::13 - [@DateTime.Now]
+                            GenericBlock - [21..34)::13
+                                CSharpCodeBlock - [21..34)::13
+                                    CSharpImplicitExpression - [21..34)::13
+                                        CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [22..34)::12
+                                            CSharpCodeBlock - [22..34)::12
+                                                CSharpExpressionLiteral - [22..34)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                MarkupTagHelperAttribute - [34..51)::17 - style - DoubleQuotes - Unbound - [ style=color:red;]
+                    MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [35..40)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [41..51)::10
+                        MarkupLiteralAttributeValue - [41..51)::10 - [color:red;]
+                            MarkupTextLiteral - [41..51)::10 - [color:red;] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                MarkupTextLiteral - [51..52)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [52..60)::8 - strong[StartTagAndEndTag] - strongtaghelper
+                MarkupTagHelperStartTag - [52..60)::8
+                    MarkupTextLiteral - [52..60)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [60..64)::4
+                MarkupTextLiteral - [60..64)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTagBlock - [64..73)::9 - [</strong>]
+            MarkupTextLiteral - [64..73)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.cspans.txt
index e3b29061bd..f4e5ce935c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.cspans.txt
@@ -1,4 +1,4 @@
 Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
-Markup span at (8:0,8 [6] ) (Accepts:Any) - Parent: Tag block at (5:0,5 [37] )
+Markup span at (8:0,8 [6] ) (Accepts:Any) - Parent: Tag block at (5:0,5 [31] )
 Markup span at (22:0,22 [5] ) (Accepts:Any) - Parent: Tag block at (14:0,14 [22] )
 Markup span at (36:0,36 [6] ) (Accepts:Any) - Parent: Tag block at (36:0,36 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.stree.txt
index 7507d4edbb..cdc5660b9c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.stree.txt
@@ -1,21 +1,36 @@
-Markup block - Gen<None> - 42 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<div>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<TagHelper> - 37 - (5:0,5) - p - ptaghelper
-        StartTagAndEndTag - <p>
-        Markup span - Gen<Markup> - [Hello ] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:2
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<TagHelper> - 22 - (14:0,14) - strong - strongtaghelper
-            StartTagAndEndTag - <strong> ... </strong>
-            Markup span - Gen<Markup> - [World] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-                HtmlTokenType.Text;[World];
-        Tag block - Gen<None> - 6 - (36:0,36)
-            Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[div];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..42)::42 - [<div><p>Hello <strong>World</strong></div>]
+    MarkupBlock - [0..42)::42
+        MarkupTagBlock - [0..5)::5 - [<div>]
+            MarkupTextLiteral - [0..5)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTagHelperElement - [5..36)::31 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [5..8)::3
+                MarkupTextLiteral - [5..8)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [8..14)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+            MarkupTagHelperElement - [14..36)::22 - strong[StartTagAndEndTag] - strongtaghelper
+                MarkupTagHelperStartTag - [14..22)::8
+                    MarkupTextLiteral - [14..22)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [22..27)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[World];
+                MarkupTagHelperEndTag - [27..36)::9
+                    MarkupTextLiteral - [27..36)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+        MarkupTagBlock - [36..42)::6 - [</div>]
+            MarkupTextLiteral - [36..42)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.tspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.tspans.txt
index 80e567b496..36dd08e818 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.tspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper2.tspans.txt
@@ -1,2 +1,2 @@
-TagHelper span at (5:0,5 [37] ) - ptaghelper
+TagHelper span at (5:0,5 [31] ) - ptaghelper
 TagHelper span at (14:0,14 [22] ) - strongtaghelper
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.cspans.txt
index 0e3bf1526f..a003b54d78 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.cspans.txt
@@ -1,4 +1,4 @@
 Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
-Markup span at (8:0,8 [6] ) (Accepts:Any) - Parent: Tag block at (5:0,5 [28] )
-Markup span at (22:0,22 [5] ) (Accepts:Any) - Parent: Tag block at (14:0,14 [19] )
+Markup span at (8:0,8 [6] ) (Accepts:Any) - Parent: Tag block at (5:0,5 [22] )
+Markup span at (22:0,22 [5] ) (Accepts:Any) - Parent: Tag block at (14:0,14 [13] )
 Markup span at (27:0,27 [6] ) (Accepts:Any) - Parent: Tag block at (27:0,27 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.stree.txt
index 4db15664cc..55169c40f8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.stree.txt
@@ -1,21 +1,30 @@
-Markup block - Gen<None> - 33 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<div>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<TagHelper> - 28 - (5:0,5) - p - ptaghelper
-        StartTagAndEndTag - <p>
-        Markup span - Gen<Markup> - [Hello ] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:2
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<TagHelper> - 19 - (14:0,14) - strong - strongtaghelper
-            StartTagAndEndTag - <strong>
-            Markup span - Gen<Markup> - [World] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-                HtmlTokenType.Text;[World];
-            Tag block - Gen<None> - 6 - (27:0,27)
-                Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[div];
-                    HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..33)::33 - [<div><p>Hello <strong>World</div>]
+    MarkupBlock - [0..33)::33
+        MarkupTagBlock - [0..5)::5 - [<div>]
+            MarkupTextLiteral - [0..5)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTagHelperElement - [5..27)::22 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [5..8)::3
+                MarkupTextLiteral - [5..8)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [8..14)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+            MarkupTagHelperElement - [14..27)::13 - strong[StartTagAndEndTag] - strongtaghelper
+                MarkupTagHelperStartTag - [14..22)::8
+                    MarkupTextLiteral - [14..22)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [22..27)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[World];
+        MarkupTagBlock - [27..33)::6 - [</div>]
+            MarkupTextLiteral - [27..33)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.tspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.tspans.txt
index ebd3c39ddf..9fc6edf71a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.tspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper3.tspans.txt
@@ -1,2 +1,2 @@
-TagHelper span at (5:0,5 [28] ) - ptaghelper
-TagHelper span at (14:0,14 [19] ) - strongtaghelper
+TagHelper span at (5:0,5 [22] ) - ptaghelper
+TagHelper span at (14:0,14 [13] ) - strongtaghelper
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.stree.txt
index 53f8db31af..dfb8f3a25a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_CreatesErrorForIncompleteTagHelper4.stree.txt
@@ -1,16 +1,55 @@
-Markup block - Gen<None> - 52 - (0:0,0)
-    Tag block - Gen<TagHelper> - 52 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class="foo">
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [foo] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[foo];
-        Markup span - Gen<Markup> - [Hello ] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:2
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<TagHelper> - 31 - (21:0,21) - p - ptaghelper
-            StartTagAndEndTag - <p style="color:red;"> ... </p>
-            style - DoubleQuotes
-                Markup span - Gen<Markup> - [color:red;] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-                    HtmlTokenType.Text;[color:red;];
-            Markup span - Gen<Markup> - [World] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:1
-                HtmlTokenType.Text;[World];
+RazorDocument - [0..52)::52 - [<p class="foo">Hello <p style="color:red;">World</p>]
+    MarkupBlock - [0..52)::52
+        MarkupTagHelperElement - [0..52)::52 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..15)::15
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [foo]
+                            MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [14..15)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [15..21)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+            MarkupTagHelperElement - [21..52)::31 - p[StartTagAndEndTag] - ptaghelper
+                MarkupTagHelperStartTag - [21..43)::22
+                    MarkupTextLiteral - [21..23)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                    MarkupTagHelperAttribute - [23..42)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                        MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [24..29)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[style];
+                        Equals;[=];
+                        MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [31..41)::10
+                            MarkupLiteralAttributeValue - [31..41)::10 - [color:red;]
+                                MarkupTextLiteral - [31..41)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[color:red;];
+                        MarkupTextLiteral - [41..42)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    MarkupTextLiteral - [42..43)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        CloseAngle;[>];
+                MarkupTextLiteral - [43..48)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[World];
+                MarkupTagHelperEndTag - [48..52)::4
+                    MarkupTextLiteral - [48..52)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.cspans.txt
index c4b1b651e4..646bf548d8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.cspans.txt
@@ -1,4 +1,4 @@
 Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [13] )
-Code span at (11:0,11 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (10:0,10 [13] )
+Code span at (11:0,11 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [13] )
 Transition span at (32:0,32 [1] ) (Accepts:None) - Parent: Expression block at (32:0,32 [13] )
-Code span at (33:0,33 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (32:0,32 [13] )
+Code span at (33:0,33 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (32:0,32 [13] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.stree.txt
index db27813447..4cd860643c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks1.stree.txt
@@ -1,23 +1,61 @@
-Markup block - Gen<None> - 51 - (0:0,0)
-    Tag block - Gen<TagHelper> - 51 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class="@DateTime.Now" style='@DateTime.Now'> ... </p>
-        class - DoubleQuotes
-            Markup block - Gen<None> - 13 - (10:0,10)
-                Markup block - Gen<DynAttr:@(10:0,10)> - 13 - (10:0,10)
-                    Expression block - Gen<Expr> - 13 - (10:0,10)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (11:0,11) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        style - SingleQuotes
-            Markup block - Gen<None> - 13 - (32:0,32)
-                Markup block - Gen<DynAttr:@(32:0,32)> - 13 - (32:0,32)
-                    Expression block - Gen<Expr> - 13 - (32:0,32)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (33:0,33) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
+RazorDocument - [0..51)::51 - [<p class="@DateTime.Now" style='@DateTime.Now'></p>]
+    MarkupBlock - [0..51)::51
+        MarkupTagHelperElement - [0..51)::51 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..47)::47
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..24)::22 - class - DoubleQuotes - Unbound - [ class="@DateTime.Now"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..23)::13
+                        MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
+                            GenericBlock - [10..23)::13
+                                CSharpCodeBlock - [10..23)::13
+                                    CSharpImplicitExpression - [10..23)::13
+                                        CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [11..23)::12
+                                            CSharpCodeBlock - [11..23)::12
+                                                CSharpExpressionLiteral - [11..23)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [24..46)::22 - style - SingleQuotes - Unbound - [ style='@DateTime.Now']
+                    MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [25..30)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [32..45)::13
+                        MarkupDynamicAttributeValue - [32..45)::13 - [@DateTime.Now]
+                            GenericBlock - [32..45)::13
+                                CSharpCodeBlock - [32..45)::13
+                                    CSharpImplicitExpression - [32..45)::13
+                                        CSharpTransition - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [33..45)::12
+                                            CSharpCodeBlock - [33..45)::12
+                                                CSharpExpressionLiteral - [33..45)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [45..46)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [46..47)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [47..51)::4
+                MarkupTextLiteral - [47..51)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.stree.txt
index e1b7db4846..1deded266c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks2.stree.txt
@@ -1,105 +1,137 @@
-Markup block - Gen<None> - 153 - (0:0,0)
-    Tag block - Gen<TagHelper> - 153 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class="@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);" style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);'> ... </p>
-        class - DoubleQuotes
-            Markup block - Gen<None> - 64 - (10:0,10)
-                Markup block - Gen<DynAttr:@(10:0,10)> - 64 - (10:0,10)
-                    Statement block - Gen<None> - 64 - (10:0,10)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Stmt> - [do { var foo = bar; ] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:13
-                            CSharpTokenType.Keyword;[do];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.LeftBrace;[{];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[var];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[foo];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Assign;[=];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[bar];
-                            CSharpTokenType.Semicolon;[;];
-                            CSharpTokenType.WhiteSpace;[ ];
-                        Markup block - Gen<None> - 16 - (31:0,31)
-                            Tag block - Gen<None> - 6 - (31:0,31)
-                                Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:3
-                                    HtmlTokenType.OpenAngle;[<];
-                                    HtmlTokenType.Text;[text];
-                                    HtmlTokenType.CloseAngle;[>];
-                            Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:None - (37:0,37) - Tokens:1
-                                HtmlTokenType.Text;[Foo];
-                            Tag block - Gen<None> - 7 - (40:0,40)
-                                Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:4
-                                    HtmlTokenType.OpenAngle;[<];
-                                    HtmlTokenType.ForwardSlash;[/];
-                                    HtmlTokenType.Text;[text];
-                                    HtmlTokenType.CloseAngle;[>];
-                        Code span - Gen<Stmt> - [ foo++; } while (foo<bar>);] - SpanEditHandler;Accepts:None - (47:0,47) - Tokens:16
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[foo];
-                            CSharpTokenType.Increment;[++];
-                            CSharpTokenType.Semicolon;[;];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.RightBrace;[}];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Keyword;[while];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.LeftParenthesis;[(];
-                            CSharpTokenType.Identifier;[foo];
-                            CSharpTokenType.LessThan;[<];
-                            CSharpTokenType.Identifier;[bar];
-                            CSharpTokenType.GreaterThan;[>];
-                            CSharpTokenType.RightParenthesis;[)];
-                            CSharpTokenType.Semicolon;[;];
-        style - SingleQuotes
-            Markup block - Gen<None> - 64 - (83:0,83)
-                Markup block - Gen<DynAttr:@(83:0,83)> - 64 - (83:0,83)
-                    Statement block - Gen<None> - 64 - (83:0,83)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (83:0,83) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Stmt> - [do { var foo = bar; ] - SpanEditHandler;Accepts:Any - (84:0,84) - Tokens:13
-                            CSharpTokenType.Keyword;[do];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.LeftBrace;[{];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[var];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[foo];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Assign;[=];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[bar];
-                            CSharpTokenType.Semicolon;[;];
-                            CSharpTokenType.WhiteSpace;[ ];
-                        Markup block - Gen<None> - 16 - (104:0,104)
-                            Tag block - Gen<None> - 6 - (104:0,104)
-                                Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (104:0,104) - Tokens:3
-                                    HtmlTokenType.OpenAngle;[<];
-                                    HtmlTokenType.Text;[text];
-                                    HtmlTokenType.CloseAngle;[>];
-                            Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:None - (110:0,110) - Tokens:1
-                                HtmlTokenType.Text;[Foo];
-                            Tag block - Gen<None> - 7 - (113:0,113)
-                                Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (113:0,113) - Tokens:4
-                                    HtmlTokenType.OpenAngle;[<];
-                                    HtmlTokenType.ForwardSlash;[/];
-                                    HtmlTokenType.Text;[text];
-                                    HtmlTokenType.CloseAngle;[>];
-                        Code span - Gen<Stmt> - [ foo++; } while (foo<bar>);] - SpanEditHandler;Accepts:None - (120:0,120) - Tokens:16
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[foo];
-                            CSharpTokenType.Increment;[++];
-                            CSharpTokenType.Semicolon;[;];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.RightBrace;[}];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Keyword;[while];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.LeftParenthesis;[(];
-                            CSharpTokenType.Identifier;[foo];
-                            CSharpTokenType.LessThan;[<];
-                            CSharpTokenType.Identifier;[bar];
-                            CSharpTokenType.GreaterThan;[>];
-                            CSharpTokenType.RightParenthesis;[)];
-                            CSharpTokenType.Semicolon;[;];
+RazorDocument - [0..153)::153 - [<p class="@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);" style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);'></p>]
+    MarkupBlock - [0..153)::153
+        MarkupTagHelperElement - [0..153)::153 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..149)::149
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..75)::73 - class - DoubleQuotes - Unbound - [ class="@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..74)::64
+                        MarkupDynamicAttributeValue - [10..74)::64 - [@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);]
+                            GenericBlock - [10..74)::64
+                                CSharpCodeBlock - [10..74)::64
+                                    CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [11..31)::20 - [do { var foo = bar; ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[do];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
+                                        Whitespace;[ ];
+                                        Identifier;[var];
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Whitespace;[ ];
+                                        Assign;[=];
+                                        Whitespace;[ ];
+                                        Identifier;[bar];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                    MarkupBlock - [31..47)::16
+                                        MarkupTagBlock - [31..37)::6 - [<text>]
+                                            MarkupTransition - [31..37)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                        MarkupTextLiteral - [37..40)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            Text;[Foo];
+                                        MarkupTagBlock - [40..47)::7 - [</text>]
+                                            MarkupTransition - [40..47)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                ForwardSlash;[/];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                    CSharpStatementLiteral - [47..74)::27 - [ foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Increment;[++];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                        RightBrace;[}];
+                                        Whitespace;[ ];
+                                        Keyword;[while];
+                                        Whitespace;[ ];
+                                        LeftParenthesis;[(];
+                                        Identifier;[foo];
+                                        LessThan;[<];
+                                        Identifier;[bar];
+                                        GreaterThan;[>];
+                                        RightParenthesis;[)];
+                                        Semicolon;[;];
+                    MarkupTextLiteral - [74..75)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [75..148)::73 - style - SingleQuotes - Unbound - [ style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);']
+                    MarkupTextLiteral - [75..76)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [76..81)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [82..83)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [83..147)::64
+                        MarkupDynamicAttributeValue - [83..147)::64 - [@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);]
+                            GenericBlock - [83..147)::64
+                                CSharpCodeBlock - [83..147)::64
+                                    CSharpTransition - [83..84)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [84..104)::20 - [do { var foo = bar; ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[do];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
+                                        Whitespace;[ ];
+                                        Identifier;[var];
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Whitespace;[ ];
+                                        Assign;[=];
+                                        Whitespace;[ ];
+                                        Identifier;[bar];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                    MarkupBlock - [104..120)::16
+                                        MarkupTagBlock - [104..110)::6 - [<text>]
+                                            MarkupTransition - [104..110)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                        MarkupTextLiteral - [110..113)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            Text;[Foo];
+                                        MarkupTagBlock - [113..120)::7 - [</text>]
+                                            MarkupTransition - [113..120)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                ForwardSlash;[/];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                    CSharpStatementLiteral - [120..147)::27 - [ foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Increment;[++];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                        RightBrace;[}];
+                                        Whitespace;[ ];
+                                        Keyword;[while];
+                                        Whitespace;[ ];
+                                        LeftParenthesis;[(];
+                                        Identifier;[foo];
+                                        LessThan;[<];
+                                        Identifier;[bar];
+                                        GreaterThan;[>];
+                                        RightParenthesis;[)];
+                                        Semicolon;[;];
+                    MarkupTextLiteral - [147..148)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [148..149)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [149..153)::4
+                MarkupTextLiteral - [149..153)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.cspans.txt
index d09f92a8e3..b49460175d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.cspans.txt
@@ -1,5 +1,5 @@
 Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [13] )
-Code span at (11:0,11 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (10:0,10 [13] )
+Code span at (11:0,11 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [13] )
 Transition span at (32:0,32 [1] ) (Accepts:None) - Parent: Expression block at (32:0,32 [13] )
-Code span at (33:0,33 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (32:0,32 [13] )
+Code span at (33:0,33 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (32:0,32 [13] )
 Markup span at (47:0,47 [11] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [62] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.stree.txt
index f0ca32e92b..4a018347fd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks3.stree.txt
@@ -1,27 +1,65 @@
-Markup block - Gen<None> - 62 - (0:0,0)
-    Tag block - Gen<TagHelper> - 62 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class="@DateTime.Now" style='@DateTime.Now'> ... </p>
-        class - DoubleQuotes
-            Markup block - Gen<None> - 13 - (10:0,10)
-                Markup block - Gen<DynAttr:@(10:0,10)> - 13 - (10:0,10)
-                    Expression block - Gen<Expr> - 13 - (10:0,10)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (11:0,11) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        style - SingleQuotes
-            Markup block - Gen<None> - 13 - (32:0,32)
-                Markup block - Gen<DynAttr:@(32:0,32)> - 13 - (32:0,32)
-                    Expression block - Gen<Expr> - 13 - (32:0,32)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (33:0,33) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        Markup span - Gen<Markup> - [Hello World] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:3
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
+RazorDocument - [0..62)::62 - [<p class="@DateTime.Now" style='@DateTime.Now'>Hello World</p>]
+    MarkupBlock - [0..62)::62
+        MarkupTagHelperElement - [0..62)::62 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..47)::47
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..24)::22 - class - DoubleQuotes - Unbound - [ class="@DateTime.Now"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..23)::13
+                        MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
+                            GenericBlock - [10..23)::13
+                                CSharpCodeBlock - [10..23)::13
+                                    CSharpImplicitExpression - [10..23)::13
+                                        CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [11..23)::12
+                                            CSharpCodeBlock - [11..23)::12
+                                                CSharpExpressionLiteral - [11..23)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [24..46)::22 - style - SingleQuotes - Unbound - [ style='@DateTime.Now']
+                    MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [25..30)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [32..45)::13
+                        MarkupDynamicAttributeValue - [32..45)::13 - [@DateTime.Now]
+                            GenericBlock - [32..45)::13
+                                CSharpCodeBlock - [32..45)::13
+                                    CSharpImplicitExpression - [32..45)::13
+                                        CSharpTransition - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [33..45)::12
+                                            CSharpCodeBlock - [33..45)::12
+                                                CSharpExpressionLiteral - [33..45)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [45..46)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [46..47)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [47..58)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [58..62)::4
+                MarkupTextLiteral - [58..62)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.stree.txt
index ae4ff2e8b5..9e369b5d2b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks4.stree.txt
@@ -1,109 +1,141 @@
-Markup block - Gen<None> - 164 - (0:0,0)
-    Tag block - Gen<TagHelper> - 164 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class="@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);" style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);'> ... </p>
-        class - DoubleQuotes
-            Markup block - Gen<None> - 64 - (10:0,10)
-                Markup block - Gen<DynAttr:@(10:0,10)> - 64 - (10:0,10)
-                    Statement block - Gen<None> - 64 - (10:0,10)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Stmt> - [do { var foo = bar; ] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:13
-                            CSharpTokenType.Keyword;[do];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.LeftBrace;[{];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[var];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[foo];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Assign;[=];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[bar];
-                            CSharpTokenType.Semicolon;[;];
-                            CSharpTokenType.WhiteSpace;[ ];
-                        Markup block - Gen<None> - 16 - (31:0,31)
-                            Tag block - Gen<None> - 6 - (31:0,31)
-                                Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:3
-                                    HtmlTokenType.OpenAngle;[<];
-                                    HtmlTokenType.Text;[text];
-                                    HtmlTokenType.CloseAngle;[>];
-                            Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:None - (37:0,37) - Tokens:1
-                                HtmlTokenType.Text;[Foo];
-                            Tag block - Gen<None> - 7 - (40:0,40)
-                                Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:4
-                                    HtmlTokenType.OpenAngle;[<];
-                                    HtmlTokenType.ForwardSlash;[/];
-                                    HtmlTokenType.Text;[text];
-                                    HtmlTokenType.CloseAngle;[>];
-                        Code span - Gen<Stmt> - [ foo++; } while (foo<bar>);] - SpanEditHandler;Accepts:None - (47:0,47) - Tokens:16
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[foo];
-                            CSharpTokenType.Increment;[++];
-                            CSharpTokenType.Semicolon;[;];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.RightBrace;[}];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Keyword;[while];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.LeftParenthesis;[(];
-                            CSharpTokenType.Identifier;[foo];
-                            CSharpTokenType.LessThan;[<];
-                            CSharpTokenType.Identifier;[bar];
-                            CSharpTokenType.GreaterThan;[>];
-                            CSharpTokenType.RightParenthesis;[)];
-                            CSharpTokenType.Semicolon;[;];
-        style - SingleQuotes
-            Markup block - Gen<None> - 64 - (83:0,83)
-                Markup block - Gen<DynAttr:@(83:0,83)> - 64 - (83:0,83)
-                    Statement block - Gen<None> - 64 - (83:0,83)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (83:0,83) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Stmt> - [do { var foo = bar; ] - SpanEditHandler;Accepts:Any - (84:0,84) - Tokens:13
-                            CSharpTokenType.Keyword;[do];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.LeftBrace;[{];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[var];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[foo];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Assign;[=];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[bar];
-                            CSharpTokenType.Semicolon;[;];
-                            CSharpTokenType.WhiteSpace;[ ];
-                        Markup block - Gen<None> - 16 - (104:0,104)
-                            Tag block - Gen<None> - 6 - (104:0,104)
-                                Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (104:0,104) - Tokens:3
-                                    HtmlTokenType.OpenAngle;[<];
-                                    HtmlTokenType.Text;[text];
-                                    HtmlTokenType.CloseAngle;[>];
-                            Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:None - (110:0,110) - Tokens:1
-                                HtmlTokenType.Text;[Foo];
-                            Tag block - Gen<None> - 7 - (113:0,113)
-                                Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (113:0,113) - Tokens:4
-                                    HtmlTokenType.OpenAngle;[<];
-                                    HtmlTokenType.ForwardSlash;[/];
-                                    HtmlTokenType.Text;[text];
-                                    HtmlTokenType.CloseAngle;[>];
-                        Code span - Gen<Stmt> - [ foo++; } while (foo<bar>);] - SpanEditHandler;Accepts:None - (120:0,120) - Tokens:16
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[foo];
-                            CSharpTokenType.Increment;[++];
-                            CSharpTokenType.Semicolon;[;];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.RightBrace;[}];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Keyword;[while];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.LeftParenthesis;[(];
-                            CSharpTokenType.Identifier;[foo];
-                            CSharpTokenType.LessThan;[<];
-                            CSharpTokenType.Identifier;[bar];
-                            CSharpTokenType.GreaterThan;[>];
-                            CSharpTokenType.RightParenthesis;[)];
-                            CSharpTokenType.Semicolon;[;];
-        Markup span - Gen<Markup> - [Hello World] - SpanEditHandler;Accepts:Any - (149:0,149) - Tokens:3
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
+RazorDocument - [0..164)::164 - [<p class="@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);" style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);'>Hello World</p>]
+    MarkupBlock - [0..164)::164
+        MarkupTagHelperElement - [0..164)::164 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..149)::149
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..75)::73 - class - DoubleQuotes - Unbound - [ class="@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..74)::64
+                        MarkupDynamicAttributeValue - [10..74)::64 - [@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);]
+                            GenericBlock - [10..74)::64
+                                CSharpCodeBlock - [10..74)::64
+                                    CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [11..31)::20 - [do { var foo = bar; ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[do];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
+                                        Whitespace;[ ];
+                                        Identifier;[var];
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Whitespace;[ ];
+                                        Assign;[=];
+                                        Whitespace;[ ];
+                                        Identifier;[bar];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                    MarkupBlock - [31..47)::16
+                                        MarkupTagBlock - [31..37)::6 - [<text>]
+                                            MarkupTransition - [31..37)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                        MarkupTextLiteral - [37..40)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            Text;[Foo];
+                                        MarkupTagBlock - [40..47)::7 - [</text>]
+                                            MarkupTransition - [40..47)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                ForwardSlash;[/];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                    CSharpStatementLiteral - [47..74)::27 - [ foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Increment;[++];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                        RightBrace;[}];
+                                        Whitespace;[ ];
+                                        Keyword;[while];
+                                        Whitespace;[ ];
+                                        LeftParenthesis;[(];
+                                        Identifier;[foo];
+                                        LessThan;[<];
+                                        Identifier;[bar];
+                                        GreaterThan;[>];
+                                        RightParenthesis;[)];
+                                        Semicolon;[;];
+                    MarkupTextLiteral - [74..75)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [75..148)::73 - style - SingleQuotes - Unbound - [ style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);']
+                    MarkupTextLiteral - [75..76)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [76..81)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [82..83)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [83..147)::64
+                        MarkupDynamicAttributeValue - [83..147)::64 - [@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);]
+                            GenericBlock - [83..147)::64
+                                CSharpCodeBlock - [83..147)::64
+                                    CSharpTransition - [83..84)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [84..104)::20 - [do { var foo = bar; ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[do];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
+                                        Whitespace;[ ];
+                                        Identifier;[var];
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Whitespace;[ ];
+                                        Assign;[=];
+                                        Whitespace;[ ];
+                                        Identifier;[bar];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                    MarkupBlock - [104..120)::16
+                                        MarkupTagBlock - [104..110)::6 - [<text>]
+                                            MarkupTransition - [104..110)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                        MarkupTextLiteral - [110..113)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            Text;[Foo];
+                                        MarkupTagBlock - [113..120)::7 - [</text>]
+                                            MarkupTransition - [113..120)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                ForwardSlash;[/];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                    CSharpStatementLiteral - [120..147)::27 - [ foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Increment;[++];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                        RightBrace;[}];
+                                        Whitespace;[ ];
+                                        Keyword;[while];
+                                        Whitespace;[ ];
+                                        LeftParenthesis;[(];
+                                        Identifier;[foo];
+                                        LessThan;[<];
+                                        Identifier;[bar];
+                                        GreaterThan;[>];
+                                        RightParenthesis;[)];
+                                        Semicolon;[;];
+                    MarkupTextLiteral - [147..148)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [148..149)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [149..160)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [160..164)::4
+                MarkupTextLiteral - [160..164)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.cspans.txt
index 2fb7dd6dbe..8737eaeaf8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.cspans.txt
@@ -1,7 +1,7 @@
 Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [13] )
-Code span at (11:0,11 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (10:0,10 [13] )
+Code span at (11:0,11 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [13] )
 Markup span at (25:0,25 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [34] )
 Markup span at (34:0,34 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [69] )
 Transition span at (45:0,45 [1] ) (Accepts:None) - Parent: Expression block at (45:0,45 [13] )
-Code span at (46:0,46 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (45:0,45 [13] )
+Code span at (46:0,46 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (45:0,45 [13] )
 Markup span at (60:0,60 [5] ) (Accepts:Any) - Parent: Tag block at (35:0,35 [34] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.stree.txt
index 96fd57b5b6..a63149d76b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks5.stree.txt
@@ -1,31 +1,80 @@
-Markup block - Gen<None> - 69 - (0:0,0)
-    Tag block - Gen<TagHelper> - 34 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class="@DateTime.Now"> ... </p>
-        class - DoubleQuotes
-            Markup block - Gen<None> - 13 - (10:0,10)
-                Markup block - Gen<DynAttr:@(10:0,10)> - 13 - (10:0,10)
-                    Expression block - Gen<Expr> - 13 - (10:0,10)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (11:0,11) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        Markup span - Gen<Markup> - [Hello] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
-            HtmlTokenType.Text;[Hello];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<TagHelper> - 34 - (35:0,35) - p - ptaghelper
-        StartTagAndEndTag - <p style='@DateTime.Now'> ... </p>
-        style - SingleQuotes
-            Markup block - Gen<None> - 13 - (45:0,45)
-                Markup block - Gen<DynAttr:@(45:0,45)> - 13 - (45:0,45)
-                    Expression block - Gen<Expr> - 13 - (45:0,45)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (45:0,45) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (46:0,46) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        Markup span - Gen<Markup> - [World] - SpanEditHandler;Accepts:Any - (60:0,60) - Tokens:1
-            HtmlTokenType.Text;[World];
+RazorDocument - [0..69)::69 - [<p class="@DateTime.Now">Hello</p> <p style='@DateTime.Now'>World</p>]
+    MarkupBlock - [0..69)::69
+        MarkupTagHelperElement - [0..34)::34 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..25)::25
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..24)::22 - class - DoubleQuotes - Unbound - [ class="@DateTime.Now"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..23)::13
+                        MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
+                            GenericBlock - [10..23)::13
+                                CSharpCodeBlock - [10..23)::13
+                                    CSharpImplicitExpression - [10..23)::13
+                                        CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [11..23)::12
+                                            CSharpCodeBlock - [11..23)::12
+                                                CSharpExpressionLiteral - [11..23)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [24..25)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [25..30)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+            MarkupTagHelperEndTag - [30..34)::4
+                MarkupTextLiteral - [30..34)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [35..69)::34 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [35..60)::25
+                MarkupTextLiteral - [35..37)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [37..59)::22 - style - SingleQuotes - Unbound - [ style='@DateTime.Now']
+                    MarkupTextLiteral - [37..38)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [38..43)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [44..45)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [45..58)::13
+                        MarkupDynamicAttributeValue - [45..58)::13 - [@DateTime.Now]
+                            GenericBlock - [45..58)::13
+                                CSharpCodeBlock - [45..58)::13
+                                    CSharpImplicitExpression - [45..58)::13
+                                        CSharpTransition - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [46..58)::12
+                                            CSharpCodeBlock - [46..58)::12
+                                                CSharpExpressionLiteral - [46..58)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [58..59)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [59..60)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [60..65)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[World];
+            MarkupTagHelperEndTag - [65..69)::4
+                MarkupTextLiteral - [65..69)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.stree.txt
index 227cfafca6..b58398f164 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks6.stree.txt
@@ -1,113 +1,156 @@
-Markup block - Gen<None> - 171 - (0:0,0)
-    Tag block - Gen<TagHelper> - 85 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class="@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);"> ... </p>
-        class - DoubleQuotes
-            Markup block - Gen<None> - 64 - (10:0,10)
-                Markup block - Gen<DynAttr:@(10:0,10)> - 64 - (10:0,10)
-                    Statement block - Gen<None> - 64 - (10:0,10)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Stmt> - [do { var foo = bar; ] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:13
-                            CSharpTokenType.Keyword;[do];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.LeftBrace;[{];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[var];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[foo];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Assign;[=];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[bar];
-                            CSharpTokenType.Semicolon;[;];
-                            CSharpTokenType.WhiteSpace;[ ];
-                        Markup block - Gen<None> - 16 - (31:0,31)
-                            Tag block - Gen<None> - 6 - (31:0,31)
-                                Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:3
-                                    HtmlTokenType.OpenAngle;[<];
-                                    HtmlTokenType.Text;[text];
-                                    HtmlTokenType.CloseAngle;[>];
-                            Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:None - (37:0,37) - Tokens:1
-                                HtmlTokenType.Text;[Foo];
-                            Tag block - Gen<None> - 7 - (40:0,40)
-                                Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:4
-                                    HtmlTokenType.OpenAngle;[<];
-                                    HtmlTokenType.ForwardSlash;[/];
-                                    HtmlTokenType.Text;[text];
-                                    HtmlTokenType.CloseAngle;[>];
-                        Code span - Gen<Stmt> - [ foo++; } while (foo<bar>);] - SpanEditHandler;Accepts:None - (47:0,47) - Tokens:16
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[foo];
-                            CSharpTokenType.Increment;[++];
-                            CSharpTokenType.Semicolon;[;];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.RightBrace;[}];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Keyword;[while];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.LeftParenthesis;[(];
-                            CSharpTokenType.Identifier;[foo];
-                            CSharpTokenType.LessThan;[<];
-                            CSharpTokenType.Identifier;[bar];
-                            CSharpTokenType.GreaterThan;[>];
-                            CSharpTokenType.RightParenthesis;[)];
-                            CSharpTokenType.Semicolon;[;];
-        Markup span - Gen<Markup> - [Hello] - SpanEditHandler;Accepts:Any - (76:0,76) - Tokens:1
-            HtmlTokenType.Text;[Hello];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (85:0,85) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<TagHelper> - 85 - (86:0,86) - p - ptaghelper
-        StartTagAndEndTag - <p style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);'> ... </p>
-        style - SingleQuotes
-            Markup block - Gen<None> - 64 - (96:0,96)
-                Markup block - Gen<DynAttr:@(96:0,96)> - 64 - (96:0,96)
-                    Statement block - Gen<None> - 64 - (96:0,96)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (96:0,96) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Stmt> - [do { var foo = bar; ] - SpanEditHandler;Accepts:Any - (97:0,97) - Tokens:13
-                            CSharpTokenType.Keyword;[do];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.LeftBrace;[{];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[var];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[foo];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Assign;[=];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[bar];
-                            CSharpTokenType.Semicolon;[;];
-                            CSharpTokenType.WhiteSpace;[ ];
-                        Markup block - Gen<None> - 16 - (117:0,117)
-                            Tag block - Gen<None> - 6 - (117:0,117)
-                                Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (117:0,117) - Tokens:3
-                                    HtmlTokenType.OpenAngle;[<];
-                                    HtmlTokenType.Text;[text];
-                                    HtmlTokenType.CloseAngle;[>];
-                            Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:None - (123:0,123) - Tokens:1
-                                HtmlTokenType.Text;[Foo];
-                            Tag block - Gen<None> - 7 - (126:0,126)
-                                Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (126:0,126) - Tokens:4
-                                    HtmlTokenType.OpenAngle;[<];
-                                    HtmlTokenType.ForwardSlash;[/];
-                                    HtmlTokenType.Text;[text];
-                                    HtmlTokenType.CloseAngle;[>];
-                        Code span - Gen<Stmt> - [ foo++; } while (foo<bar>);] - SpanEditHandler;Accepts:None - (133:0,133) - Tokens:16
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Identifier;[foo];
-                            CSharpTokenType.Increment;[++];
-                            CSharpTokenType.Semicolon;[;];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.RightBrace;[}];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.Keyword;[while];
-                            CSharpTokenType.WhiteSpace;[ ];
-                            CSharpTokenType.LeftParenthesis;[(];
-                            CSharpTokenType.Identifier;[foo];
-                            CSharpTokenType.LessThan;[<];
-                            CSharpTokenType.Identifier;[bar];
-                            CSharpTokenType.GreaterThan;[>];
-                            CSharpTokenType.RightParenthesis;[)];
-                            CSharpTokenType.Semicolon;[;];
-        Markup span - Gen<Markup> - [World] - SpanEditHandler;Accepts:Any - (162:0,162) - Tokens:1
-            HtmlTokenType.Text;[World];
+RazorDocument - [0..171)::171 - [<p class="@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);">Hello</p> <p style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);'>World</p>]
+    MarkupBlock - [0..171)::171
+        MarkupTagHelperElement - [0..85)::85 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..76)::76
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..75)::73 - class - DoubleQuotes - Unbound - [ class="@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..74)::64
+                        MarkupDynamicAttributeValue - [10..74)::64 - [@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);]
+                            GenericBlock - [10..74)::64
+                                CSharpCodeBlock - [10..74)::64
+                                    CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [11..31)::20 - [do { var foo = bar; ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[do];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
+                                        Whitespace;[ ];
+                                        Identifier;[var];
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Whitespace;[ ];
+                                        Assign;[=];
+                                        Whitespace;[ ];
+                                        Identifier;[bar];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                    MarkupBlock - [31..47)::16
+                                        MarkupTagBlock - [31..37)::6 - [<text>]
+                                            MarkupTransition - [31..37)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                        MarkupTextLiteral - [37..40)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            Text;[Foo];
+                                        MarkupTagBlock - [40..47)::7 - [</text>]
+                                            MarkupTransition - [40..47)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                ForwardSlash;[/];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                    CSharpStatementLiteral - [47..74)::27 - [ foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Increment;[++];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                        RightBrace;[}];
+                                        Whitespace;[ ];
+                                        Keyword;[while];
+                                        Whitespace;[ ];
+                                        LeftParenthesis;[(];
+                                        Identifier;[foo];
+                                        LessThan;[<];
+                                        Identifier;[bar];
+                                        GreaterThan;[>];
+                                        RightParenthesis;[)];
+                                        Semicolon;[;];
+                    MarkupTextLiteral - [74..75)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [75..76)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [76..81)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+            MarkupTagHelperEndTag - [81..85)::4
+                MarkupTextLiteral - [81..85)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [85..86)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [86..171)::85 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [86..162)::76
+                MarkupTextLiteral - [86..88)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [88..161)::73 - style - SingleQuotes - Unbound - [ style='@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);']
+                    MarkupTextLiteral - [88..89)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [89..94)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [95..96)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [96..160)::64
+                        MarkupDynamicAttributeValue - [96..160)::64 - [@do { var foo = bar; <text>Foo</text> foo++; } while (foo<bar>);]
+                            GenericBlock - [96..160)::64
+                                CSharpCodeBlock - [96..160)::64
+                                    CSharpTransition - [96..97)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpStatementLiteral - [97..117)::20 - [do { var foo = bar; ] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                                        Keyword;[do];
+                                        Whitespace;[ ];
+                                        LeftBrace;[{];
+                                        Whitespace;[ ];
+                                        Identifier;[var];
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Whitespace;[ ];
+                                        Assign;[=];
+                                        Whitespace;[ ];
+                                        Identifier;[bar];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                    MarkupBlock - [117..133)::16
+                                        MarkupTagBlock - [117..123)::6 - [<text>]
+                                            MarkupTransition - [117..123)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                        MarkupTextLiteral - [123..126)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            Text;[Foo];
+                                        MarkupTagBlock - [126..133)::7 - [</text>]
+                                            MarkupTransition - [126..133)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                                                OpenAngle;[<];
+                                                ForwardSlash;[/];
+                                                Text;[text];
+                                                CloseAngle;[>];
+                                    CSharpStatementLiteral - [133..160)::27 - [ foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        Identifier;[foo];
+                                        Increment;[++];
+                                        Semicolon;[;];
+                                        Whitespace;[ ];
+                                        RightBrace;[}];
+                                        Whitespace;[ ];
+                                        Keyword;[while];
+                                        Whitespace;[ ];
+                                        LeftParenthesis;[(];
+                                        Identifier;[foo];
+                                        LessThan;[<];
+                                        Identifier;[bar];
+                                        GreaterThan;[>];
+                                        RightParenthesis;[)];
+                                        Semicolon;[;];
+                    MarkupTextLiteral - [160..161)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [161..162)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [162..167)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[World];
+            MarkupTagHelperEndTag - [167..171)::4
+                MarkupTextLiteral - [167..171)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.cspans.txt
index b16e21c4e6..c60ad109b8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.cspans.txt
@@ -1,12 +1,12 @@
 Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [13] )
-Code span at (11:0,11 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (10:0,10 [13] )
+Code span at (11:0,11 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [13] )
 Transition span at (32:0,32 [1] ) (Accepts:None) - Parent: Expression block at (32:0,32 [13] )
-Code span at (33:0,33 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (32:0,32 [13] )
+Code span at (33:0,33 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (32:0,32 [13] )
 Markup span at (47:0,47 [12] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [122] )
 Markup span at (59:0,59 [7] ) (Accepts:Any) - Parent: Tag block at (59:0,59 [30] )
 Markup span at (66:0,66 [8] ) (Accepts:Any) - Parent: Markup block at (66:0,66 [22] )
 Transition span at (74:0,74 [1] ) (Accepts:None) - Parent: Expression block at (74:0,74 [13] )
-Code span at (75:0,75 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (74:0,74 [13] )
+Code span at (75:0,75 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (74:0,74 [13] )
 Markup span at (87:0,87 [1] ) (Accepts:Any) - Parent: Markup block at (66:0,66 [22] )
 Markup span at (88:0,88 [1] ) (Accepts:Any) - Parent: Tag block at (59:0,59 [30] )
 Markup span at (89:0,89 [20] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [122] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.stree.txt
index d7b3ddaf13..26ac739f70 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexAttributeTagHelperTagBlocks7.stree.txt
@@ -1,64 +1,109 @@
-Markup block - Gen<None> - 122 - (0:0,0)
-    Tag block - Gen<TagHelper> - 122 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class="@DateTime.Now" style='@DateTime.Now'> ... </p>
-        class - DoubleQuotes
-            Markup block - Gen<None> - 13 - (10:0,10)
-                Markup block - Gen<DynAttr:@(10:0,10)> - 13 - (10:0,10)
-                    Expression block - Gen<Expr> - 13 - (10:0,10)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (11:0,11) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        style - SingleQuotes
-            Markup block - Gen<None> - 13 - (32:0,32)
-                Markup block - Gen<DynAttr:@(32:0,32)> - 13 - (32:0,32)
-                    Expression block - Gen<Expr> - 13 - (32:0,32)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (33:0,33) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        Markup span - Gen<Markup> - [Hello World ] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:4
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 30 - (59:0,59)
-            Markup span - Gen<Markup> - [<strong] - SpanEditHandler;Accepts:Any - (59:0,59) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-            Markup block - Gen<Attr:class, class="@(66:0,66),"@(87:0,87)> - 22 - (66:0,66)
-                Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (66:0,66) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[class];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.DoubleQuote;["];
-                Markup block - Gen<DynAttr:@(74:0,74)> - 13 - (74:0,74)
-                    Expression block - Gen<Expr> - 13 - (74:0,74)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (74:0,74) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (75:0,75) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-                Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (87:0,87) - Tokens:1
-                    HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (88:0,88) - Tokens:1
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [inside of strong tag] - SpanEditHandler;Accepts:Any - (89:0,89) - Tokens:7
-            HtmlTokenType.Text;[inside];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[of];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[tag];
-        Tag block - Gen<None> - 9 - (109:0,109)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (109:0,109) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..122)::122 - [<p class="@DateTime.Now" style='@DateTime.Now'>Hello World <strong class="@DateTime.Now">inside of strong tag</strong></p>]
+    MarkupBlock - [0..122)::122
+        MarkupTagHelperElement - [0..122)::122 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..47)::47
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..24)::22 - class - DoubleQuotes - Unbound - [ class="@DateTime.Now"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..23)::13
+                        MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
+                            GenericBlock - [10..23)::13
+                                CSharpCodeBlock - [10..23)::13
+                                    CSharpImplicitExpression - [10..23)::13
+                                        CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [11..23)::12
+                                            CSharpCodeBlock - [11..23)::12
+                                                CSharpExpressionLiteral - [11..23)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [24..46)::22 - style - SingleQuotes - Unbound - [ style='@DateTime.Now']
+                    MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [25..30)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [32..45)::13
+                        MarkupDynamicAttributeValue - [32..45)::13 - [@DateTime.Now]
+                            GenericBlock - [32..45)::13
+                                CSharpCodeBlock - [32..45)::13
+                                    CSharpImplicitExpression - [32..45)::13
+                                        CSharpTransition - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [33..45)::12
+                                            CSharpCodeBlock - [33..45)::12
+                                                CSharpExpressionLiteral - [33..45)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [45..46)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [46..47)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [47..59)::12 - [Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+            MarkupTagBlock - [59..89)::30 - [<strong class="@DateTime.Now">]
+                MarkupTextLiteral - [59..66)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                MarkupAttributeBlock - [66..88)::22 - [ class="@DateTime.Now"]
+                    MarkupTextLiteral - [66..67)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [67..72)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [73..74)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    GenericBlock - [74..87)::13
+                        MarkupDynamicAttributeValue - [74..87)::13 - [@DateTime.Now]
+                            GenericBlock - [74..87)::13
+                                CSharpCodeBlock - [74..87)::13
+                                    CSharpImplicitExpression - [74..87)::13
+                                        CSharpTransition - [74..75)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [75..87)::12
+                                            CSharpCodeBlock - [75..87)::12
+                                                CSharpExpressionLiteral - [75..87)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [87..88)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [88..89)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [89..109)::20 - [inside of strong tag] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[inside];
+                Whitespace;[ ];
+                Text;[of];
+                Whitespace;[ ];
+                Text;[strong];
+                Whitespace;[ ];
+                Text;[tag];
+            MarkupTagBlock - [109..118)::9 - [</strong>]
+                MarkupTextLiteral - [109..118)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [118..122)::4
+                MarkupTextLiteral - [118..122)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.cspans.txt
index f18c17f6fa..1a81781533 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (3:0,3 [1] ) (Accepts:None) - Parent: Expression block at (3:0,3 [13] )
-Code span at (4:0,4 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (3:0,3 [13] )
+Code span at (4:0,4 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (3:0,3 [13] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.stree.txt
index 88444f9b96..46e6589625 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks1.stree.txt
@@ -1,10 +1,24 @@
-Markup block - Gen<None> - 20 - (0:0,0)
-    Tag block - Gen<TagHelper> - 20 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Expression block - Gen<Expr> - 13 - (3:0,3)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (4:0,4) - Tokens:3
-                CSharpTokenType.Identifier;[DateTime];
-                CSharpTokenType.Dot;[.];
-                CSharpTokenType.Identifier;[Now];
+RazorDocument - [0..20)::20 - [<p>@DateTime.Now</p>]
+    MarkupBlock - [0..20)::20
+        MarkupTagHelperElement - [0..20)::20 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            CSharpCodeBlock - [3..16)::13
+                CSharpImplicitExpression - [3..16)::13
+                    CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [4..16)::12
+                        CSharpCodeBlock - [4..16)::12
+                            CSharpExpressionLiteral - [4..16)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[DateTime];
+                                Dot;[.];
+                                Identifier;[Now];
+            MarkupTagHelperEndTag - [16..20)::4
+                MarkupTextLiteral - [16..20)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks2.stree.txt
index 064a60997a..c7fd688794 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks2.stree.txt
@@ -1,44 +1,65 @@
-Markup block - Gen<None> - 65 - (0:0,0)
-    Tag block - Gen<TagHelper> - 65 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Statement block - Gen<None> - 58 - (3:0,3)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Stmt> - [do { var foo = bar;] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:12
-                CSharpTokenType.Keyword;[do];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.LeftBrace;[{];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[var];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[foo];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Assign;[=];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[bar];
-                CSharpTokenType.Semicolon;[;];
-            Markup block - Gen<None> - 12 - (23:0,23)
-                Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-                Tag block - Gen<TagHelper> - 10 - (24:0,24) - p - ptaghelper
-                    StartTagAndEndTag - <p> ... </p>
-                    Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:1
-                        HtmlTokenType.Text;[Foo];
-                Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (34:0,34) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-            Code span - Gen<Stmt> - [foo++; } while (foo<bar>);] - SpanEditHandler;Accepts:None - (35:0,35) - Tokens:15
-                CSharpTokenType.Identifier;[foo];
-                CSharpTokenType.Increment;[++];
-                CSharpTokenType.Semicolon;[;];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.RightBrace;[}];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Keyword;[while];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.LeftParenthesis;[(];
-                CSharpTokenType.Identifier;[foo];
-                CSharpTokenType.LessThan;[<];
-                CSharpTokenType.Identifier;[bar];
-                CSharpTokenType.GreaterThan;[>];
-                CSharpTokenType.RightParenthesis;[)];
-                CSharpTokenType.Semicolon;[;];
+RazorDocument - [0..65)::65 - [<p>@do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>);</p>]
+    MarkupBlock - [0..65)::65
+        MarkupTagHelperElement - [0..65)::65 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            CSharpCodeBlock - [3..61)::58
+                CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementLiteral - [4..23)::19 - [do { var foo = bar;] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Keyword;[do];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    Semicolon;[;];
+                MarkupBlock - [23..35)::12
+                    MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTagHelperElement - [24..34)::10 - p[StartTagAndEndTag] - ptaghelper
+                        MarkupTagHelperStartTag - [24..27)::3
+                            MarkupTextLiteral - [24..27)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                        MarkupTextLiteral - [27..30)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                        MarkupTagHelperEndTag - [30..34)::4
+                            MarkupTextLiteral - [30..34)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                    MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Whitespace;[ ];
+                CSharpStatementLiteral - [35..61)::26 - [foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                    Identifier;[foo];
+                    Increment;[++];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Whitespace;[ ];
+                    Keyword;[while];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    LessThan;[<];
+                    Identifier;[bar];
+                    GreaterThan;[>];
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+            MarkupTagHelperEndTag - [61..65)::4
+                MarkupTextLiteral - [61..65)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.cspans.txt
index e4151237fe..09807c89f4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.cspans.txt
@@ -1,3 +1,3 @@
 Markup span at (3:0,3 [12] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [32] )
 Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Expression block at (15:0,15 [13] )
-Code span at (16:0,16 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (15:0,15 [13] )
+Code span at (16:0,16 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (15:0,15 [13] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.stree.txt
index 2392a9504d..316334424f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks3.stree.txt
@@ -1,15 +1,29 @@
-Markup block - Gen<None> - 32 - (0:0,0)
-    Tag block - Gen<TagHelper> - 32 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [Hello World ] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:4
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
-            HtmlTokenType.WhiteSpace;[ ];
-        Expression block - Gen<Expr> - 13 - (15:0,15)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (16:0,16) - Tokens:3
-                CSharpTokenType.Identifier;[DateTime];
-                CSharpTokenType.Dot;[.];
-                CSharpTokenType.Identifier;[Now];
+RazorDocument - [0..32)::32 - [<p>Hello World @DateTime.Now</p>]
+    MarkupBlock - [0..32)::32
+        MarkupTagHelperElement - [0..32)::32 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [3..15)::12 - [Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+            CSharpCodeBlock - [15..28)::13
+                CSharpImplicitExpression - [15..28)::13
+                    CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [16..28)::12
+                        CSharpCodeBlock - [16..28)::12
+                            CSharpExpressionLiteral - [16..28)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[DateTime];
+                                Dot;[.];
+                                Identifier;[Now];
+            MarkupTagHelperEndTag - [28..32)::4
+                MarkupTextLiteral - [28..32)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks4.stree.txt
index 0d95d98da5..018a58a688 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks4.stree.txt
@@ -1,49 +1,70 @@
-Markup block - Gen<None> - 77 - (0:0,0)
-    Tag block - Gen<TagHelper> - 77 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [Hello World ] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:4
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
-            HtmlTokenType.WhiteSpace;[ ];
-        Statement block - Gen<None> - 58 - (15:0,15)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Stmt> - [do { var foo = bar;] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:12
-                CSharpTokenType.Keyword;[do];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.LeftBrace;[{];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[var];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[foo];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Assign;[=];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[bar];
-                CSharpTokenType.Semicolon;[;];
-            Markup block - Gen<None> - 12 - (35:0,35)
-                Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-                Tag block - Gen<TagHelper> - 10 - (36:0,36) - p - ptaghelper
-                    StartTagAndEndTag - <p> ... </p>
-                    Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:1
-                        HtmlTokenType.Text;[Foo];
-                Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (46:0,46) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-            Code span - Gen<Stmt> - [foo++; } while (foo<bar>);] - SpanEditHandler;Accepts:None - (47:0,47) - Tokens:15
-                CSharpTokenType.Identifier;[foo];
-                CSharpTokenType.Increment;[++];
-                CSharpTokenType.Semicolon;[;];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.RightBrace;[}];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Keyword;[while];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.LeftParenthesis;[(];
-                CSharpTokenType.Identifier;[foo];
-                CSharpTokenType.LessThan;[<];
-                CSharpTokenType.Identifier;[bar];
-                CSharpTokenType.GreaterThan;[>];
-                CSharpTokenType.RightParenthesis;[)];
-                CSharpTokenType.Semicolon;[;];
+RazorDocument - [0..77)::77 - [<p>Hello World @do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>);</p>]
+    MarkupBlock - [0..77)::77
+        MarkupTagHelperElement - [0..77)::77 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [3..15)::12 - [Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+            CSharpCodeBlock - [15..73)::58
+                CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementLiteral - [16..35)::19 - [do { var foo = bar;] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Keyword;[do];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    Semicolon;[;];
+                MarkupBlock - [35..47)::12
+                    MarkupTextLiteral - [35..36)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTagHelperElement - [36..46)::10 - p[StartTagAndEndTag] - ptaghelper
+                        MarkupTagHelperStartTag - [36..39)::3
+                            MarkupTextLiteral - [36..39)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                        MarkupTextLiteral - [39..42)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                        MarkupTagHelperEndTag - [42..46)::4
+                            MarkupTextLiteral - [42..46)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                    MarkupTextLiteral - [46..47)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Whitespace;[ ];
+                CSharpStatementLiteral - [47..73)::26 - [foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                    Identifier;[foo];
+                    Increment;[++];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Whitespace;[ ];
+                    Keyword;[while];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    LessThan;[<];
+                    Identifier;[bar];
+                    GreaterThan;[>];
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+            MarkupTagHelperEndTag - [73..77)::4
+                MarkupTextLiteral - [73..77)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.cspans.txt
index 256923e315..1f1417e4fd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.cspans.txt
@@ -1,5 +1,5 @@
 Transition span at (3:0,3 [1] ) (Accepts:None) - Parent: Expression block at (3:0,3 [13] )
-Code span at (4:0,4 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (3:0,3 [13] )
+Code span at (4:0,4 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (3:0,3 [13] )
 Markup span at (20:0,20 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [41] )
 Transition span at (24:0,24 [1] ) (Accepts:None) - Parent: Expression block at (24:0,24 [13] )
-Code span at (25:0,25 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (24:0,24 [13] )
+Code span at (25:0,25 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (24:0,24 [13] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.stree.txt
index 4b1ec685e7..665530f01e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks5.stree.txt
@@ -1,21 +1,48 @@
-Markup block - Gen<None> - 41 - (0:0,0)
-    Tag block - Gen<TagHelper> - 20 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Expression block - Gen<Expr> - 13 - (3:0,3)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (4:0,4) - Tokens:3
-                CSharpTokenType.Identifier;[DateTime];
-                CSharpTokenType.Dot;[.];
-                CSharpTokenType.Identifier;[Now];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<TagHelper> - 20 - (21:0,21) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Expression block - Gen<Expr> - 13 - (24:0,24)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (25:0,25) - Tokens:3
-                CSharpTokenType.Identifier;[DateTime];
-                CSharpTokenType.Dot;[.];
-                CSharpTokenType.Identifier;[Now];
+RazorDocument - [0..41)::41 - [<p>@DateTime.Now</p> <p>@DateTime.Now</p>]
+    MarkupBlock - [0..41)::41
+        MarkupTagHelperElement - [0..20)::20 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            CSharpCodeBlock - [3..16)::13
+                CSharpImplicitExpression - [3..16)::13
+                    CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [4..16)::12
+                        CSharpCodeBlock - [4..16)::12
+                            CSharpExpressionLiteral - [4..16)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[DateTime];
+                                Dot;[.];
+                                Identifier;[Now];
+            MarkupTagHelperEndTag - [16..20)::4
+                MarkupTextLiteral - [16..20)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [21..41)::20 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [21..24)::3
+                MarkupTextLiteral - [21..24)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            CSharpCodeBlock - [24..37)::13
+                CSharpImplicitExpression - [24..37)::13
+                    CSharpTransition - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [25..37)::12
+                        CSharpCodeBlock - [25..37)::12
+                            CSharpExpressionLiteral - [25..37)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[DateTime];
+                                Dot;[.];
+                                Identifier;[Now];
+            MarkupTagHelperEndTag - [37..41)::4
+                MarkupTextLiteral - [37..41)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks6.stree.txt
index ea99ab8b27..330c1f53ab 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks6.stree.txt
@@ -1,89 +1,130 @@
-Markup block - Gen<None> - 131 - (0:0,0)
-    Tag block - Gen<TagHelper> - 65 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Statement block - Gen<None> - 58 - (3:0,3)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Stmt> - [do { var foo = bar;] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:12
-                CSharpTokenType.Keyword;[do];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.LeftBrace;[{];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[var];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[foo];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Assign;[=];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[bar];
-                CSharpTokenType.Semicolon;[;];
-            Markup block - Gen<None> - 12 - (23:0,23)
-                Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-                Tag block - Gen<TagHelper> - 10 - (24:0,24) - p - ptaghelper
-                    StartTagAndEndTag - <p> ... </p>
-                    Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:1
-                        HtmlTokenType.Text;[Foo];
-                Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (34:0,34) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-            Code span - Gen<Stmt> - [foo++; } while (foo<bar>);] - SpanEditHandler;Accepts:None - (35:0,35) - Tokens:15
-                CSharpTokenType.Identifier;[foo];
-                CSharpTokenType.Increment;[++];
-                CSharpTokenType.Semicolon;[;];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.RightBrace;[}];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Keyword;[while];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.LeftParenthesis;[(];
-                CSharpTokenType.Identifier;[foo];
-                CSharpTokenType.LessThan;[<];
-                CSharpTokenType.Identifier;[bar];
-                CSharpTokenType.GreaterThan;[>];
-                CSharpTokenType.RightParenthesis;[)];
-                CSharpTokenType.Semicolon;[;];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (65:0,65) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<TagHelper> - 65 - (66:0,66) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Statement block - Gen<None> - 58 - (69:0,69)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (69:0,69) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Stmt> - [do { var foo = bar;] - SpanEditHandler;Accepts:Any - (70:0,70) - Tokens:12
-                CSharpTokenType.Keyword;[do];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.LeftBrace;[{];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[var];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[foo];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Assign;[=];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[bar];
-                CSharpTokenType.Semicolon;[;];
-            Markup block - Gen<None> - 12 - (89:0,89)
-                Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (89:0,89) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-                Tag block - Gen<TagHelper> - 10 - (90:0,90) - p - ptaghelper
-                    StartTagAndEndTag - <p> ... </p>
-                    Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (93:0,93) - Tokens:1
-                        HtmlTokenType.Text;[Foo];
-                Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (100:0,100) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-            Code span - Gen<Stmt> - [foo++; } while (foo<bar>);] - SpanEditHandler;Accepts:None - (101:0,101) - Tokens:15
-                CSharpTokenType.Identifier;[foo];
-                CSharpTokenType.Increment;[++];
-                CSharpTokenType.Semicolon;[;];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.RightBrace;[}];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Keyword;[while];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.LeftParenthesis;[(];
-                CSharpTokenType.Identifier;[foo];
-                CSharpTokenType.LessThan;[<];
-                CSharpTokenType.Identifier;[bar];
-                CSharpTokenType.GreaterThan;[>];
-                CSharpTokenType.RightParenthesis;[)];
-                CSharpTokenType.Semicolon;[;];
+RazorDocument - [0..131)::131 - [<p>@do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>);</p> <p>@do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>);</p>]
+    MarkupBlock - [0..131)::131
+        MarkupTagHelperElement - [0..65)::65 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            CSharpCodeBlock - [3..61)::58
+                CSharpTransition - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementLiteral - [4..23)::19 - [do { var foo = bar;] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Keyword;[do];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    Semicolon;[;];
+                MarkupBlock - [23..35)::12
+                    MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTagHelperElement - [24..34)::10 - p[StartTagAndEndTag] - ptaghelper
+                        MarkupTagHelperStartTag - [24..27)::3
+                            MarkupTextLiteral - [24..27)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                        MarkupTextLiteral - [27..30)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                        MarkupTagHelperEndTag - [30..34)::4
+                            MarkupTextLiteral - [30..34)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                    MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Whitespace;[ ];
+                CSharpStatementLiteral - [35..61)::26 - [foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                    Identifier;[foo];
+                    Increment;[++];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Whitespace;[ ];
+                    Keyword;[while];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    LessThan;[<];
+                    Identifier;[bar];
+                    GreaterThan;[>];
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+            MarkupTagHelperEndTag - [61..65)::4
+                MarkupTextLiteral - [61..65)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [65..66)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [66..131)::65 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [66..69)::3
+                MarkupTextLiteral - [66..69)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            CSharpCodeBlock - [69..127)::58
+                CSharpTransition - [69..70)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementLiteral - [70..89)::19 - [do { var foo = bar;] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Keyword;[do];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    Semicolon;[;];
+                MarkupBlock - [89..101)::12
+                    MarkupTextLiteral - [89..90)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTagHelperElement - [90..100)::10 - p[StartTagAndEndTag] - ptaghelper
+                        MarkupTagHelperStartTag - [90..93)::3
+                            MarkupTextLiteral - [90..93)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                        MarkupTextLiteral - [93..96)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                        MarkupTagHelperEndTag - [96..100)::4
+                            MarkupTextLiteral - [96..100)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                    MarkupTextLiteral - [100..101)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Whitespace;[ ];
+                CSharpStatementLiteral - [101..127)::26 - [foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                    Identifier;[foo];
+                    Increment;[++];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Whitespace;[ ];
+                    Keyword;[while];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    LessThan;[<];
+                    Identifier;[bar];
+                    GreaterThan;[>];
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+            MarkupTagHelperEndTag - [127..131)::4
+                MarkupTextLiteral - [127..131)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.cspans.txt
index 76946501f0..289b98f67f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.cspans.txt
@@ -1,9 +1,9 @@
 Markup span at (3:0,3 [6] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [77] )
 Transition span at (9:0,9 [1] ) (Accepts:None) - Parent: Expression block at (9:0,9 [13] )
-Code span at (10:0,10 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (9:0,9 [13] )
+Code span at (10:0,10 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (9:0,9 [13] )
 Markup span at (22:0,22 [8] ) (Accepts:Any) - Parent: Tag block at (22:0,22 [8] )
 Markup span at (30:0,30 [10] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [77] )
 Transition span at (40:0,40 [1] ) (Accepts:None) - Parent: Expression block at (40:0,40 [13] )
-Code span at (41:0,41 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (40:0,40 [13] )
+Code span at (41:0,41 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (40:0,40 [13] )
 Markup span at (53:0,53 [11] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [77] )
 Markup span at (64:0,64 [9] ) (Accepts:Any) - Parent: Tag block at (64:0,64 [9] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.stree.txt
index 65a743ab54..3e4acaf160 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks7.stree.txt
@@ -1,41 +1,58 @@
-Markup block - Gen<None> - 77 - (0:0,0)
-    Tag block - Gen<TagHelper> - 77 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [Hello ] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:2
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-        Expression block - Gen<Expr> - 13 - (9:0,9)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (10:0,10) - Tokens:3
-                CSharpTokenType.Identifier;[DateTime];
-                CSharpTokenType.Dot;[.];
-                CSharpTokenType.Identifier;[Now];
-        Tag block - Gen<None> - 8 - (22:0,22)
-            Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [inside of ] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:4
-            HtmlTokenType.Text;[inside];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[of];
-            HtmlTokenType.WhiteSpace;[ ];
-        Expression block - Gen<Expr> - 13 - (40:0,40)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (41:0,41) - Tokens:3
-                CSharpTokenType.Identifier;[DateTime];
-                CSharpTokenType.Dot;[.];
-                CSharpTokenType.Identifier;[Now];
-        Markup span - Gen<Markup> - [ strong tag] - SpanEditHandler;Accepts:Any - (53:0,53) - Tokens:4
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[tag];
-        Tag block - Gen<None> - 9 - (64:0,64)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (64:0,64) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..77)::77 - [<p>Hello @DateTime.Now<strong>inside of @DateTime.Now strong tag</strong></p>]
+    MarkupBlock - [0..77)::77
+        MarkupTagHelperElement - [0..77)::77 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [3..9)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+            CSharpCodeBlock - [9..22)::13
+                CSharpImplicitExpression - [9..22)::13
+                    CSharpTransition - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [10..22)::12
+                        CSharpCodeBlock - [10..22)::12
+                            CSharpExpressionLiteral - [10..22)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[DateTime];
+                                Dot;[.];
+                                Identifier;[Now];
+            MarkupTagBlock - [22..30)::8 - [<strong>]
+                MarkupTextLiteral - [22..30)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [30..40)::10 - [inside of ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[inside];
+                Whitespace;[ ];
+                Text;[of];
+                Whitespace;[ ];
+            CSharpCodeBlock - [40..53)::13
+                CSharpImplicitExpression - [40..53)::13
+                    CSharpTransition - [40..41)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [41..53)::12
+                        CSharpCodeBlock - [41..53)::12
+                            CSharpExpressionLiteral - [41..53)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[DateTime];
+                                Dot;[.];
+                                Identifier;[Now];
+            MarkupTextLiteral - [53..64)::11 - [ strong tag] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                Text;[strong];
+                Whitespace;[ ];
+                Text;[tag];
+            MarkupTagBlock - [64..73)::9 - [</strong>]
+                MarkupTextLiteral - [64..73)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [73..77)::4
+                MarkupTextLiteral - [73..77)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks8.stree.txt
index 0a629daead..41311d3166 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesComplexTagHelperTagBlocks8.stree.txt
@@ -1,109 +1,140 @@
-Markup block - Gen<None> - 167 - (0:0,0)
-    Tag block - Gen<TagHelper> - 167 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [Hello ] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:2
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-        Statement block - Gen<None> - 58 - (9:0,9)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Stmt> - [do { var foo = bar;] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:12
-                CSharpTokenType.Keyword;[do];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.LeftBrace;[{];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[var];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[foo];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Assign;[=];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[bar];
-                CSharpTokenType.Semicolon;[;];
-            Markup block - Gen<None> - 12 - (29:0,29)
-                Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-                Tag block - Gen<TagHelper> - 10 - (30:0,30) - p - ptaghelper
-                    StartTagAndEndTag - <p> ... </p>
-                    Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1
-                        HtmlTokenType.Text;[Foo];
-                Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-            Code span - Gen<Stmt> - [foo++; } while (foo<bar>);] - SpanEditHandler;Accepts:None - (41:0,41) - Tokens:15
-                CSharpTokenType.Identifier;[foo];
-                CSharpTokenType.Increment;[++];
-                CSharpTokenType.Semicolon;[;];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.RightBrace;[}];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Keyword;[while];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.LeftParenthesis;[(];
-                CSharpTokenType.Identifier;[foo];
-                CSharpTokenType.LessThan;[<];
-                CSharpTokenType.Identifier;[bar];
-                CSharpTokenType.GreaterThan;[>];
-                CSharpTokenType.RightParenthesis;[)];
-                CSharpTokenType.Semicolon;[;];
-        Tag block - Gen<None> - 8 - (67:0,67)
-            Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (67:0,67) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [inside of ] - SpanEditHandler;Accepts:Any - (75:0,75) - Tokens:4
-            HtmlTokenType.Text;[inside];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[of];
-            HtmlTokenType.WhiteSpace;[ ];
-        Statement block - Gen<None> - 58 - (85:0,85)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (85:0,85) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Stmt> - [do { var foo = bar;] - SpanEditHandler;Accepts:Any - (86:0,86) - Tokens:12
-                CSharpTokenType.Keyword;[do];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.LeftBrace;[{];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[var];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[foo];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Assign;[=];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Identifier;[bar];
-                CSharpTokenType.Semicolon;[;];
-            Markup block - Gen<None> - 12 - (105:0,105)
-                Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (105:0,105) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-                Tag block - Gen<TagHelper> - 10 - (106:0,106) - p - ptaghelper
-                    StartTagAndEndTag - <p> ... </p>
-                    Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (109:0,109) - Tokens:1
-                        HtmlTokenType.Text;[Foo];
-                Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (116:0,116) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-            Code span - Gen<Stmt> - [foo++; } while (foo<bar>);] - SpanEditHandler;Accepts:None - (117:0,117) - Tokens:15
-                CSharpTokenType.Identifier;[foo];
-                CSharpTokenType.Increment;[++];
-                CSharpTokenType.Semicolon;[;];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.RightBrace;[}];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.Keyword;[while];
-                CSharpTokenType.WhiteSpace;[ ];
-                CSharpTokenType.LeftParenthesis;[(];
-                CSharpTokenType.Identifier;[foo];
-                CSharpTokenType.LessThan;[<];
-                CSharpTokenType.Identifier;[bar];
-                CSharpTokenType.GreaterThan;[>];
-                CSharpTokenType.RightParenthesis;[)];
-                CSharpTokenType.Semicolon;[;];
-        Markup span - Gen<Markup> - [ strong tag] - SpanEditHandler;Accepts:Any - (143:0,143) - Tokens:4
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[tag];
-        Tag block - Gen<None> - 9 - (154:0,154)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (154:0,154) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..167)::167 - [<p>Hello @do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>);<strong>inside of @do { var foo = bar; <p>Foo</p> foo++; } while (foo<bar>); strong tag</strong></p>]
+    MarkupBlock - [0..167)::167
+        MarkupTagHelperElement - [0..167)::167 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [3..9)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+            CSharpCodeBlock - [9..67)::58
+                CSharpTransition - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementLiteral - [10..29)::19 - [do { var foo = bar;] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Keyword;[do];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    Semicolon;[;];
+                MarkupBlock - [29..41)::12
+                    MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTagHelperElement - [30..40)::10 - p[StartTagAndEndTag] - ptaghelper
+                        MarkupTagHelperStartTag - [30..33)::3
+                            MarkupTextLiteral - [30..33)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                        MarkupTextLiteral - [33..36)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                        MarkupTagHelperEndTag - [36..40)::4
+                            MarkupTextLiteral - [36..40)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                    MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Whitespace;[ ];
+                CSharpStatementLiteral - [41..67)::26 - [foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                    Identifier;[foo];
+                    Increment;[++];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Whitespace;[ ];
+                    Keyword;[while];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    LessThan;[<];
+                    Identifier;[bar];
+                    GreaterThan;[>];
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+            MarkupTagBlock - [67..75)::8 - [<strong>]
+                MarkupTextLiteral - [67..75)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [75..85)::10 - [inside of ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[inside];
+                Whitespace;[ ];
+                Text;[of];
+                Whitespace;[ ];
+            CSharpCodeBlock - [85..143)::58
+                CSharpTransition - [85..86)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementLiteral - [86..105)::19 - [do { var foo = bar;] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                    Keyword;[do];
+                    Whitespace;[ ];
+                    LeftBrace;[{];
+                    Whitespace;[ ];
+                    Identifier;[var];
+                    Whitespace;[ ];
+                    Identifier;[foo];
+                    Whitespace;[ ];
+                    Assign;[=];
+                    Whitespace;[ ];
+                    Identifier;[bar];
+                    Semicolon;[;];
+                MarkupBlock - [105..117)::12
+                    MarkupTextLiteral - [105..106)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTagHelperElement - [106..116)::10 - p[StartTagAndEndTag] - ptaghelper
+                        MarkupTagHelperStartTag - [106..109)::3
+                            MarkupTextLiteral - [106..109)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                Text;[p];
+                                CloseAngle;[>];
+                        MarkupTextLiteral - [109..112)::3 - [Foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[Foo];
+                        MarkupTagHelperEndTag - [112..116)::4
+                            MarkupTextLiteral - [112..116)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                OpenAngle;[<];
+                                ForwardSlash;[/];
+                                Text;[p];
+                                CloseAngle;[>];
+                    MarkupTextLiteral - [116..117)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:None
+                        Whitespace;[ ];
+                CSharpStatementLiteral - [117..143)::26 - [foo++; } while (foo<bar>);] - Gen<Stmt> - SpanEditHandler;Accepts:None
+                    Identifier;[foo];
+                    Increment;[++];
+                    Semicolon;[;];
+                    Whitespace;[ ];
+                    RightBrace;[}];
+                    Whitespace;[ ];
+                    Keyword;[while];
+                    Whitespace;[ ];
+                    LeftParenthesis;[(];
+                    Identifier;[foo];
+                    LessThan;[<];
+                    Identifier;[bar];
+                    GreaterThan;[>];
+                    RightParenthesis;[)];
+                    Semicolon;[;];
+            MarkupTextLiteral - [143..154)::11 - [ strong tag] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                Text;[strong];
+                Whitespace;[ ];
+                Text;[tag];
+            MarkupTagBlock - [154..163)::9 - [</strong>]
+                MarkupTextLiteral - [154..163)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [163..167)::4
+                MarkupTextLiteral - [163..167)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.stree.txt
index 217f8e857d..6b15f8da58 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks1.stree.txt
@@ -1,23 +1,66 @@
-Markup block - Gen<None> - 66 - (0:0,0)
-    Tag block - Gen<TagHelper> - 66 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p      class="     foo"    style="   color :  red  ;   "    > ... </p>
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [     foo] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:2
-                HtmlTokenType.WhiteSpace;[     ];
-                HtmlTokenType.Text;[foo];
-        style - DoubleQuotes
-            Markup block - Gen<None> - 21 - (35:0,35)
-                Markup span - Gen<Markup> - [   color] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[   ];
-                    HtmlTokenType.Text;[color];
-                Markup span - Gen<Markup> - [ :] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[:];
-                Markup span - Gen<Markup> - [  red] - SpanEditHandler;Accepts:Any - (45:0,45) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[  ];
-                    HtmlTokenType.Text;[red];
-                Markup span - Gen<Markup> - [  ;] - SpanEditHandler;Accepts:Any - (50:0,50) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[  ];
-                    HtmlTokenType.Text;[;];
-                Markup span - Gen<Markup> - [   ] - SpanEditHandler;Accepts:Any - (53:0,53) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[   ];
+RazorDocument - [0..66)::66 - [<p      class="     foo"    style="   color :  red  ;   "    ></p>]
+    MarkupBlock - [0..66)::66
+        MarkupTagHelperElement - [0..66)::66 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..62)::62
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..24)::22 - class - DoubleQuotes - Unbound - [      class="     foo"]
+                    MarkupTextLiteral - [2..8)::6 - [      ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[      ];
+                    MarkupTextLiteral - [8..13)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [15..23)::8
+                        MarkupLiteralAttributeValue - [15..23)::8 - [     foo]
+                            MarkupTextLiteral - [15..20)::5 - [     ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[     ];
+                            MarkupTextLiteral - [20..23)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [24..57)::33 - style - DoubleQuotes - Unbound - [    style="   color :  red  ;   "]
+                    MarkupTextLiteral - [24..28)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[    ];
+                    MarkupTextLiteral - [28..33)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [34..35)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [35..56)::21
+                        MarkupLiteralAttributeValue - [35..43)::8 - [   color]
+                            MarkupTextLiteral - [35..38)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[   ];
+                            MarkupTextLiteral - [38..43)::5 - [color] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color];
+                        MarkupLiteralAttributeValue - [43..45)::2 - [ :]
+                            MarkupTextLiteral - [43..44)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [44..45)::1 - [:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[:];
+                        MarkupLiteralAttributeValue - [45..50)::5 - [  red]
+                            MarkupTextLiteral - [45..47)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[  ];
+                            MarkupTextLiteral - [47..50)::3 - [red] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[red];
+                        MarkupLiteralAttributeValue - [50..53)::3 - [  ;]
+                            MarkupTextLiteral - [50..52)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[  ];
+                            MarkupTextLiteral - [52..53)::1 - [;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[;];
+                        MarkupLiteralAttributeValue - [53..56)::3 - [   ]
+                            MarkupTextLiteral - [53..56)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[   ];
+                    MarkupTextLiteral - [56..57)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [57..62)::5 - [    >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[    ];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [62..66)::4
+                MarkupTextLiteral - [62..66)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.stree.txt
index dcbff8cf35..6faa9a4582 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks2.stree.txt
@@ -1,27 +1,70 @@
-Markup block - Gen<None> - 77 - (0:0,0)
-    Tag block - Gen<TagHelper> - 77 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p      class="     foo"    style="   color :  red  ;   "    > ... </p>
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [     foo] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:2
-                HtmlTokenType.WhiteSpace;[     ];
-                HtmlTokenType.Text;[foo];
-        style - DoubleQuotes
-            Markup block - Gen<None> - 21 - (35:0,35)
-                Markup span - Gen<Markup> - [   color] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[   ];
-                    HtmlTokenType.Text;[color];
-                Markup span - Gen<Markup> - [ :] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[:];
-                Markup span - Gen<Markup> - [  red] - SpanEditHandler;Accepts:Any - (45:0,45) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[  ];
-                    HtmlTokenType.Text;[red];
-                Markup span - Gen<Markup> - [  ;] - SpanEditHandler;Accepts:Any - (50:0,50) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[  ];
-                    HtmlTokenType.Text;[;];
-                Markup span - Gen<Markup> - [   ] - SpanEditHandler;Accepts:Any - (53:0,53) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[   ];
-        Markup span - Gen<Markup> - [Hello World] - SpanEditHandler;Accepts:Any - (62:0,62) - Tokens:3
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
+RazorDocument - [0..77)::77 - [<p      class="     foo"    style="   color :  red  ;   "    >Hello World</p>]
+    MarkupBlock - [0..77)::77
+        MarkupTagHelperElement - [0..77)::77 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..62)::62
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..24)::22 - class - DoubleQuotes - Unbound - [      class="     foo"]
+                    MarkupTextLiteral - [2..8)::6 - [      ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[      ];
+                    MarkupTextLiteral - [8..13)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [15..23)::8
+                        MarkupLiteralAttributeValue - [15..23)::8 - [     foo]
+                            MarkupTextLiteral - [15..20)::5 - [     ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[     ];
+                            MarkupTextLiteral - [20..23)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [24..57)::33 - style - DoubleQuotes - Unbound - [    style="   color :  red  ;   "]
+                    MarkupTextLiteral - [24..28)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[    ];
+                    MarkupTextLiteral - [28..33)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [34..35)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [35..56)::21
+                        MarkupLiteralAttributeValue - [35..43)::8 - [   color]
+                            MarkupTextLiteral - [35..38)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[   ];
+                            MarkupTextLiteral - [38..43)::5 - [color] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color];
+                        MarkupLiteralAttributeValue - [43..45)::2 - [ :]
+                            MarkupTextLiteral - [43..44)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [44..45)::1 - [:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[:];
+                        MarkupLiteralAttributeValue - [45..50)::5 - [  red]
+                            MarkupTextLiteral - [45..47)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[  ];
+                            MarkupTextLiteral - [47..50)::3 - [red] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[red];
+                        MarkupLiteralAttributeValue - [50..53)::3 - [  ;]
+                            MarkupTextLiteral - [50..52)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[  ];
+                            MarkupTextLiteral - [52..53)::1 - [;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[;];
+                        MarkupLiteralAttributeValue - [53..56)::3 - [   ]
+                            MarkupTextLiteral - [53..56)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[   ];
+                    MarkupTextLiteral - [56..57)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [57..62)::5 - [    >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[    ];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [62..73)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [73..77)::4
+                MarkupTextLiteral - [73..77)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.stree.txt
index f8e29d153c..9e987e23ad 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesOddlySpacedTagHelperTagBlocks3.stree.txt
@@ -1,25 +1,74 @@
-Markup block - Gen<None> - 73 - (0:0,0)
-    Tag block - Gen<TagHelper> - 34 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p     class="   foo  " > ... </p>
-        class - DoubleQuotes
-            Markup block - Gen<None> - 8 - (14:0,14)
-                Markup span - Gen<Markup> - [   foo] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[   ];
-                    HtmlTokenType.Text;[foo];
-                Markup span - Gen<Markup> - [  ] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[  ];
-        Markup span - Gen<Markup> - [Hello] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
-            HtmlTokenType.Text;[Hello];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<TagHelper> - 38 - (35:0,35) - p - ptaghelper
-        StartTagAndEndTag - <p    style="  color:red; " > ... </p>
-        style - DoubleQuotes
-            Markup block - Gen<None> - 13 - (48:0,48)
-                Markup span - Gen<Markup> - [  color:red;] - SpanEditHandler;Accepts:Any - (48:0,48) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[  ];
-                    HtmlTokenType.Text;[color:red;];
-                Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (60:0,60) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-        Markup span - Gen<Markup> - [World] - SpanEditHandler;Accepts:Any - (64:0,64) - Tokens:1
-            HtmlTokenType.Text;[World];
+RazorDocument - [0..73)::73 - [<p     class="   foo  " >Hello</p> <p    style="  color:red; " >World</p>]
+    MarkupBlock - [0..73)::73
+        MarkupTagHelperElement - [0..34)::34 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..25)::25
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..23)::21 - class - DoubleQuotes - Unbound - [     class="   foo  "]
+                    MarkupTextLiteral - [2..7)::5 - [     ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[     ];
+                    MarkupTextLiteral - [7..12)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [14..22)::8
+                        MarkupLiteralAttributeValue - [14..20)::6 - [   foo]
+                            MarkupTextLiteral - [14..17)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[   ];
+                            MarkupTextLiteral - [17..20)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                        MarkupLiteralAttributeValue - [20..22)::2 - [  ]
+                            MarkupTextLiteral - [20..22)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[  ];
+                    MarkupTextLiteral - [22..23)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [23..25)::2 - [ >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [25..30)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+            MarkupTagHelperEndTag - [30..34)::4
+                MarkupTextLiteral - [30..34)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [35..73)::38 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [35..64)::29
+                MarkupTextLiteral - [35..37)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [37..62)::25 - style - DoubleQuotes - Unbound - [    style="  color:red; "]
+                    MarkupTextLiteral - [37..41)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[    ];
+                    MarkupTextLiteral - [41..46)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [47..48)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [48..61)::13
+                        MarkupLiteralAttributeValue - [48..60)::12 - [  color:red;]
+                            MarkupTextLiteral - [48..50)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[  ];
+                            MarkupTextLiteral - [50..60)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                        MarkupLiteralAttributeValue - [60..61)::1 - [ ]
+                            MarkupTextLiteral - [60..61)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                    MarkupTextLiteral - [61..62)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [62..64)::2 - [ >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [64..69)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[World];
+            MarkupTagHelperEndTag - [69..73)::4
+                MarkupTextLiteral - [69..73)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks1.stree.txt
index 6e1b6c4d21..486c8312a7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks1.stree.txt
@@ -1,3 +1,14 @@
-Markup block - Gen<None> - 7 - (0:0,0)
-    Tag block - Gen<TagHelper> - 7 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
+RazorDocument - [0..7)::7 - [<p></p>]
+    MarkupBlock - [0..7)::7
+        MarkupTagHelperElement - [0..7)::7 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [3..7)::4
+                MarkupTextLiteral - [3..7)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks2.stree.txt
index 9342e8c17f..0700f899e9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks2.stree.txt
@@ -1,7 +1,18 @@
-Markup block - Gen<None> - 18 - (0:0,0)
-    Tag block - Gen<TagHelper> - 18 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [Hello World] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:3
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
+RazorDocument - [0..18)::18 - [<p>Hello World</p>]
+    MarkupBlock - [0..18)::18
+        MarkupTagHelperElement - [0..18)::18 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [3..14)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [14..18)::4
+                MarkupTextLiteral - [14..18)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks3.stree.txt
index 416fb1eea7..7bad5ee372 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks3.stree.txt
@@ -1,11 +1,32 @@
-Markup block - Gen<None> - 25 - (0:0,0)
-    Tag block - Gen<TagHelper> - 12 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [Hello] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
-            HtmlTokenType.Text;[Hello];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<TagHelper> - 12 - (13:0,13) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [World] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-            HtmlTokenType.Text;[World];
+RazorDocument - [0..25)::25 - [<p>Hello</p> <p>World</p>]
+    MarkupBlock - [0..25)::25
+        MarkupTagHelperElement - [0..12)::12 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [3..8)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+            MarkupTagHelperEndTag - [8..12)::4
+                MarkupTextLiteral - [8..12)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [13..25)::12 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [13..16)::3
+                MarkupTextLiteral - [13..16)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [16..21)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[World];
+            MarkupTagHelperEndTag - [21..25)::4
+                MarkupTextLiteral - [21..25)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks4.stree.txt
index abfc92081e..4851c15aa5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesPlainTagHelperTagBlocks4.stree.txt
@@ -1,27 +1,38 @@
-Markup block - Gen<None> - 56 - (0:0,0)
-    Tag block - Gen<TagHelper> - 56 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [Hello World ] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:4
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 8 - (15:0,15)
-            Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [inside of strong tag] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:7
-            HtmlTokenType.Text;[inside];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[of];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[tag];
-        Tag block - Gen<None> - 9 - (43:0,43)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..56)::56 - [<p>Hello World <strong>inside of strong tag</strong></p>]
+    MarkupBlock - [0..56)::56
+        MarkupTagHelperElement - [0..56)::56 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [3..15)::12 - [Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+            MarkupTagBlock - [15..23)::8 - [<strong>]
+                MarkupTextLiteral - [15..23)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [23..43)::20 - [inside of strong tag] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[inside];
+                Whitespace;[ ];
+                Text;[of];
+                Whitespace;[ ];
+                Text;[strong];
+                Whitespace;[ ];
+                Text;[tag];
+            MarkupTagBlock - [43..52)::9 - [</strong>]
+                MarkupTextLiteral - [43..52)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [52..56)::4
+                MarkupTextLiteral - [52..56)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers1.stree.txt
index 97718317b9..3def95a579 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers1.stree.txt
@@ -1,11 +1,22 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<TagHelper> - 31 - (0:0,0) - script - scripttaghelper
-        StartTagAndEndTag - <script> ... </script>
-        Markup span - Gen<Markup> - [<script></foo>] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:7
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..31)::31 - [<script><script></foo></script>]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - script[StartTagAndEndTag] - scripttaghelper
+            MarkupTagHelperStartTag - [0..8)::8
+                MarkupTextLiteral - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[script];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [8..22)::14 - [<script></foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+                CloseAngle;[>];
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [22..31)::9
+                MarkupTextLiteral - [22..31)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[script];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers2.stree.txt
index bf69eb2298..22c1ec8637 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers2.stree.txt
@@ -1,15 +1,26 @@
-Markup block - Gen<None> - 40 - (0:0,0)
-    Tag block - Gen<TagHelper> - 40 - (0:0,0) - script - scripttaghelper
-        StartTagAndEndTag - <script> ... </script>
-        Markup span - Gen<Markup> - [Hello World <div></div>] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:11
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..40)::40 - [<script>Hello World <div></div></script>]
+    MarkupBlock - [0..40)::40
+        MarkupTagHelperElement - [0..40)::40 - script[StartTagAndEndTag] - scripttaghelper
+            MarkupTagHelperStartTag - [0..8)::8
+                MarkupTextLiteral - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[script];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [8..31)::23 - [Hello World <div></div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [31..40)::9
+                MarkupTextLiteral - [31..40)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[script];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers3.stree.txt
index ac2d4ce18f..0eac8b8ea7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers3.stree.txt
@@ -1,21 +1,52 @@
-Markup block - Gen<None> - 53 - (0:0,0)
-    Tag block - Gen<TagHelper> - 29 - (0:0,0) - script - scripttaghelper
-        StartTagAndEndTag - <script> ... </script>
-        Markup span - Gen<Markup> - [Hel<p>lo</p>] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:9
-            HtmlTokenType.Text;[Hel];
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-            HtmlTokenType.Text;[lo];
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<TagHelper> - 23 - (30:0,30) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<TagHelper> - 16 - (33:0,33) - div - divtaghelper
-            StartTagAndEndTag - <div> ... </div>
-            Markup span - Gen<Markup> - [World] - SpanEditHandler;Accepts:Any - (38:0,38) - Tokens:1
-                HtmlTokenType.Text;[World];
+RazorDocument - [0..53)::53 - [<script>Hel<p>lo</p></script> <p><div>World</div></p>]
+    MarkupBlock - [0..53)::53
+        MarkupTagHelperElement - [0..29)::29 - script[StartTagAndEndTag] - scripttaghelper
+            MarkupTagHelperStartTag - [0..8)::8
+                MarkupTextLiteral - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[script];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [8..20)::12 - [Hel<p>lo</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hel];
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+                Text;[lo];
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [20..29)::9
+                MarkupTextLiteral - [20..29)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[script];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [30..53)::23 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [30..33)::3
+                MarkupTextLiteral - [30..33)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [33..49)::16 - div[StartTagAndEndTag] - divtaghelper
+                MarkupTagHelperStartTag - [33..38)::5
+                    MarkupTextLiteral - [33..38)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[div];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [38..43)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[World];
+                MarkupTagHelperEndTag - [43..49)::6
+                    MarkupTextLiteral - [43..49)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[div];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [49..53)::4
+                MarkupTextLiteral - [49..53)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers4.stree.txt
index 2bc0cce4d1..71cb1a852b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers4.stree.txt
@@ -1,26 +1,47 @@
-Markup block - Gen<None> - 75 - (0:0,0)
-    Tag block - Gen<TagHelper> - 39 - (0:0,0) - script - scripttaghelper
-        StartTagAndEndTag - <script> ... </script>
-        Markup span - Gen<Markup> - [Hel<strong>lo</strong>] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:9
-            HtmlTokenType.Text;[Hel];
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.CloseAngle;[>];
-            HtmlTokenType.Text;[lo];
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<TagHelper> - 35 - (40:0,40) - script - scripttaghelper
-        StartTagAndEndTag - <script> ... </script>
-        Markup span - Gen<Markup> - [<span>World</span>] - SpanEditHandler;Accepts:Any - (48:0,48) - Tokens:8
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[span];
-            HtmlTokenType.CloseAngle;[>];
-            HtmlTokenType.Text;[World];
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[span];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..75)::75 - [<script>Hel<strong>lo</strong></script> <script><span>World</span></script>]
+    MarkupBlock - [0..75)::75
+        MarkupTagHelperElement - [0..39)::39 - script[StartTagAndEndTag] - scripttaghelper
+            MarkupTagHelperStartTag - [0..8)::8
+                MarkupTextLiteral - [0..8)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[script];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [8..30)::22 - [Hel<strong>lo</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hel];
+                OpenAngle;[<];
+                Text;[strong];
+                CloseAngle;[>];
+                Text;[lo];
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [30..39)::9
+                MarkupTextLiteral - [30..39)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[script];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [39..40)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [40..75)::35 - script[StartTagAndEndTag] - scripttaghelper
+            MarkupTagHelperStartTag - [40..48)::8
+                MarkupTextLiteral - [40..48)::8 - [<script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[script];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [48..66)::18 - [<span>World</span>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[span];
+                CloseAngle;[>];
+                Text;[World];
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[span];
+                CloseAngle;[>];
+            MarkupTagHelperEndTag - [66..75)::9
+                MarkupTextLiteral - [66..75)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[script];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.stree.txt
index 5c76ab01e5..783eb3ceb1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers5.stree.txt
@@ -1,9 +1,39 @@
-Markup block - Gen<None> - 41 - (0:0,0)
-    Tag block - Gen<TagHelper> - 41 - (0:0,0) - script - scripttaghelper
-        SelfClosing - <script class="foo" style="color:red;" />
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [foo] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-                HtmlTokenType.Text;[foo];
-        style - DoubleQuotes
-            Markup span - Gen<Markup> - [color:red;] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:1
-                HtmlTokenType.Text;[color:red;];
+RazorDocument - [0..41)::41 - [<script class="foo" style="color:red;" />]
+    MarkupBlock - [0..41)::41
+        MarkupTagHelperElement - [0..41)::41 - script[SelfClosing] - scripttaghelper
+            MarkupTagHelperStartTag - [0..41)::41
+                MarkupTextLiteral - [0..7)::7 - [<script] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[script];
+                MarkupTagHelperAttribute - [7..19)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..13)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [15..18)::3
+                        MarkupLiteralAttributeValue - [15..18)::3 - [foo]
+                            MarkupTextLiteral - [15..18)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [19..38)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                    MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [20..25)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [27..37)::10
+                        MarkupLiteralAttributeValue - [27..37)::10 - [color:red;]
+                            MarkupTextLiteral - [27..37)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                    MarkupTextLiteral - [37..38)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [38..41)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.stree.txt
index 8a460e1b8a..87b4040c2d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers6.stree.txt
@@ -1,17 +1,61 @@
-Markup block - Gen<None> - 67 - (0:0,0)
-    Tag block - Gen<TagHelper> - 67 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [Hello ] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:2
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<TagHelper> - 48 - (9:0,9) - script - scripttaghelper
-            StartTagAndEndTag - <script class="foo" style="color:red;"> ... </script>
-            class - DoubleQuotes
-                Markup span - Gen<Markup> - [foo] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
-                    HtmlTokenType.Text;[foo];
-            style - DoubleQuotes
-                Markup span - Gen<Markup> - [color:red;] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:1
-                    HtmlTokenType.Text;[color:red;];
-        Markup span - Gen<Markup> - [ World] - SpanEditHandler;Accepts:Any - (57:0,57) - Tokens:2
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
+RazorDocument - [0..67)::67 - [<p>Hello <script class="foo" style="color:red;"></script> World</p>]
+    MarkupBlock - [0..67)::67
+        MarkupTagHelperElement - [0..67)::67 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [3..9)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+            MarkupTagHelperElement - [9..57)::48 - script[StartTagAndEndTag] - scripttaghelper
+                MarkupTagHelperStartTag - [9..48)::39
+                    MarkupTextLiteral - [9..16)::7 - [<script] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[script];
+                    MarkupTagHelperAttribute - [16..28)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [17..22)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[class];
+                        Equals;[=];
+                        MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [24..27)::3
+                            MarkupLiteralAttributeValue - [24..27)::3 - [foo]
+                                MarkupTextLiteral - [24..27)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[foo];
+                        MarkupTextLiteral - [27..28)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    MarkupTagHelperAttribute - [28..47)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                        MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [29..34)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[style];
+                        Equals;[=];
+                        MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [36..46)::10
+                            MarkupLiteralAttributeValue - [36..46)::10 - [color:red;]
+                                MarkupTextLiteral - [36..46)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[color:red;];
+                        MarkupTextLiteral - [46..47)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    MarkupTextLiteral - [47..48)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [48..57)::9
+                    MarkupTextLiteral - [48..57)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[script];
+                        CloseAngle;[>];
+            MarkupTextLiteral - [57..63)::6 - [ World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [63..67)::4
+                MarkupTextLiteral - [63..67)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.stree.txt
index cd797ecdad..659b282ddf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesScriptTagHelpers7.stree.txt
@@ -1,23 +1,66 @@
-Markup block - Gen<None> - 77 - (0:0,0)
-    Tag block - Gen<TagHelper> - 77 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [Hello ] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:2
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<TagHelper> - 58 - (9:0,9) - script - scripttaghelper
-            StartTagAndEndTag - <script class="@@foo@bar.com" style="color:red;"> ... </script>
-            class - DoubleQuotes
-                Markup block - Gen<None> - 13 - (24:0,24)
-                    Markup block - Gen<None> - 2 - (24:0,24)
-                        Markup span - Gen<Markup> - [@] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:1
-                            HtmlTokenType.Transition;[@];
-                        Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1
-                            HtmlTokenType.Transition;[@];
-                    Markup span - Gen<Markup> - [foo@bar.com] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:1
-                        HtmlTokenType.Text;[foo@bar.com];
-            style - DoubleQuotes
-                Markup span - Gen<Markup> - [color:red;] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:1
-                    HtmlTokenType.Text;[color:red;];
-        Markup span - Gen<Markup> - [ World] - SpanEditHandler;Accepts:Any - (67:0,67) - Tokens:2
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
+RazorDocument - [0..77)::77 - [<p>Hello <script class="@@foo@bar.com" style="color:red;"></script> World</p>]
+    MarkupBlock - [0..77)::77
+        MarkupTagHelperElement - [0..77)::77 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [3..9)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+            MarkupTagHelperElement - [9..67)::58 - script[StartTagAndEndTag] - scripttaghelper
+                MarkupTagHelperStartTag - [9..58)::49
+                    MarkupTextLiteral - [9..16)::7 - [<script] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[script];
+                    MarkupTagHelperAttribute - [16..38)::22 - class - DoubleQuotes - Unbound - [ class="@@foo@bar.com"]
+                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [17..22)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[class];
+                        Equals;[=];
+                        MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [24..37)::13
+                            MarkupBlock - [24..26)::2
+                                MarkupTextLiteral - [24..25)::1 - [@] - Gen<LitAttr:@(24:0,24)> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                MarkupEphemeralTextLiteral - [25..26)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                            MarkupLiteralAttributeValue - [26..37)::11 - [foo@bar.com]
+                                MarkupTextLiteral - [26..37)::11 - [foo@bar.com] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[foo@bar.com];
+                        MarkupTextLiteral - [37..38)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    MarkupTagHelperAttribute - [38..57)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                        MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [39..44)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[style];
+                        Equals;[=];
+                        MarkupTextLiteral - [45..46)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [46..56)::10
+                            MarkupLiteralAttributeValue - [46..56)::10 - [color:red;]
+                                MarkupTextLiteral - [46..56)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[color:red;];
+                        MarkupTextLiteral - [56..57)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    MarkupTextLiteral - [57..58)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [58..67)::9
+                    MarkupTextLiteral - [58..67)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[script];
+                        CloseAngle;[>];
+            MarkupTextLiteral - [67..73)::6 - [ World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [73..77)::4
+                MarkupTextLiteral - [73..77)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.stree.txt
index 239e215004..a4e4f20755 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers1.stree.txt
@@ -1,9 +1,39 @@
-Markup block - Gen<None> - 36 - (0:0,0)
-    Tag block - Gen<TagHelper> - 36 - (0:0,0) - p - ptaghelper
-        SelfClosing - <p class="foo" style="color:red;" />
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [foo] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[foo];
-        style - DoubleQuotes
-            Markup span - Gen<Markup> - [color:red;] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-                HtmlTokenType.Text;[color:red;];
+RazorDocument - [0..36)::36 - [<p class="foo" style="color:red;" />]
+    MarkupBlock - [0..36)::36
+        MarkupTagHelperElement - [0..36)::36 - p[SelfClosing] - ptaghelper
+            MarkupTagHelperStartTag - [0..36)::36
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [foo]
+                            MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [14..33)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..20)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [22..32)::10
+                        MarkupLiteralAttributeValue - [22..32)::10 - [color:red;]
+                            MarkupTextLiteral - [22..32)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [33..36)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.stree.txt
index f2e8370abd..f4fac8987c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers2.stree.txt
@@ -1,17 +1,57 @@
-Markup block - Gen<None> - 55 - (0:0,0)
-    Tag block - Gen<TagHelper> - 55 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [Hello ] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:2
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<TagHelper> - 36 - (9:0,9) - p - ptaghelper
-            SelfClosing - <p class="foo" style="color:red;" />
-            class - DoubleQuotes
-                Markup span - Gen<Markup> - [foo] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:1
-                    HtmlTokenType.Text;[foo];
-            style - DoubleQuotes
-                Markup span - Gen<Markup> - [color:red;] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-                    HtmlTokenType.Text;[color:red;];
-        Markup span - Gen<Markup> - [ World] - SpanEditHandler;Accepts:Any - (45:0,45) - Tokens:2
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
+RazorDocument - [0..55)::55 - [<p>Hello <p class="foo" style="color:red;" /> World</p>]
+    MarkupBlock - [0..55)::55
+        MarkupTagHelperElement - [0..55)::55 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [3..9)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+            MarkupTagHelperElement - [9..45)::36 - p[SelfClosing] - ptaghelper
+                MarkupTagHelperStartTag - [9..45)::36
+                    MarkupTextLiteral - [9..11)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                    MarkupTagHelperAttribute - [11..23)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                        MarkupTextLiteral - [11..12)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [12..17)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[class];
+                        Equals;[=];
+                        MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [19..22)::3
+                            MarkupLiteralAttributeValue - [19..22)::3 - [foo]
+                                MarkupTextLiteral - [19..22)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[foo];
+                        MarkupTextLiteral - [22..23)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    MarkupTagHelperAttribute - [23..42)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                        MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [24..29)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[style];
+                        Equals;[=];
+                        MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [31..41)::10
+                            MarkupLiteralAttributeValue - [31..41)::10 - [color:red;]
+                                MarkupTextLiteral - [31..41)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[color:red;];
+                        MarkupTextLiteral - [41..42)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    MarkupTextLiteral - [42..45)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                        ForwardSlash;[/];
+                        CloseAngle;[>];
+            MarkupTextLiteral - [45..51)::6 - [ World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [51..55)::4
+                MarkupTextLiteral - [51..55)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.stree.txt
index 172a414a85..f1605095a7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesSelfClosingTagHelpers3.stree.txt
@@ -1,17 +1,54 @@
-Markup block - Gen<None> - 52 - (0:0,0)
-    Markup span - Gen<Markup> - [Hello] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Text;[Hello];
-    Tag block - Gen<TagHelper> - 17 - (5:0,5) - p - ptaghelper
-        SelfClosing - <p class="foo" />
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [foo] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-                HtmlTokenType.Text;[foo];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<TagHelper> - 24 - (23:0,23) - p - ptaghelper
-        SelfClosing - <p style="color:red;" />
-        style - DoubleQuotes
-            Markup span - Gen<Markup> - [color:red;] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1
-                HtmlTokenType.Text;[color:red;];
-    Markup span - Gen<Markup> - [World] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:1
-        HtmlTokenType.Text;[World];
+RazorDocument - [0..52)::52 - [Hello<p class="foo" /> <p style="color:red;" />World]
+    MarkupBlock - [0..52)::52
+        MarkupTextLiteral - [0..5)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[Hello];
+        MarkupTagHelperElement - [5..22)::17 - p[SelfClosing] - ptaghelper
+            MarkupTagHelperStartTag - [5..22)::17
+                MarkupTextLiteral - [5..7)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [7..19)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..13)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [15..18)::3
+                        MarkupLiteralAttributeValue - [15..18)::3 - [foo]
+                            MarkupTextLiteral - [15..18)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [19..22)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [23..47)::24 - p[SelfClosing] - ptaghelper
+            MarkupTagHelperStartTag - [23..47)::24
+                MarkupTextLiteral - [23..25)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [25..44)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..31)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [33..43)::10
+                        MarkupLiteralAttributeValue - [33..43)::10 - [color:red;]
+                            MarkupTextLiteral - [33..43)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                    MarkupTextLiteral - [43..44)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [44..47)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [47..52)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[World];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.stree.txt
index 3844699d08..06efe6b521 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes1.stree.txt
@@ -1,9 +1,43 @@
-Markup block - Gen<None> - 38 - (0:0,0)
-    Tag block - Gen<TagHelper> - 38 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class="foo" style="color:red;"> ... </p>
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [foo] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[foo];
-        style - DoubleQuotes
-            Markup span - Gen<Markup> - [color:red;] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-                HtmlTokenType.Text;[color:red;];
+RazorDocument - [0..38)::38 - [<p class="foo" style="color:red;"></p>]
+    MarkupBlock - [0..38)::38
+        MarkupTagHelperElement - [0..38)::38 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..34)::34
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [foo]
+                            MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [14..33)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..20)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [22..32)::10
+                        MarkupLiteralAttributeValue - [22..32)::10 - [color:red;]
+                            MarkupTextLiteral - [22..32)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [33..34)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [34..38)::4
+                MarkupTextLiteral - [34..38)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.stree.txt
index 139d9edd0b..de476da382 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes2.stree.txt
@@ -1,13 +1,47 @@
-Markup block - Gen<None> - 49 - (0:0,0)
-    Tag block - Gen<TagHelper> - 49 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class="foo" style="color:red;"> ... </p>
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [foo] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[foo];
-        style - DoubleQuotes
-            Markup span - Gen<Markup> - [color:red;] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-                HtmlTokenType.Text;[color:red;];
-        Markup span - Gen<Markup> - [Hello World] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:3
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
+RazorDocument - [0..49)::49 - [<p class="foo" style="color:red;">Hello World</p>]
+    MarkupBlock - [0..49)::49
+        MarkupTagHelperElement - [0..49)::49 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..34)::34
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [foo]
+                            MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [14..33)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..20)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [22..32)::10
+                        MarkupLiteralAttributeValue - [22..32)::10 - [color:red;]
+                            MarkupTextLiteral - [22..32)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [33..34)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [34..45)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [45..49)::4
+                MarkupTextLiteral - [45..49)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.stree.txt
index 4a1b76e66f..c89bb22d86 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes3.stree.txt
@@ -1,17 +1,62 @@
-Markup block - Gen<None> - 56 - (0:0,0)
-    Tag block - Gen<TagHelper> - 24 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class="foo"> ... </p>
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [foo] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[foo];
-        Markup span - Gen<Markup> - [Hello] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-            HtmlTokenType.Text;[Hello];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<TagHelper> - 31 - (25:0,25) - p - ptaghelper
-        StartTagAndEndTag - <p style="color:red;"> ... </p>
-        style - DoubleQuotes
-            Markup span - Gen<Markup> - [color:red;] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1
-                HtmlTokenType.Text;[color:red;];
-        Markup span - Gen<Markup> - [World] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:1
-            HtmlTokenType.Text;[World];
+RazorDocument - [0..56)::56 - [<p class="foo">Hello</p> <p style="color:red;">World</p>]
+    MarkupBlock - [0..56)::56
+        MarkupTagHelperElement - [0..24)::24 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..15)::15
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [foo]
+                            MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [14..15)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [15..20)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+            MarkupTagHelperEndTag - [20..24)::4
+                MarkupTextLiteral - [20..24)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [25..56)::31 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [25..47)::22
+                MarkupTextLiteral - [25..27)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [27..46)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                    MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [28..33)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [34..35)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [35..45)::10
+                        MarkupLiteralAttributeValue - [35..45)::10 - [color:red;]
+                            MarkupTextLiteral - [35..45)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                    MarkupTextLiteral - [45..46)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [46..47)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [47..52)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[World];
+            MarkupTagHelperEndTag - [52..56)::4
+                MarkupTextLiteral - [52..56)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.stree.txt
index c0735871ee..eecb4cde20 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithPlainAttributes4.stree.txt
@@ -1,44 +1,82 @@
-Markup block - Gen<None> - 99 - (0:0,0)
-    Tag block - Gen<TagHelper> - 99 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class="foo" style="color:red;"> ... </p>
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [foo] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[foo];
-        style - DoubleQuotes
-            Markup span - Gen<Markup> - [color:red;] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-                HtmlTokenType.Text;[color:red;];
-        Markup span - Gen<Markup> - [Hello World ] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:4
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 20 - (46:0,46)
-            Markup span - Gen<Markup> - [<strong] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-            Markup block - Gen<Attr:class, class="@(53:0,53),"@(64:0,64)> - 12 - (53:0,53)
-                Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (53:0,53) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[class];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.DoubleQuote;["];
-                Markup span - Gen<LitAttr:@(61:0,61)> - [foo] - SpanEditHandler;Accepts:Any - (61:0,61) - Tokens:1
-                    HtmlTokenType.Text;[foo];
-                Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (64:0,64) - Tokens:1
-                    HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (65:0,65) - Tokens:1
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [inside of strong tag] - SpanEditHandler;Accepts:Any - (66:0,66) - Tokens:7
-            HtmlTokenType.Text;[inside];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[of];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[tag];
-        Tag block - Gen<None> - 9 - (86:0,86)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (86:0,86) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..99)::99 - [<p class="foo" style="color:red;">Hello World <strong class="foo">inside of strong tag</strong></p>]
+    MarkupBlock - [0..99)::99
+        MarkupTagHelperElement - [0..99)::99 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..34)::34
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="foo"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [foo]
+                            MarkupTextLiteral - [10..13)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [14..33)::19 - style - DoubleQuotes - Unbound - [ style="color:red;"]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..20)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [21..22)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [22..32)::10
+                        MarkupLiteralAttributeValue - [22..32)::10 - [color:red;]
+                            MarkupTextLiteral - [22..32)::10 - [color:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                    MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [33..34)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [34..46)::12 - [Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+            MarkupTagBlock - [46..66)::20 - [<strong class="foo">]
+                MarkupTextLiteral - [46..53)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                MarkupAttributeBlock - [53..65)::12 - [ class="foo"]
+                    MarkupTextLiteral - [53..54)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [54..59)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [60..61)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    GenericBlock - [61..64)::3
+                        MarkupLiteralAttributeValue - [61..64)::3 - [foo]
+                            MarkupTextLiteral - [61..64)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [64..65)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [65..66)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [66..86)::20 - [inside of strong tag] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[inside];
+                Whitespace;[ ];
+                Text;[of];
+                Whitespace;[ ];
+                Text;[strong];
+                Whitespace;[ ];
+                Text;[tag];
+            MarkupTagBlock - [86..95)::9 - [</strong>]
+                MarkupTextLiteral - [86..95)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [95..99)::4
+                MarkupTextLiteral - [95..99)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.cspans.txt
index 1ca5ecd795..f08a9b491a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.cspans.txt
@@ -1,4 +1,4 @@
 Markup span at (9:0,9 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [56] )
 Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [13] )
-Code span at (22:0,22 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (21:0,21 [13] )
+Code span at (22:0,22 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [13] )
 Markup span at (41:0,41 [10] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [56] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.stree.txt
index 7da189ab4e..6ea008edb5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes1.stree.txt
@@ -1,19 +1,54 @@
-Markup block - Gen<None> - 56 - (0:0,0)
-    Tag block - Gen<TagHelper> - 56 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class=foo dynamic=@DateTime.Now style=color:red;> ... </p>
-        class - NoQuotes
-            Markup span - Gen<Markup> - [foo] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-                HtmlTokenType.Text;[foo];
-        dynamic - DoubleQuotes
-            Markup block - Gen<None> - 13 - (21:0,21)
-                Markup block - Gen<DynAttr:@(21:0,21)> - 13 - (21:0,21)
-                    Expression block - Gen<Expr> - 13 - (21:0,21)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (22:0,22) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        style - NoQuotes
-            Markup span - Gen<Markup> - [color:red;] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:1
-                HtmlTokenType.Text;[color:red;];
+RazorDocument - [0..56)::56 - [<p class=foo dynamic=@DateTime.Now style=color:red;></p>]
+    MarkupBlock - [0..56)::56
+        MarkupTagHelperElement - [0..56)::56 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..52)::52
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class - DoubleQuotes - Unbound - [ class=foo]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..12)::3
+                        MarkupLiteralAttributeValue - [9..12)::3 - [foo]
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                MarkupTagHelperAttribute - [12..34)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..20)::7 - [dynamic] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[dynamic];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [21..34)::13
+                        MarkupDynamicAttributeValue - [21..34)::13 - [@DateTime.Now]
+                            GenericBlock - [21..34)::13
+                                CSharpCodeBlock - [21..34)::13
+                                    CSharpImplicitExpression - [21..34)::13
+                                        CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [22..34)::12
+                                            CSharpCodeBlock - [22..34)::12
+                                                CSharpExpressionLiteral - [22..34)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                MarkupTagHelperAttribute - [34..51)::17 - style - DoubleQuotes - Unbound - [ style=color:red;]
+                    MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [35..40)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [41..51)::10
+                        MarkupLiteralAttributeValue - [41..51)::10 - [color:red;]
+                            MarkupTextLiteral - [41..51)::10 - [color:red;] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                MarkupTextLiteral - [51..52)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [52..56)::4
+                MarkupTextLiteral - [52..56)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.cspans.txt
index fdbfbe334a..a52e2d29cd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.cspans.txt
@@ -1,5 +1,5 @@
 Markup span at (9:0,9 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [67] )
 Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [13] )
-Code span at (22:0,22 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (21:0,21 [13] )
+Code span at (22:0,22 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [13] )
 Markup span at (41:0,41 [10] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [67] )
 Markup span at (52:0,52 [11] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [67] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.stree.txt
index 69000027f8..56eec9c006 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes2.stree.txt
@@ -1,23 +1,58 @@
-Markup block - Gen<None> - 67 - (0:0,0)
-    Tag block - Gen<TagHelper> - 67 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class=foo dynamic=@DateTime.Now style=color:red;> ... </p>
-        class - NoQuotes
-            Markup span - Gen<Markup> - [foo] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-                HtmlTokenType.Text;[foo];
-        dynamic - DoubleQuotes
-            Markup block - Gen<None> - 13 - (21:0,21)
-                Markup block - Gen<DynAttr:@(21:0,21)> - 13 - (21:0,21)
-                    Expression block - Gen<Expr> - 13 - (21:0,21)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (22:0,22) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        style - NoQuotes
-            Markup span - Gen<Markup> - [color:red;] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:1
-                HtmlTokenType.Text;[color:red;];
-        Markup span - Gen<Markup> - [Hello World] - SpanEditHandler;Accepts:Any - (52:0,52) - Tokens:3
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
+RazorDocument - [0..67)::67 - [<p class=foo dynamic=@DateTime.Now style=color:red;>Hello World</p>]
+    MarkupBlock - [0..67)::67
+        MarkupTagHelperElement - [0..67)::67 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..52)::52
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class - DoubleQuotes - Unbound - [ class=foo]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..12)::3
+                        MarkupLiteralAttributeValue - [9..12)::3 - [foo]
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                MarkupTagHelperAttribute - [12..34)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..20)::7 - [dynamic] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[dynamic];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [21..34)::13
+                        MarkupDynamicAttributeValue - [21..34)::13 - [@DateTime.Now]
+                            GenericBlock - [21..34)::13
+                                CSharpCodeBlock - [21..34)::13
+                                    CSharpImplicitExpression - [21..34)::13
+                                        CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [22..34)::12
+                                            CSharpCodeBlock - [22..34)::12
+                                                CSharpExpressionLiteral - [22..34)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                MarkupTagHelperAttribute - [34..51)::17 - style - DoubleQuotes - Unbound - [ style=color:red;]
+                    MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [35..40)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [41..51)::10
+                        MarkupLiteralAttributeValue - [41..51)::10 - [color:red;]
+                            MarkupTextLiteral - [41..51)::10 - [color:red;] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                MarkupTextLiteral - [51..52)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [52..63)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [63..67)::4
+                MarkupTextLiteral - [63..67)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.cspans.txt
index cc105edc94..9b90d7819d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (9:0,9 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [69] )
 Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [13] )
-Code span at (22:0,22 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (21:0,21 [13] )
+Code span at (22:0,22 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [13] )
 Markup span at (41:0,41 [5] ) (Accepts:Any) - Parent: Markup block at (41:0,41 [12] )
 Markup span at (46:0,46 [1] ) (Accepts:None) - Parent: Markup block at (46:0,46 [2] )
 Markup span at (47:0,47 [1] ) (Accepts:None) - Parent: Markup block at (46:0,46 [2] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.stree.txt
index 5678b9c2a8..6912e8e6e0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes3.stree.txt
@@ -1,31 +1,66 @@
-Markup block - Gen<None> - 69 - (0:0,0)
-    Tag block - Gen<TagHelper> - 69 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class=foo dynamic=@DateTime.Now style=color@@:red;> ... </p>
-        class - NoQuotes
-            Markup span - Gen<Markup> - [foo] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-                HtmlTokenType.Text;[foo];
-        dynamic - DoubleQuotes
-            Markup block - Gen<None> - 13 - (21:0,21)
-                Markup block - Gen<DynAttr:@(21:0,21)> - 13 - (21:0,21)
-                    Expression block - Gen<Expr> - 13 - (21:0,21)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (22:0,22) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        style - DoubleQuotes
-            Markup block - Gen<None> - 12 - (41:0,41)
-                Markup span - Gen<Markup> - [color] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:1
-                    HtmlTokenType.Text;[color];
-                Markup block - Gen<None> - 2 - (46:0,46)
-                    Markup span - Gen<Markup> - [@] - SpanEditHandler;Accepts:None - (46:0,46) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (47:0,47) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                Markup span - Gen<Markup> - [:red;] - SpanEditHandler;Accepts:Any - (48:0,48) - Tokens:1
-                    HtmlTokenType.Text;[:red;];
-        Markup span - Gen<Markup> - [Hello World] - SpanEditHandler;Accepts:Any - (54:0,54) - Tokens:3
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
+RazorDocument - [0..69)::69 - [<p class=foo dynamic=@DateTime.Now style=color@@:red;>Hello World</p>]
+    MarkupBlock - [0..69)::69
+        MarkupTagHelperElement - [0..69)::69 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..54)::54
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class - DoubleQuotes - Unbound - [ class=foo]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..12)::3
+                        MarkupLiteralAttributeValue - [9..12)::3 - [foo]
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                MarkupTagHelperAttribute - [12..34)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..20)::7 - [dynamic] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[dynamic];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [21..34)::13
+                        MarkupDynamicAttributeValue - [21..34)::13 - [@DateTime.Now]
+                            GenericBlock - [21..34)::13
+                                CSharpCodeBlock - [21..34)::13
+                                    CSharpImplicitExpression - [21..34)::13
+                                        CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [22..34)::12
+                                            CSharpCodeBlock - [22..34)::12
+                                                CSharpExpressionLiteral - [22..34)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                MarkupTagHelperAttribute - [34..53)::19 - style - DoubleQuotes - Unbound - [ style=color@@:red;]
+                    MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [35..40)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [41..53)::12
+                        MarkupLiteralAttributeValue - [41..46)::5 - [color]
+                            MarkupTextLiteral - [41..46)::5 - [color] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[color];
+                        MarkupBlock - [46..48)::2
+                            MarkupTextLiteral - [46..47)::1 - [@] - Gen<LitAttr:@(46:0,46)> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [47..48)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                        MarkupLiteralAttributeValue - [48..53)::5 - [:red;]
+                            MarkupTextLiteral - [48..53)::5 - [:red;] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[:red;];
+                MarkupTextLiteral - [53..54)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [54..65)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [65..69)::4
+                MarkupTextLiteral - [65..69)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.cspans.txt
index c840aeadf5..ed2cf9ddf2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.cspans.txt
@@ -1,9 +1,9 @@
 Markup span at (9:0,9 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [44] )
 Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [13] )
-Code span at (22:0,22 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (21:0,21 [13] )
+Code span at (22:0,22 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [13] )
 Markup span at (35:0,35 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [44] )
 Markup span at (44:0,44 [1] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [96] )
 Markup span at (54:0,54 [10] ) (Accepts:Any) - Parent: Tag block at (45:0,45 [51] )
 Transition span at (73:0,73 [1] ) (Accepts:None) - Parent: Expression block at (73:0,73 [13] )
-Code span at (74:0,74 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (73:0,73 [13] )
+Code span at (74:0,74 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (73:0,73 [13] )
 Markup span at (87:0,87 [5] ) (Accepts:Any) - Parent: Tag block at (45:0,45 [51] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.stree.txt
index d8b15f08be..4912f8248f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes4.stree.txt
@@ -1,37 +1,92 @@
-Markup block - Gen<None> - 96 - (0:0,0)
-    Tag block - Gen<TagHelper> - 44 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class=foo dynamic=@DateTime.Now> ... </p>
-        class - NoQuotes
-            Markup span - Gen<Markup> - [foo] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-                HtmlTokenType.Text;[foo];
-        dynamic - DoubleQuotes
-            Markup block - Gen<None> - 13 - (21:0,21)
-                Markup block - Gen<DynAttr:@(21:0,21)> - 13 - (21:0,21)
-                    Expression block - Gen<Expr> - 13 - (21:0,21)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (22:0,22) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        Markup span - Gen<Markup> - [Hello] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1
-            HtmlTokenType.Text;[Hello];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (44:0,44) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<TagHelper> - 51 - (45:0,45) - p - ptaghelper
-        StartTagAndEndTag - <p style=color:red; dynamic=@DateTime.Now> ... </p>
-        style - NoQuotes
-            Markup span - Gen<Markup> - [color:red;] - SpanEditHandler;Accepts:Any - (54:0,54) - Tokens:1
-                HtmlTokenType.Text;[color:red;];
-        dynamic - DoubleQuotes
-            Markup block - Gen<None> - 13 - (73:0,73)
-                Markup block - Gen<DynAttr:@(73:0,73)> - 13 - (73:0,73)
-                    Expression block - Gen<Expr> - 13 - (73:0,73)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (73:0,73) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (74:0,74) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        Markup span - Gen<Markup> - [World] - SpanEditHandler;Accepts:Any - (87:0,87) - Tokens:1
-            HtmlTokenType.Text;[World];
+RazorDocument - [0..96)::96 - [<p class=foo dynamic=@DateTime.Now>Hello</p> <p style=color:red; dynamic=@DateTime.Now>World</p>]
+    MarkupBlock - [0..96)::96
+        MarkupTagHelperElement - [0..44)::44 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..35)::35
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class - DoubleQuotes - Unbound - [ class=foo]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..12)::3
+                        MarkupLiteralAttributeValue - [9..12)::3 - [foo]
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                MarkupTagHelperAttribute - [12..34)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..20)::7 - [dynamic] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[dynamic];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [21..34)::13
+                        MarkupDynamicAttributeValue - [21..34)::13 - [@DateTime.Now]
+                            GenericBlock - [21..34)::13
+                                CSharpCodeBlock - [21..34)::13
+                                    CSharpImplicitExpression - [21..34)::13
+                                        CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [22..34)::12
+                                            CSharpCodeBlock - [22..34)::12
+                                                CSharpExpressionLiteral - [22..34)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                MarkupTextLiteral - [34..35)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [35..40)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+            MarkupTagHelperEndTag - [40..44)::4
+                MarkupTextLiteral - [40..44)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [44..45)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [45..96)::51 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [45..87)::42
+                MarkupTextLiteral - [45..47)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [47..64)::17 - style - DoubleQuotes - Unbound - [ style=color:red;]
+                    MarkupTextLiteral - [47..48)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [48..53)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [54..64)::10
+                        MarkupLiteralAttributeValue - [54..64)::10 - [color:red;]
+                            MarkupTextLiteral - [54..64)::10 - [color:red;] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                MarkupTagHelperAttribute - [64..86)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
+                    MarkupTextLiteral - [64..65)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [65..72)::7 - [dynamic] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[dynamic];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [73..86)::13
+                        MarkupDynamicAttributeValue - [73..86)::13 - [@DateTime.Now]
+                            GenericBlock - [73..86)::13
+                                CSharpCodeBlock - [73..86)::13
+                                    CSharpImplicitExpression - [73..86)::13
+                                        CSharpTransition - [73..74)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [74..86)::12
+                                            CSharpCodeBlock - [74..86)::12
+                                                CSharpExpressionLiteral - [74..86)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                MarkupTextLiteral - [86..87)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [87..92)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[World];
+            MarkupTagHelperEndTag - [92..96)::4
+                MarkupTextLiteral - [92..96)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.cspans.txt
index 1665645fe5..2b1a126add 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (9:0,9 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [117] )
 Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [13] )
-Code span at (22:0,22 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (21:0,21 [13] )
+Code span at (22:0,22 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [13] )
 Markup span at (41:0,41 [10] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [117] )
 Markup span at (52:0,52 [12] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [117] )
 Markup span at (64:0,64 [7] ) (Accepts:Any) - Parent: Tag block at (64:0,64 [20] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.stree.txt
index b8af7a90a7..48be37b33d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_RewritesTagHelpersWithQuotelessAttributes5.stree.txt
@@ -1,54 +1,93 @@
-Markup block - Gen<None> - 117 - (0:0,0)
-    Tag block - Gen<TagHelper> - 117 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class=foo dynamic=@DateTime.Now style=color:red;> ... </p>
-        class - NoQuotes
-            Markup span - Gen<Markup> - [foo] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-                HtmlTokenType.Text;[foo];
-        dynamic - DoubleQuotes
-            Markup block - Gen<None> - 13 - (21:0,21)
-                Markup block - Gen<DynAttr:@(21:0,21)> - 13 - (21:0,21)
-                    Expression block - Gen<Expr> - 13 - (21:0,21)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (22:0,22) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        style - NoQuotes
-            Markup span - Gen<Markup> - [color:red;] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:1
-                HtmlTokenType.Text;[color:red;];
-        Markup span - Gen<Markup> - [Hello World ] - SpanEditHandler;Accepts:Any - (52:0,52) - Tokens:4
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<None> - 20 - (64:0,64)
-            Markup span - Gen<Markup> - [<strong] - SpanEditHandler;Accepts:Any - (64:0,64) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-            Markup block - Gen<Attr:class, class="@(71:0,71),"@(82:0,82)> - 12 - (71:0,71)
-                Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (71:0,71) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[class];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.DoubleQuote;["];
-                Markup span - Gen<LitAttr:@(79:0,79)> - [foo] - SpanEditHandler;Accepts:Any - (79:0,79) - Tokens:1
-                    HtmlTokenType.Text;[foo];
-                Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (82:0,82) - Tokens:1
-                    HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (83:0,83) - Tokens:1
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [inside of strong tag] - SpanEditHandler;Accepts:Any - (84:0,84) - Tokens:7
-            HtmlTokenType.Text;[inside];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[of];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[tag];
-        Tag block - Gen<None> - 9 - (104:0,104)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (104:0,104) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..117)::117 - [<p class=foo dynamic=@DateTime.Now style=color:red;>Hello World <strong class="foo">inside of strong tag</strong></p>]
+    MarkupBlock - [0..117)::117
+        MarkupTagHelperElement - [0..117)::117 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..52)::52
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class - DoubleQuotes - Unbound - [ class=foo]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..12)::3
+                        MarkupLiteralAttributeValue - [9..12)::3 - [foo]
+                            MarkupTextLiteral - [9..12)::3 - [foo] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                MarkupTagHelperAttribute - [12..34)::22 - dynamic - DoubleQuotes - Unbound - [ dynamic=@DateTime.Now]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..20)::7 - [dynamic] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[dynamic];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [21..34)::13
+                        MarkupDynamicAttributeValue - [21..34)::13 - [@DateTime.Now]
+                            GenericBlock - [21..34)::13
+                                CSharpCodeBlock - [21..34)::13
+                                    CSharpImplicitExpression - [21..34)::13
+                                        CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [22..34)::12
+                                            CSharpCodeBlock - [22..34)::12
+                                                CSharpExpressionLiteral - [22..34)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                MarkupTagHelperAttribute - [34..51)::17 - style - DoubleQuotes - Unbound - [ style=color:red;]
+                    MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [35..40)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [41..51)::10
+                        MarkupLiteralAttributeValue - [41..51)::10 - [color:red;]
+                            MarkupTextLiteral - [41..51)::10 - [color:red;] - Gen<None> - SpanEditHandler;Accepts:Any
+                                Text;[color:red;];
+                MarkupTextLiteral - [51..52)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [52..64)::12 - [Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+            MarkupTagBlock - [64..84)::20 - [<strong class="foo">]
+                MarkupTextLiteral - [64..71)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                MarkupAttributeBlock - [71..83)::12 - [ class="foo"]
+                    MarkupTextLiteral - [71..72)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [72..77)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [78..79)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    GenericBlock - [79..82)::3
+                        MarkupLiteralAttributeValue - [79..82)::3 - [foo]
+                            MarkupTextLiteral - [79..82)::3 - [foo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[foo];
+                    MarkupTextLiteral - [82..83)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [83..84)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [84..104)::20 - [inside of strong tag] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[inside];
+                Whitespace;[ ];
+                Text;[of];
+                Whitespace;[ ];
+                Text;[strong];
+                Whitespace;[ ];
+                Text;[tag];
+            MarkupTagBlock - [104..113)::9 - [</strong>]
+                MarkupTextLiteral - [104..113)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [113..117)::4
+                MarkupTextLiteral - [113..117)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.cspans.txt
index e69de29bb2..92e6c778c6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.cspans.txt
@@ -0,0 +1 @@
+Markup span at (10:0,10 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [16] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.stree.txt
index a855effb2e..a1f4e346c9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers1.stree.txt
@@ -1,5 +1,27 @@
-Markup block - Gen<None> - 16 - (0:0,0)
-    Tag block - Gen<TagHelper> - 16 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class=""> ... </p>
-        class - DoubleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
+RazorDocument - [0..16)::16 - [<p class=""></p>]
+    MarkupBlock - [0..16)::16
+        MarkupTagHelperElement - [0..16)::16 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..12)::12
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..11)::9 - class - DoubleQuotes - Unbound - [ class=""]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..10)::0
+                        MarkupTextLiteral - [10..10)::0 - []
+                    MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [11..12)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [12..16)::4
+                MarkupTextLiteral - [12..16)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.cspans.txt
index e69de29bb2..92e6c778c6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.cspans.txt
@@ -0,0 +1 @@
+Markup span at (10:0,10 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [16] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.stree.txt
index bb2bf1ba66..1fb1c603d7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers2.stree.txt
@@ -1,5 +1,27 @@
-Markup block - Gen<None> - 16 - (0:0,0)
-    Tag block - Gen<TagHelper> - 16 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class=''> ... </p>
-        class - SingleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
+RazorDocument - [0..16)::16 - [<p class=''></p>]
+    MarkupBlock - [0..16)::16
+        MarkupTagHelperElement - [0..16)::16 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..12)::12
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..11)::9 - class - SingleQuotes - Unbound - [ class='']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [10..10)::0
+                        MarkupTextLiteral - [10..10)::0 - []
+                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [11..12)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [12..16)::4
+                MarkupTextLiteral - [12..16)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.stree.txt
index a81595cb33..e64fe16348 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers3.stree.txt
@@ -1,5 +1,23 @@
-Markup block - Gen<None> - 14 - (0:0,0)
-    Tag block - Gen<TagHelper> - 14 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p class=> ... </p>
-        class - DoubleQuotes
-            Markup span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:0
+RazorDocument - [0..14)::14 - [<p class=></p>]
+    MarkupBlock - [0..14)::14
+        MarkupTagHelperElement - [0..14)::14 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..10)::10
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..9)::7 - class - DoubleQuotes - Unbound - [ class=]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [9..9)::0
+                        MarkupTextLiteral - [9..9)::0 - []
+                MarkupTextLiteral - [9..10)::1 - [>] - Gen<None> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [10..14)::4
+                MarkupTextLiteral - [10..14)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.cspans.txt
index 9d88d89f4d..eeee563c5d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.cspans.txt
@@ -1 +1,3 @@
+Markup span at (11:0,11 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [33] )
 Markup span at (20:0,20 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [33] )
+Markup span at (29:0,29 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [33] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.stree.txt
index 744c39ad6e..6916bd352a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers4.stree.txt
@@ -1,9 +1,43 @@
-Markup block - Gen<None> - 33 - (0:0,0)
-    Tag block - Gen<TagHelper> - 33 - (0:0,0) - p - ptaghelper
-        SelfClosing - <p class1='' class2= class3="" />
-        class1 - SingleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
-        class2 - DoubleQuotes
-            Markup span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:0
-        class3 - DoubleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
+RazorDocument - [0..33)::33 - [<p class1='' class2= class3="" />]
+    MarkupBlock - [0..33)::33
+        MarkupTagHelperElement - [0..33)::33 - p[SelfClosing] - ptaghelper
+            MarkupTagHelperStartTag - [0..33)::33
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class1 - SingleQuotes - Unbound - [ class1='']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..9)::6 - [class1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class1];
+                    Equals;[=];
+                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [11..11)::0
+                        MarkupTextLiteral - [11..11)::0 - []
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTagHelperAttribute - [12..20)::8 - class2 - DoubleQuotes - Unbound - [ class2=]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..19)::6 - [class2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class2];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [20..20)::0
+                        MarkupTextLiteral - [20..20)::0 - []
+                MarkupTagHelperAttribute - [20..30)::10 - class3 - DoubleQuotes - Unbound - [ class3=""]
+                    MarkupTextLiteral - [20..21)::1 - [ ] - Gen<None> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [21..27)::6 - [class3] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class3];
+                    Equals;[=];
+                    MarkupTextLiteral - [28..29)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [29..29)::0
+                        MarkupTextLiteral - [29..29)::0 - []
+                    MarkupTextLiteral - [29..30)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [30..33)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.cspans.txt
index 8bfb200837..7b54ebc00d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.cspans.txt
@@ -1 +1,3 @@
+Markup span at (11:0,11 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [31] )
+Markup span at (20:0,20 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [31] )
 Markup span at (28:0,28 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [31] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.stree.txt
index 728b1f691c..5f595ff66b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsEmptyAttributeTagHelpers5.stree.txt
@@ -1,9 +1,39 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<TagHelper> - 31 - (0:0,0) - p - ptaghelper
-        SelfClosing - <p class1=''class2=""class3= />
-        class1 - SingleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
-        class2 - DoubleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
-        class3 - DoubleQuotes
-            Markup span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:0
+RazorDocument - [0..31)::31 - [<p class1=''class2=""class3= />]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - p[SelfClosing] - ptaghelper
+            MarkupTagHelperStartTag - [0..31)::31
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..12)::10 - class1 - SingleQuotes - Unbound - [ class1='']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..9)::6 - [class1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class1];
+                    Equals;[=];
+                    MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [11..11)::0
+                        MarkupTextLiteral - [11..11)::0 - []
+                    MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTagHelperAttribute - [12..21)::9 - class2 - DoubleQuotes - Unbound - [class2=""]
+                    MarkupTextLiteral - [12..18)::6 - [class2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class2];
+                    Equals;[=];
+                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [20..20)::0
+                        MarkupTextLiteral - [20..20)::0 - []
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [21..28)::7 - class3 - DoubleQuotes - Unbound - [class3=]
+                    MarkupTextLiteral - [21..27)::6 - [class3] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class3];
+                    Equals;[=];
+                    MarkupTagHelperAttributeValue - [28..28)::0
+                        MarkupTextLiteral - [28..28)::0 - []
+                MarkupTextLiteral - [28..31)::3 - [ />] - Gen<None> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block1.stree.txt
index 5c62dadb54..241cad1812 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block1.stree.txt
@@ -1,18 +1,33 @@
-Markup block - Gen<None> - 29 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 29 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 26 - (2:0,2)
-            Tag block - Gen<TagHelper> - 26 - (2:0,2) - input - InputTagHelper1 - InputTagHelper3
-                SelfClosing - <input unbound-required />
-                unbound-required - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (28:0,28) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..29)::29 - [@{<input unbound-required />}]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            CSharpStatement - [0..29)::29
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..29)::28
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..28)::26
+                        MarkupBlock - [2..28)::26
+                            MarkupTagHelperElement - [2..28)::26 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..28)::26
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..25)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..25)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[unbound-required];
+                                    MarkupTextLiteral - [25..28)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [28..28)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [28..29)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [29..29)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.stree.txt
index cb514b2dd8..2064d74060 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block10.stree.txt
@@ -1,18 +1,32 @@
-Markup block - Gen<None> - 28 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 28 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 25 - (2:0,2)
-            Tag block - Gen<TagHelper> - 25 - (2:0,2) - input - InputTagHelper3
-                SelfClosing - <input int-prefix-value/>
-                int-prefix-value - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..28)::28 - [@{<input int-prefix-value/>}]
+    MarkupBlock - [0..28)::28
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..28)::28
+            CSharpStatement - [0..28)::28
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..28)::27
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..27)::25
+                        MarkupBlock - [2..27)::25
+                            MarkupTagHelperElement - [2..27)::25 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..27)::25
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..25)::17 - int-prefix-value - Minimized - Bound - [ int-prefix-value]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..25)::16 - [int-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[int-prefix-value];
+                                    MarkupTextLiteral - [25..27)::2 - [/>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [27..27)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [27..28)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [28..28)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.stree.txt
index 5734fb2cd3..a8e8450ee8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block11.stree.txt
@@ -1,18 +1,33 @@
-Markup block - Gen<None> - 32 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 32 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 29 - (2:0,2)
-            Tag block - Gen<TagHelper> - 29 - (2:0,2) - input - InputTagHelper3
-                SelfClosing - <input string-prefix-value />
-                string-prefix-value - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (32:0,32) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..32)::32 - [@{<input string-prefix-value />}]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            CSharpStatement - [0..32)::32
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..32)::31
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..31)::29
+                        MarkupBlock - [2..31)::29
+                            MarkupTagHelperElement - [2..31)::29 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..31)::29
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..28)::20 - string-prefix-value - Minimized - Bound - [ string-prefix-value]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..28)::19 - [string-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[string-prefix-value];
+                                    MarkupTextLiteral - [28..31)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [31..31)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.cspans.txt
index a9bbc9d9b6..37fd3df813 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.cspans.txt
@@ -1,6 +1,7 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
 MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
+Code span at (27:0,27 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (2:0,2 [29] )
 Code span at (31:0,31 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [32] )
 MetaCode span at (31:0,31 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [32] )
 Markup span at (32:0,32 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.stree.txt
index 6fb73e8860..9b025d2098 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block12.stree.txt
@@ -1,19 +1,40 @@
-Markup block - Gen<None> - 32 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 32 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 29 - (2:0,2)
-            Tag block - Gen<TagHelper> - 29 - (2:0,2) - input - InputTagHelper3
-                SelfClosing - <input int-prefix-value='' />
-                int-prefix-value - SingleQuotes
-                    Markup block - Gen<None> - 0 - (0:0,0)
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (32:0,32) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..32)::32 - [@{<input int-prefix-value='' />}]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            CSharpStatement - [0..32)::32
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..32)::31
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..31)::29
+                        MarkupBlock - [2..31)::29
+                            MarkupTagHelperElement - [2..31)::29 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..31)::29
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupTagHelperAttribute - [8..28)::20 - int-prefix-value - SingleQuotes - Bound - [ int-prefix-value='']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..25)::16 - [int-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[int-prefix-value];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [27..27)::0
+                                            CSharpExpressionLiteral - [27..27)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                        MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupTextLiteral - [28..31)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [31..31)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.cspans.txt
index 1b7db58ccc..dfa5d6b255 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.cspans.txt
@@ -1,6 +1,7 @@
 Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
 MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
+Markup span at (30:0,30 [0] ) (Accepts:Any) - Parent: Tag block at (2:0,2 [31] )
 Code span at (33:0,33 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [34] )
 MetaCode span at (33:0,33 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [34] )
 Markup span at (34:0,34 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [34] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.stree.txt
index 3fc03448cf..a945b9f6fb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block13.stree.txt
@@ -1,19 +1,39 @@
-Markup block - Gen<None> - 34 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 34 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 31 - (2:0,2)
-            Tag block - Gen<TagHelper> - 31 - (2:0,2) - input - InputTagHelper3
-                SelfClosing - <input string-prefix-value=''/>
-                string-prefix-value - SingleQuotes
-                    Markup block - Gen<None> - 0 - (0:0,0)
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (33:0,33) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..34)::34 - [@{<input string-prefix-value=''/>}]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        MarkupBlock - [2..33)::31
+                            MarkupTagHelperElement - [2..33)::31 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..33)::31
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupTagHelperAttribute - [8..31)::23 - string-prefix-value - SingleQuotes - Bound - [ string-prefix-value='']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..28)::19 - [string-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[string-prefix-value];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [29..30)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [30..30)::0
+                                            MarkupTextLiteral - [30..30)::0 - []
+                                        MarkupTextLiteral - [30..31)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupTextLiteral - [31..33)::2 - [/>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.stree.txt
index a4527a1da3..1eb4764b8e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block14.stree.txt
@@ -1,20 +1,40 @@
-Markup block - Gen<None> - 32 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 32 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 29 - (2:0,2)
-            Tag block - Gen<TagHelper> - 29 - (2:0,2) - input - InputTagHelper3
-                SelfClosing - <input int-prefix-value='3'/>
-                int-prefix-value - SingleQuotes
-                    Code span - Gen<Expr> - [3] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (27:0,27) - Tokens:1
-                        HtmlTokenType.Text;[3];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (32:0,32) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..32)::32 - [@{<input int-prefix-value='3'/>}]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            CSharpStatement - [0..32)::32
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..32)::31
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..31)::29
+                        MarkupBlock - [2..31)::29
+                            MarkupTagHelperElement - [2..31)::29 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..31)::29
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupTagHelperAttribute - [8..29)::21 - int-prefix-value - SingleQuotes - Bound - [ int-prefix-value='3']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..25)::16 - [int-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[int-prefix-value];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [27..28)::1
+                                            CSharpExpressionLiteral - [27..28)::1 - [3] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Text;[3];
+                                        MarkupTextLiteral - [28..29)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupTextLiteral - [29..31)::2 - [/>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [31..31)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.stree.txt
index 77e6f7407f..8de3649532 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block15.stree.txt
@@ -1,24 +1,44 @@
-Markup block - Gen<None> - 46 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 46 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 43 - (2:0,2)
-            Tag block - Gen<TagHelper> - 43 - (2:0,2) - input - InputTagHelper3
-                SelfClosing - <input string-prefix-value='some string' />
-                string-prefix-value - SingleQuotes
-                    Markup block - Gen<None> - 11 - (30:0,30)
-                        Markup span - Gen<Markup> - [some] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:1
-                            HtmlTokenType.Text;[some];
-                        Markup span - Gen<Markup> - [ string] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:2
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Text;[string];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (45:0,45) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (45:0,45) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..46)::46 - [@{<input string-prefix-value='some string' />}]
+    MarkupBlock - [0..46)::46
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..46)::46
+            CSharpStatement - [0..46)::46
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..46)::45
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..45)::43
+                        MarkupBlock - [2..45)::43
+                            MarkupTagHelperElement - [2..45)::43 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..45)::43
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupTagHelperAttribute - [8..42)::34 - string-prefix-value - SingleQuotes - Bound - [ string-prefix-value='some string']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..28)::19 - [string-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[string-prefix-value];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [29..30)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [30..41)::11
+                                            MarkupTextLiteral - [30..34)::4 - [some] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[some];
+                                            MarkupTextLiteral - [34..41)::7 - [ string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                                Text;[string];
+                                        MarkupTextLiteral - [41..42)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupTextLiteral - [42..45)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [45..45)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [46..46)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.stree.txt
index 434313e634..26724100c6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block16.stree.txt
@@ -1,19 +1,38 @@
-Markup block - Gen<None> - 51 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 51 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 48 - (2:0,2)
-            Tag block - Gen<TagHelper> - 48 - (2:0,2) - input - InputTagHelper1 - InputTagHelper3
-                SelfClosing - <input unbound-required bound-required-string />
-                unbound-required - Minimized
-                bound-required-string - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (50:0,50) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (50:0,50) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (51:0,51) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..51)::51 - [@{<input unbound-required bound-required-string />}]
+    MarkupBlock - [0..51)::51
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..51)::51
+            CSharpStatement - [0..51)::51
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..51)::50
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..50)::48
+                        MarkupBlock - [2..50)::48
+                            MarkupTagHelperElement - [2..50)::48 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..50)::48
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..25)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..25)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[unbound-required];
+                                    MarkupMinimizedTagHelperAttribute - [25..47)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                                        MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [26..47)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-string];
+                                    MarkupTextLiteral - [47..50)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [50..50)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [50..51)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [51..51)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.stree.txt
index 71a665bc1e..de83c6e0a1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block17.stree.txt
@@ -1,19 +1,42 @@
-Markup block - Gen<None> - 33 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 33 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 30 - (2:0,2)
-            Tag block - Gen<TagHelper> - 30 - (2:0,2) - p - PTagHelper
-                StartTagAndEndTag - <p bound-int bound-string> ... </p>
-                bound-int - Minimized
-                bound-string - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (32:0,32) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..33)::33 - [@{<p bound-int bound-string></p>}]
+    MarkupBlock - [0..33)::33
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..33)::33
+            CSharpStatement - [0..33)::33
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..33)::32
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..32)::30
+                        MarkupBlock - [2..32)::30
+                            MarkupTagHelperElement - [2..32)::30 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..28)::26
+                                    MarkupTextLiteral - [2..4)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                    MarkupMinimizedTagHelperAttribute - [4..14)::10 - bound-int - Minimized - Bound - [ bound-int]
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..14)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-int];
+                                    MarkupMinimizedTagHelperAttribute - [14..27)::13 - bound-string - Minimized - Bound - [ bound-string]
+                                        MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [15..27)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-string];
+                                    MarkupTextLiteral - [27..28)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        CloseAngle;[>];
+                                MarkupTagHelperEndTag - [28..32)::4
+                                    MarkupTextLiteral - [28..32)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [32..32)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [32..33)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [33..33)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.stree.txt
index 3e0c163f99..b3e5ccb59f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block18.stree.txt
@@ -1,20 +1,43 @@
-Markup block - Gen<None> - 70 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 70 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 67 - (2:0,2)
-            Tag block - Gen<TagHelper> - 67 - (2:0,2) - input - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
-                SelfClosing - <input bound-required-int unbound-required bound-required-string />
-                bound-required-int - Minimized
-                unbound-required - Minimized
-                bound-required-string - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (69:0,69) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (69:0,69) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (70:0,70) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..70)::70 - [@{<input bound-required-int unbound-required bound-required-string />}]
+    MarkupBlock - [0..70)::70
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..70)::70
+            CSharpStatement - [0..70)::70
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..70)::69
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..69)::67
+                        MarkupBlock - [2..69)::67
+                            MarkupTagHelperElement - [2..69)::67 - input[SelfClosing] - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..69)::67
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..27)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..27)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-int];
+                                    MarkupMinimizedTagHelperAttribute - [27..44)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                                        MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [28..44)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[unbound-required];
+                                    MarkupMinimizedTagHelperAttribute - [44..66)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                                        MarkupTextLiteral - [44..45)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [45..66)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-string];
+                                    MarkupTextLiteral - [66..69)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [69..69)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [69..70)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [70..70)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.stree.txt
index decd03bec2..74923d4fbe 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block19.stree.txt
@@ -1,20 +1,47 @@
-Markup block - Gen<None> - 46 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 46 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 43 - (2:0,2)
-            Tag block - Gen<TagHelper> - 43 - (2:0,2) - p - PTagHelper
-                StartTagAndEndTag - <p bound-int bound-string bound-string> ... </p>
-                bound-int - Minimized
-                bound-string - Minimized
-                bound-string - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (45:0,45) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (45:0,45) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..46)::46 - [@{<p bound-int bound-string bound-string></p>}]
+    MarkupBlock - [0..46)::46
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..46)::46
+            CSharpStatement - [0..46)::46
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..46)::45
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..45)::43
+                        MarkupBlock - [2..45)::43
+                            MarkupTagHelperElement - [2..45)::43 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..41)::39
+                                    MarkupTextLiteral - [2..4)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                    MarkupMinimizedTagHelperAttribute - [4..14)::10 - bound-int - Minimized - Bound - [ bound-int]
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..14)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-int];
+                                    MarkupMinimizedTagHelperAttribute - [14..27)::13 - bound-string - Minimized - Bound - [ bound-string]
+                                        MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [15..27)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-string];
+                                    MarkupMinimizedTagHelperAttribute - [27..40)::13 - bound-string - Minimized - Bound - [ bound-string]
+                                        MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [28..40)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-string];
+                                    MarkupTextLiteral - [40..41)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        CloseAngle;[>];
+                                MarkupTagHelperEndTag - [41..45)::4
+                                    MarkupTextLiteral - [41..45)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [45..45)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [46..46)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.stree.txt
index 29c2b7f600..b260068445 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block2.stree.txt
@@ -1,18 +1,37 @@
-Markup block - Gen<None> - 23 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 23 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 20 - (2:0,2)
-            Tag block - Gen<TagHelper> - 20 - (2:0,2) - p - PTagHelper
-                StartTagAndEndTag - <p bound-string> ... </p>
-                bound-string - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..23)::23 - [@{<p bound-string></p>}]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            CSharpStatement - [0..23)::23
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..23)::22
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..22)::20
+                        MarkupBlock - [2..22)::20
+                            MarkupTagHelperElement - [2..22)::20 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..18)::16
+                                    MarkupTextLiteral - [2..4)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                    MarkupMinimizedTagHelperAttribute - [4..17)::13 - bound-string - Minimized - Bound - [ bound-string]
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..17)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-string];
+                                    MarkupTextLiteral - [17..18)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        CloseAngle;[>];
+                                MarkupTagHelperEndTag - [18..22)::4
+                                    MarkupTextLiteral - [18..22)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [22..22)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [23..23)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.stree.txt
index 1a8e5fd07f..cf15a91cbb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block20.stree.txt
@@ -1,21 +1,47 @@
-Markup block - Gen<None> - 41 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 41 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 38 - (2:0,2)
-            Tag block - Gen<TagHelper> - 38 - (2:0,2) - input - InputTagHelper1 - InputTagHelper3
-                SelfClosing - <input unbound-required class='btn' />
-                unbound-required - Minimized
-                class - SingleQuotes
-                    Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..41)::41 - [@{<input unbound-required class='btn' />}]
+    MarkupBlock - [0..41)::41
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..41)::41
+            CSharpStatement - [0..41)::41
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..41)::40
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..40)::38
+                        MarkupBlock - [2..40)::38
+                            MarkupTagHelperElement - [2..40)::38 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..40)::38
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..25)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..25)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[unbound-required];
+                                    MarkupTagHelperAttribute - [25..37)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [26..31)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [32..33)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [33..36)::3
+                                            MarkupLiteralAttributeValue - [33..36)::3 - [btn]
+                                                MarkupTextLiteral - [33..36)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [36..37)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupTextLiteral - [37..40)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [40..40)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [40..41)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [41..41)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.stree.txt
index a8a5b62fe1..f437ef0425 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block21.stree.txt
@@ -1,21 +1,51 @@
-Markup block - Gen<None> - 35 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 35 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 32 - (2:0,2)
-            Tag block - Gen<TagHelper> - 32 - (2:0,2) - p - PTagHelper
-                StartTagAndEndTag - <p bound-string class='btn'> ... </p>
-                bound-string - Minimized
-                class - SingleQuotes
-                    Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (34:0,34) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..35)::35 - [@{<p bound-string class='btn'></p>}]
+    MarkupBlock - [0..35)::35
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..35)::35
+            CSharpStatement - [0..35)::35
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..35)::34
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..34)::32
+                        MarkupBlock - [2..34)::32
+                            MarkupTagHelperElement - [2..34)::32 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..30)::28
+                                    MarkupTextLiteral - [2..4)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                    MarkupMinimizedTagHelperAttribute - [4..17)::13 - bound-string - Minimized - Bound - [ bound-string]
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..17)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-string];
+                                    MarkupTagHelperAttribute - [17..29)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [18..23)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [25..28)::3
+                                            MarkupLiteralAttributeValue - [25..28)::3 - [btn]
+                                                MarkupTextLiteral - [25..28)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [28..29)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupTextLiteral - [29..30)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        CloseAngle;[>];
+                                MarkupTagHelperEndTag - [30..34)::4
+                                    MarkupTextLiteral - [30..34)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [34..34)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [34..35)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [35..35)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.stree.txt
index afaa6010a3..9725f0e4cc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block22.stree.txt
@@ -1,21 +1,47 @@
-Markup block - Gen<None> - 41 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 41 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 38 - (2:0,2)
-            Tag block - Gen<TagHelper> - 38 - (2:0,2) - input - InputTagHelper1 - InputTagHelper3
-                SelfClosing - <input class='btn' unbound-required />
-                class - SingleQuotes
-                    Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-                unbound-required - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..41)::41 - [@{<input class='btn' unbound-required />}]
+    MarkupBlock - [0..41)::41
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..41)::41
+            CSharpStatement - [0..41)::41
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..41)::40
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..40)::38
+                        MarkupBlock - [2..40)::38
+                            MarkupTagHelperElement - [2..40)::38 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..40)::38
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupTagHelperAttribute - [8..20)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [16..19)::3
+                                            MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                                                MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [20..37)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                                        MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [21..37)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[unbound-required];
+                                    MarkupTextLiteral - [37..40)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [40..40)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [40..41)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [41..41)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.stree.txt
index cfddd744e9..911f4fc096 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block23.stree.txt
@@ -1,21 +1,51 @@
-Markup block - Gen<None> - 35 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 35 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 32 - (2:0,2)
-            Tag block - Gen<TagHelper> - 32 - (2:0,2) - p - PTagHelper
-                StartTagAndEndTag - <p class='btn' bound-string> ... </p>
-                class - SingleQuotes
-                    Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-                bound-string - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (34:0,34) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..35)::35 - [@{<p class='btn' bound-string></p>}]
+    MarkupBlock - [0..35)::35
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..35)::35
+            CSharpStatement - [0..35)::35
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..35)::34
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..34)::32
+                        MarkupBlock - [2..34)::32
+                            MarkupTagHelperElement - [2..34)::32 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..30)::28
+                                    MarkupTextLiteral - [2..4)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                    MarkupTagHelperAttribute - [4..16)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..10)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [12..15)::3
+                                            MarkupLiteralAttributeValue - [12..15)::3 - [btn]
+                                                MarkupTextLiteral - [12..15)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [16..29)::13 - bound-string - Minimized - Bound - [ bound-string]
+                                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [17..29)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-string];
+                                    MarkupTextLiteral - [29..30)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        CloseAngle;[>];
+                                MarkupTagHelperEndTag - [30..34)::4
+                                    MarkupTextLiteral - [30..34)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [34..34)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [34..35)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [35..35)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.stree.txt
index 496c6cbd44..cf1050092c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block24.stree.txt
@@ -1,21 +1,47 @@
-Markup block - Gen<None> - 46 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 46 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 43 - (2:0,2)
-            Tag block - Gen<TagHelper> - 43 - (2:0,2) - input - InputTagHelper1 - InputTagHelper3
-                SelfClosing - <input bound-required-string class='btn' />
-                bound-required-string - Minimized
-                class - SingleQuotes
-                    Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (38:0,38) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (45:0,45) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (45:0,45) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..46)::46 - [@{<input bound-required-string class='btn' />}]
+    MarkupBlock - [0..46)::46
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..46)::46
+            CSharpStatement - [0..46)::46
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..46)::45
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..45)::43
+                        MarkupBlock - [2..45)::43
+                            MarkupTagHelperElement - [2..45)::43 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..45)::43
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..30)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..30)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-string];
+                                    MarkupTagHelperAttribute - [30..42)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [31..36)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [38..41)::3
+                                            MarkupLiteralAttributeValue - [38..41)::3 - [btn]
+                                                MarkupTextLiteral - [38..41)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [41..42)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupTextLiteral - [42..45)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [45..45)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [46..46)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.stree.txt
index a93a8dd64d..b9e07e1704 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block25.stree.txt
@@ -1,21 +1,47 @@
-Markup block - Gen<None> - 46 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 46 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 43 - (2:0,2)
-            Tag block - Gen<TagHelper> - 43 - (2:0,2) - input - InputTagHelper1 - InputTagHelper3
-                SelfClosing - <input class='btn' bound-required-string />
-                class - SingleQuotes
-                    Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-                bound-required-string - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (45:0,45) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (45:0,45) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..46)::46 - [@{<input class='btn' bound-required-string />}]
+    MarkupBlock - [0..46)::46
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..46)::46
+            CSharpStatement - [0..46)::46
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..46)::45
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..45)::43
+                        MarkupBlock - [2..45)::43
+                            MarkupTagHelperElement - [2..45)::43 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..45)::43
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupTagHelperAttribute - [8..20)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [16..19)::3
+                                            MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                                                MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [20..42)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                                        MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [21..42)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-string];
+                                    MarkupTextLiteral - [42..45)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [45..45)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [46..46)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.stree.txt
index 18726e95e0..90aa657d7b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block26.stree.txt
@@ -1,21 +1,47 @@
-Markup block - Gen<None> - 43 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 43 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 40 - (2:0,2)
-            Tag block - Gen<TagHelper> - 40 - (2:0,2) - input - InputTagHelper2 - InputTagHelper3
-                SelfClosing - <input bound-required-int class='btn' />
-                bound-required-int - Minimized
-                class - SingleQuotes
-                    Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (42:0,42) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (42:0,42) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..43)::43 - [@{<input bound-required-int class='btn' />}]
+    MarkupBlock - [0..43)::43
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..43)::43
+            CSharpStatement - [0..43)::43
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..43)::42
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..42)::40
+                        MarkupBlock - [2..42)::40
+                            MarkupTagHelperElement - [2..42)::40 - input[SelfClosing] - InputTagHelper2 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..42)::40
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..27)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..27)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-int];
+                                    MarkupTagHelperAttribute - [27..39)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [28..33)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [34..35)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [35..38)::3
+                                            MarkupLiteralAttributeValue - [35..38)::3 - [btn]
+                                                MarkupTextLiteral - [35..38)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [38..39)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupTextLiteral - [39..42)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [42..42)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [42..43)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [43..43)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.stree.txt
index f1e43fe405..3fe735e343 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block27.stree.txt
@@ -1,21 +1,51 @@
-Markup block - Gen<None> - 32 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 32 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 29 - (2:0,2)
-            Tag block - Gen<TagHelper> - 29 - (2:0,2) - p - PTagHelper
-                StartTagAndEndTag - <p bound-int class='btn'> ... </p>
-                bound-int - Minimized
-                class - SingleQuotes
-                    Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (32:0,32) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..32)::32 - [@{<p bound-int class='btn'></p>}]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            CSharpStatement - [0..32)::32
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..32)::31
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..31)::29
+                        MarkupBlock - [2..31)::29
+                            MarkupTagHelperElement - [2..31)::29 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..27)::25
+                                    MarkupTextLiteral - [2..4)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                    MarkupMinimizedTagHelperAttribute - [4..14)::10 - bound-int - Minimized - Bound - [ bound-int]
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..14)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-int];
+                                    MarkupTagHelperAttribute - [14..26)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [15..20)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [22..25)::3
+                                            MarkupLiteralAttributeValue - [22..25)::3 - [btn]
+                                                MarkupTextLiteral - [22..25)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [25..26)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupTextLiteral - [26..27)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        CloseAngle;[>];
+                                MarkupTagHelperEndTag - [27..31)::4
+                                    MarkupTextLiteral - [27..31)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [31..31)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.stree.txt
index 83247a5fb8..666f88ea0f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block28.stree.txt
@@ -1,21 +1,47 @@
-Markup block - Gen<None> - 43 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 43 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 40 - (2:0,2)
-            Tag block - Gen<TagHelper> - 40 - (2:0,2) - input - InputTagHelper2 - InputTagHelper3
-                SelfClosing - <input class='btn' bound-required-int />
-                class - SingleQuotes
-                    Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-                bound-required-int - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (42:0,42) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (42:0,42) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..43)::43 - [@{<input class='btn' bound-required-int />}]
+    MarkupBlock - [0..43)::43
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..43)::43
+            CSharpStatement - [0..43)::43
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..43)::42
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..42)::40
+                        MarkupBlock - [2..42)::40
+                            MarkupTagHelperElement - [2..42)::40 - input[SelfClosing] - InputTagHelper2 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..42)::40
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupTagHelperAttribute - [8..20)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [16..19)::3
+                                            MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                                                MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [20..39)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                                        MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [21..39)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-int];
+                                    MarkupTextLiteral - [39..42)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [42..42)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [42..43)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [43..43)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.stree.txt
index 9ce6437546..d32d0789f9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block29.stree.txt
@@ -1,21 +1,51 @@
-Markup block - Gen<None> - 32 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 32 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 29 - (2:0,2)
-            Tag block - Gen<TagHelper> - 29 - (2:0,2) - p - PTagHelper
-                StartTagAndEndTag - <p class='btn' bound-int> ... </p>
-                class - SingleQuotes
-                    Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-                bound-int - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (32:0,32) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..32)::32 - [@{<p class='btn' bound-int></p>}]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..32)::32
+            CSharpStatement - [0..32)::32
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..32)::31
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..31)::29
+                        MarkupBlock - [2..31)::29
+                            MarkupTagHelperElement - [2..31)::29 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..27)::25
+                                    MarkupTextLiteral - [2..4)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                    MarkupTagHelperAttribute - [4..16)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..10)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [12..15)::3
+                                            MarkupLiteralAttributeValue - [12..15)::3 - [btn]
+                                                MarkupTextLiteral - [12..15)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[btn];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [16..26)::10 - bound-int - Minimized - Bound - [ bound-int]
+                                        MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [17..26)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-int];
+                                    MarkupTextLiteral - [26..27)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        CloseAngle;[>];
+                                MarkupTagHelperEndTag - [27..31)::4
+                                    MarkupTextLiteral - [27..31)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [31..31)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [31..32)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [32..32)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.stree.txt
index 5d90acc10c..21d1fe017f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block3.stree.txt
@@ -1,18 +1,33 @@
-Markup block - Gen<None> - 34 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 34 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 31 - (2:0,2)
-            Tag block - Gen<TagHelper> - 31 - (2:0,2) - input - InputTagHelper1 - InputTagHelper3
-                SelfClosing - <input bound-required-string />
-                bound-required-string - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (33:0,33) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..34)::34 - [@{<input bound-required-string />}]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        MarkupBlock - [2..33)::31
+                            MarkupTagHelperElement - [2..33)::31 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..33)::31
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..30)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..30)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-string];
+                                    MarkupTextLiteral - [30..33)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.cspans.txt
index 415c40c4f1..e24fb99361 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.cspans.txt
@@ -2,7 +2,7 @@ Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [57]
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [57] )
 MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [57] )
 Transition span at (16:0,16 [1] ) (Accepts:None) - Parent: Expression block at (16:0,16 [13] )
-Code span at (17:0,17 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (16:0,16 [13] )
+Code span at (17:0,17 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (16:0,16 [13] )
 Markup span at (29:0,29 [2] ) (Accepts:Any) - Parent: Markup block at (16:0,16 [17] )
 Markup span at (31:0,31 [2] ) (Accepts:Any) - Parent: Markup block at (16:0,16 [17] )
 Code span at (56:0,56 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [57] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.stree.txt
index 699b61cdf6..32c3b9f29b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block30.stree.txt
@@ -1,34 +1,66 @@
-Markup block - Gen<None> - 57 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 57 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 54 - (2:0,2)
-            Tag block - Gen<TagHelper> - 54 - (2:0,2) - input - InputTagHelper2 - InputTagHelper3
-                SelfClosing - <input class='@DateTime.Now + 1' bound-required-int />
-                class - SingleQuotes
-                    Markup block - Gen<None> - 17 - (16:0,16)
-                        Markup block - Gen<DynAttr:@(16:0,16)> - 13 - (16:0,16)
-                            Expression block - Gen<Expr> - 13 - (16:0,16)
-                                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-                                    CSharpTokenType.Transition;[@];
-                                Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (17:0,17) - Tokens:3
-                                    CSharpTokenType.Identifier;[DateTime];
-                                    CSharpTokenType.Dot;[.];
-                                    CSharpTokenType.Identifier;[Now];
-                        Markup span - Gen<LitAttr: @(29:0,29)> - [ +] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:2
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Text;[+];
-                        Markup span - Gen<LitAttr: @(31:0,31)> - [ 1] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:2
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Text;[1];
-                bound-required-int - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (56:0,56) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (56:0,56) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (57:0,57) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..57)::57 - [@{<input class='@DateTime.Now + 1' bound-required-int />}]
+    MarkupBlock - [0..57)::57
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..57)::57
+            CSharpStatement - [0..57)::57
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..57)::56
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..56)::54
+                        MarkupBlock - [2..56)::54
+                            MarkupTagHelperElement - [2..56)::54 - input[SelfClosing] - InputTagHelper2 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..56)::54
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupTagHelperAttribute - [8..34)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [16..33)::17
+                                            MarkupDynamicAttributeValue - [16..29)::13 - [@DateTime.Now]
+                                                GenericBlock - [16..29)::13
+                                                    CSharpCodeBlock - [16..29)::13
+                                                        CSharpImplicitExpression - [16..29)::13
+                                                            CSharpTransition - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [17..29)::12
+                                                                CSharpCodeBlock - [17..29)::12
+                                                                    CSharpExpressionLiteral - [17..29)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                            MarkupLiteralAttributeValue - [29..31)::2 - [ +]
+                                                MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [30..31)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[+];
+                                            MarkupLiteralAttributeValue - [31..33)::2 - [ 1]
+                                                MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [32..33)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[1];
+                                        MarkupTextLiteral - [33..34)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [34..53)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                                        MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [35..53)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-int];
+                                    MarkupTextLiteral - [53..56)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [56..56)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [56..57)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [57..57)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.cspans.txt
index f28e3bd9e6..50cbc5077c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.cspans.txt
@@ -2,7 +2,7 @@ Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [46]
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
 MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [46] )
 Transition span at (12:0,12 [1] ) (Accepts:None) - Parent: Expression block at (12:0,12 [13] )
-Code span at (13:0,13 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (12:0,12 [13] )
+Code span at (13:0,13 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (12:0,12 [13] )
 Markup span at (25:0,25 [2] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [17] )
 Markup span at (27:0,27 [2] ) (Accepts:Any) - Parent: Markup block at (12:0,12 [17] )
 Code span at (45:0,45 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [46] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.stree.txt
index 65fae9c607..dd5804b070 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block31.stree.txt
@@ -1,34 +1,70 @@
-Markup block - Gen<None> - 46 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 46 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 43 - (2:0,2)
-            Tag block - Gen<TagHelper> - 43 - (2:0,2) - p - PTagHelper
-                StartTagAndEndTag - <p class='@DateTime.Now + 1' bound-int> ... </p>
-                class - SingleQuotes
-                    Markup block - Gen<None> - 17 - (12:0,12)
-                        Markup block - Gen<DynAttr:@(12:0,12)> - 13 - (12:0,12)
-                            Expression block - Gen<Expr> - 13 - (12:0,12)
-                                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-                                    CSharpTokenType.Transition;[@];
-                                Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (13:0,13) - Tokens:3
-                                    CSharpTokenType.Identifier;[DateTime];
-                                    CSharpTokenType.Dot;[.];
-                                    CSharpTokenType.Identifier;[Now];
-                        Markup span - Gen<LitAttr: @(25:0,25)> - [ +] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:2
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Text;[+];
-                        Markup span - Gen<LitAttr: @(27:0,27)> - [ 1] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:2
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Text;[1];
-                bound-int - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (45:0,45) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (45:0,45) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..46)::46 - [@{<p class='@DateTime.Now + 1' bound-int></p>}]
+    MarkupBlock - [0..46)::46
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..46)::46
+            CSharpStatement - [0..46)::46
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..46)::45
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..45)::43
+                        MarkupBlock - [2..45)::43
+                            MarkupTagHelperElement - [2..45)::43 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..41)::39
+                                    MarkupTextLiteral - [2..4)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                    MarkupTagHelperAttribute - [4..30)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..10)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [12..29)::17
+                                            MarkupDynamicAttributeValue - [12..25)::13 - [@DateTime.Now]
+                                                GenericBlock - [12..25)::13
+                                                    CSharpCodeBlock - [12..25)::13
+                                                        CSharpImplicitExpression - [12..25)::13
+                                                            CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [13..25)::12
+                                                                CSharpCodeBlock - [13..25)::12
+                                                                    CSharpExpressionLiteral - [13..25)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                            MarkupLiteralAttributeValue - [25..27)::2 - [ +]
+                                                MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [26..27)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[+];
+                                            MarkupLiteralAttributeValue - [27..29)::2 - [ 1]
+                                                MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [28..29)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[1];
+                                        MarkupTextLiteral - [29..30)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [30..40)::10 - bound-int - Minimized - Bound - [ bound-int]
+                                        MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [31..40)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-int];
+                                    MarkupTextLiteral - [40..41)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        CloseAngle;[>];
+                                MarkupTagHelperEndTag - [41..45)::4
+                                    MarkupTextLiteral - [41..45)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [45..45)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [45..46)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [46..46)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.cspans.txt
index ba1b7026ec..24ce3652a1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.cspans.txt
@@ -2,11 +2,11 @@ Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [129]
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [129] )
 MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [129] )
 Transition span at (38:0,38 [1] ) (Accepts:None) - Parent: Expression block at (38:0,38 [13] )
-Code span at (39:0,39 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (38:0,38 [13] )
+Code span at (39:0,39 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (38:0,38 [13] )
 Markup span at (51:0,51 [2] ) (Accepts:Any) - Parent: Markup block at (38:0,38 [17] )
 Markup span at (53:0,53 [2] ) (Accepts:Any) - Parent: Markup block at (38:0,38 [17] )
 Transition span at (88:0,88 [1] ) (Accepts:None) - Parent: Expression block at (88:0,88 [13] )
-Code span at (89:0,89 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (88:0,88 [13] )
+Code span at (89:0,89 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (88:0,88 [13] )
 Markup span at (101:0,101 [2] ) (Accepts:Any) - Parent: Markup block at (88:0,88 [17] )
 Markup span at (103:0,103 [2] ) (Accepts:Any) - Parent: Markup block at (88:0,88 [17] )
 Code span at (128:0,128 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [129] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.stree.txt
index 4fdce921d5..c36d7d279e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block32.stree.txt
@@ -1,52 +1,109 @@
-Markup block - Gen<None> - 129 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 129 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 126 - (2:0,2)
-            Tag block - Gen<TagHelper> - 126 - (2:0,2) - input - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
-                SelfClosing - <input    bound-required-int class='@DateTime.Now + 1'   bound-required-string class='@DateTime.Now + 1'  unbound-required  />
-                bound-required-int - Minimized
-                class - SingleQuotes
-                    Markup block - Gen<None> - 17 - (38:0,38)
-                        Markup block - Gen<DynAttr:@(38:0,38)> - 13 - (38:0,38)
-                            Expression block - Gen<Expr> - 13 - (38:0,38)
-                                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:1
-                                    CSharpTokenType.Transition;[@];
-                                Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (39:0,39) - Tokens:3
-                                    CSharpTokenType.Identifier;[DateTime];
-                                    CSharpTokenType.Dot;[.];
-                                    CSharpTokenType.Identifier;[Now];
-                        Markup span - Gen<LitAttr: @(51:0,51)> - [ +] - SpanEditHandler;Accepts:Any - (51:0,51) - Tokens:2
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Text;[+];
-                        Markup span - Gen<LitAttr: @(53:0,53)> - [ 1] - SpanEditHandler;Accepts:Any - (53:0,53) - Tokens:2
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Text;[1];
-                bound-required-string - Minimized
-                class - SingleQuotes
-                    Markup block - Gen<None> - 17 - (88:0,88)
-                        Markup block - Gen<DynAttr:@(88:0,88)> - 13 - (88:0,88)
-                            Expression block - Gen<Expr> - 13 - (88:0,88)
-                                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (88:0,88) - Tokens:1
-                                    CSharpTokenType.Transition;[@];
-                                Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (89:0,89) - Tokens:3
-                                    CSharpTokenType.Identifier;[DateTime];
-                                    CSharpTokenType.Dot;[.];
-                                    CSharpTokenType.Identifier;[Now];
-                        Markup span - Gen<LitAttr: @(101:0,101)> - [ +] - SpanEditHandler;Accepts:Any - (101:0,101) - Tokens:2
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Text;[+];
-                        Markup span - Gen<LitAttr: @(103:0,103)> - [ 1] - SpanEditHandler;Accepts:Any - (103:0,103) - Tokens:2
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Text;[1];
-                unbound-required - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (128:0,128) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (128:0,128) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (129:0,129) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..129)::129 - [@{<input    bound-required-int class='@DateTime.Now + 1'   bound-required-string class='@DateTime.Now + 1'  unbound-required  />}]
+    MarkupBlock - [0..129)::129
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..129)::129
+            CSharpStatement - [0..129)::129
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..129)::128
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..128)::126
+                        MarkupBlock - [2..128)::126
+                            MarkupTagHelperElement - [2..128)::126 - input[SelfClosing] - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..128)::126
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..30)::22 - bound-required-int - Minimized - Bound - [    bound-required-int]
+                                        MarkupTextLiteral - [8..12)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[    ];
+                                        MarkupTextLiteral - [12..30)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-int];
+                                    MarkupTagHelperAttribute - [30..56)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                                        MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [31..36)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [37..38)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [38..55)::17
+                                            MarkupDynamicAttributeValue - [38..51)::13 - [@DateTime.Now]
+                                                GenericBlock - [38..51)::13
+                                                    CSharpCodeBlock - [38..51)::13
+                                                        CSharpImplicitExpression - [38..51)::13
+                                                            CSharpTransition - [38..39)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [39..51)::12
+                                                                CSharpCodeBlock - [39..51)::12
+                                                                    CSharpExpressionLiteral - [39..51)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                            MarkupLiteralAttributeValue - [51..53)::2 - [ +]
+                                                MarkupTextLiteral - [51..52)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [52..53)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[+];
+                                            MarkupLiteralAttributeValue - [53..55)::2 - [ 1]
+                                                MarkupTextLiteral - [53..54)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [54..55)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[1];
+                                        MarkupTextLiteral - [55..56)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [56..80)::24 - bound-required-string - Minimized - Bound - [   bound-required-string]
+                                        MarkupTextLiteral - [56..59)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[   ];
+                                        MarkupTextLiteral - [59..80)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-string];
+                                    MarkupTagHelperAttribute - [80..106)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                                        MarkupTextLiteral - [80..81)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [81..86)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [87..88)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [88..105)::17
+                                            MarkupDynamicAttributeValue - [88..101)::13 - [@DateTime.Now]
+                                                GenericBlock - [88..101)::13
+                                                    CSharpCodeBlock - [88..101)::13
+                                                        CSharpImplicitExpression - [88..101)::13
+                                                            CSharpTransition - [88..89)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [89..101)::12
+                                                                CSharpCodeBlock - [89..101)::12
+                                                                    CSharpExpressionLiteral - [89..101)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                            MarkupLiteralAttributeValue - [101..103)::2 - [ +]
+                                                MarkupTextLiteral - [101..102)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [102..103)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[+];
+                                            MarkupLiteralAttributeValue - [103..105)::2 - [ 1]
+                                                MarkupTextLiteral - [103..104)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [104..105)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[1];
+                                        MarkupTextLiteral - [105..106)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [106..124)::18 - unbound-required - Minimized - Unbound - [  unbound-required]
+                                        MarkupTextLiteral - [106..108)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[  ];
+                                        MarkupTextLiteral - [108..124)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[unbound-required];
+                                    MarkupTextLiteral - [124..128)::4 - [  />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[  ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [128..128)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [128..129)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [129..129)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.cspans.txt
index 8299dada63..a67845db19 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.cspans.txt
@@ -2,11 +2,11 @@ Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [104]
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [104] )
 MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [104] )
 Transition span at (25:0,25 [1] ) (Accepts:None) - Parent: Expression block at (25:0,25 [13] )
-Code span at (26:0,26 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (25:0,25 [13] )
+Code span at (26:0,26 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (25:0,25 [13] )
 Markup span at (38:0,38 [2] ) (Accepts:Any) - Parent: Markup block at (25:0,25 [17] )
 Markup span at (40:0,40 [2] ) (Accepts:Any) - Parent: Markup block at (25:0,25 [17] )
 Transition span at (66:0,66 [1] ) (Accepts:None) - Parent: Expression block at (66:0,66 [13] )
-Code span at (67:0,67 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (66:0,66 [13] )
+Code span at (67:0,67 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (66:0,66 [13] )
 Markup span at (79:0,79 [2] ) (Accepts:Any) - Parent: Markup block at (66:0,66 [17] )
 Markup span at (81:0,81 [2] ) (Accepts:Any) - Parent: Markup block at (66:0,66 [17] )
 Code span at (103:0,103 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [104] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.stree.txt
index 7c004e9ee0..68a4e77a48 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block33.stree.txt
@@ -1,52 +1,113 @@
-Markup block - Gen<None> - 104 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 104 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 101 - (2:0,2)
-            Tag block - Gen<TagHelper> - 101 - (2:0,2) - p - PTagHelper
-                StartTagAndEndTag - <p    bound-int class='@DateTime.Now + 1'   bound-string class='@DateTime.Now + 1'  bound-string> ... </p>
-                bound-int - Minimized
-                class - SingleQuotes
-                    Markup block - Gen<None> - 17 - (25:0,25)
-                        Markup block - Gen<DynAttr:@(25:0,25)> - 13 - (25:0,25)
-                            Expression block - Gen<Expr> - 13 - (25:0,25)
-                                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1
-                                    CSharpTokenType.Transition;[@];
-                                Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (26:0,26) - Tokens:3
-                                    CSharpTokenType.Identifier;[DateTime];
-                                    CSharpTokenType.Dot;[.];
-                                    CSharpTokenType.Identifier;[Now];
-                        Markup span - Gen<LitAttr: @(38:0,38)> - [ +] - SpanEditHandler;Accepts:Any - (38:0,38) - Tokens:2
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Text;[+];
-                        Markup span - Gen<LitAttr: @(40:0,40)> - [ 1] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:2
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Text;[1];
-                bound-string - Minimized
-                class - SingleQuotes
-                    Markup block - Gen<None> - 17 - (66:0,66)
-                        Markup block - Gen<DynAttr:@(66:0,66)> - 13 - (66:0,66)
-                            Expression block - Gen<Expr> - 13 - (66:0,66)
-                                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (66:0,66) - Tokens:1
-                                    CSharpTokenType.Transition;[@];
-                                Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (67:0,67) - Tokens:3
-                                    CSharpTokenType.Identifier;[DateTime];
-                                    CSharpTokenType.Dot;[.];
-                                    CSharpTokenType.Identifier;[Now];
-                        Markup span - Gen<LitAttr: @(79:0,79)> - [ +] - SpanEditHandler;Accepts:Any - (79:0,79) - Tokens:2
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Text;[+];
-                        Markup span - Gen<LitAttr: @(81:0,81)> - [ 1] - SpanEditHandler;Accepts:Any - (81:0,81) - Tokens:2
-                            HtmlTokenType.WhiteSpace;[ ];
-                            HtmlTokenType.Text;[1];
-                bound-string - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (103:0,103) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (103:0,103) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (104:0,104) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..104)::104 - [@{<p    bound-int class='@DateTime.Now + 1'   bound-string class='@DateTime.Now + 1'  bound-string></p>}]
+    MarkupBlock - [0..104)::104
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..104)::104
+            CSharpStatement - [0..104)::104
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..104)::103
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..103)::101
+                        MarkupBlock - [2..103)::101
+                            MarkupTagHelperElement - [2..103)::101 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..99)::97
+                                    MarkupTextLiteral - [2..4)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                    MarkupMinimizedTagHelperAttribute - [4..17)::13 - bound-int - Minimized - Bound - [    bound-int]
+                                        MarkupTextLiteral - [4..8)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[    ];
+                                        MarkupTextLiteral - [8..17)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-int];
+                                    MarkupTagHelperAttribute - [17..43)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                                        MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [18..23)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [25..42)::17
+                                            MarkupDynamicAttributeValue - [25..38)::13 - [@DateTime.Now]
+                                                GenericBlock - [25..38)::13
+                                                    CSharpCodeBlock - [25..38)::13
+                                                        CSharpImplicitExpression - [25..38)::13
+                                                            CSharpTransition - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [26..38)::12
+                                                                CSharpCodeBlock - [26..38)::12
+                                                                    CSharpExpressionLiteral - [26..38)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                            MarkupLiteralAttributeValue - [38..40)::2 - [ +]
+                                                MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [39..40)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[+];
+                                            MarkupLiteralAttributeValue - [40..42)::2 - [ 1]
+                                                MarkupTextLiteral - [40..41)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [41..42)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[1];
+                                        MarkupTextLiteral - [42..43)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [43..58)::15 - bound-string - Minimized - Bound - [   bound-string]
+                                        MarkupTextLiteral - [43..46)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[   ];
+                                        MarkupTextLiteral - [46..58)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-string];
+                                    MarkupTagHelperAttribute - [58..84)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                                        MarkupTextLiteral - [58..59)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [59..64)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[class];
+                                        Equals;[=];
+                                        MarkupTextLiteral - [65..66)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                        MarkupTagHelperAttributeValue - [66..83)::17
+                                            MarkupDynamicAttributeValue - [66..79)::13 - [@DateTime.Now]
+                                                GenericBlock - [66..79)::13
+                                                    CSharpCodeBlock - [66..79)::13
+                                                        CSharpImplicitExpression - [66..79)::13
+                                                            CSharpTransition - [66..67)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                                Transition;[@];
+                                                            CSharpImplicitExpressionBody - [67..79)::12
+                                                                CSharpCodeBlock - [67..79)::12
+                                                                    CSharpExpressionLiteral - [67..79)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                        Identifier;[DateTime];
+                                                                        Dot;[.];
+                                                                        Identifier;[Now];
+                                            MarkupLiteralAttributeValue - [79..81)::2 - [ +]
+                                                MarkupTextLiteral - [79..80)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [80..81)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[+];
+                                            MarkupLiteralAttributeValue - [81..83)::2 - [ 1]
+                                                MarkupTextLiteral - [81..82)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Whitespace;[ ];
+                                                MarkupTextLiteral - [82..83)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                    Text;[1];
+                                        MarkupTextLiteral - [83..84)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                            SingleQuote;['];
+                                    MarkupMinimizedTagHelperAttribute - [84..98)::14 - bound-string - Minimized - Bound - [  bound-string]
+                                        MarkupTextLiteral - [84..86)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[  ];
+                                        MarkupTextLiteral - [86..98)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-string];
+                                    MarkupTextLiteral - [98..99)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        CloseAngle;[>];
+                                MarkupTagHelperEndTag - [99..103)::4
+                                    MarkupTextLiteral - [99..103)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [103..103)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [103..104)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [104..104)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.stree.txt
index 15d55453bd..15574d2312 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block4.stree.txt
@@ -1,18 +1,33 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 31 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 28 - (2:0,2)
-            Tag block - Gen<TagHelper> - 28 - (2:0,2) - input - InputTagHelper2 - InputTagHelper3
-                SelfClosing - <input bound-required-int />
-                bound-required-int - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (30:0,30) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..31)::31 - [@{<input bound-required-int />}]
+    MarkupBlock - [0..31)::31
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..31)::31
+            CSharpStatement - [0..31)::31
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..31)::30
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..30)::28
+                        MarkupBlock - [2..30)::28
+                            MarkupTagHelperElement - [2..30)::28 - input[SelfClosing] - InputTagHelper2 - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..30)::28
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..27)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..27)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-required-int];
+                                    MarkupTextLiteral - [27..30)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [30..30)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [30..31)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [31..31)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.stree.txt
index 53d9b44ac1..8547da82f9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block5.stree.txt
@@ -1,18 +1,37 @@
-Markup block - Gen<None> - 20 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 20 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 17 - (2:0,2)
-            Tag block - Gen<TagHelper> - 17 - (2:0,2) - p - PTagHelper
-                StartTagAndEndTag - <p bound-int> ... </p>
-                bound-int - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..20)::20 - [@{<p bound-int></p>}]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            CSharpStatement - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..20)::19
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..19)::17
+                        MarkupBlock - [2..19)::17
+                            MarkupTagHelperElement - [2..19)::17 - p[StartTagAndEndTag] - PTagHelper
+                                MarkupTagHelperStartTag - [2..15)::13
+                                    MarkupTextLiteral - [2..4)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                    MarkupMinimizedTagHelperAttribute - [4..14)::10 - bound-int - Minimized - Bound - [ bound-int]
+                                        MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [5..14)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[bound-int];
+                                    MarkupTextLiteral - [14..15)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        CloseAngle;[>];
+                                MarkupTagHelperEndTag - [15..19)::4
+                                    MarkupTextLiteral - [15..19)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [19..19)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [19..20)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [20..20)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.stree.txt
index aeda1ec07a..7d1690d897 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block6.stree.txt
@@ -1,18 +1,32 @@
-Markup block - Gen<None> - 26 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 26 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 23 - (2:0,2)
-            Tag block - Gen<TagHelper> - 23 - (2:0,2) - input - InputTagHelper3
-                SelfClosing - <input int-dictionary/>
-                int-dictionary - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..26)::26 - [@{<input int-dictionary/>}]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            CSharpStatement - [0..26)::26
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..26)::25
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..25)::23
+                        MarkupBlock - [2..25)::23
+                            MarkupTagHelperElement - [2..25)::23 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..25)::23
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..23)::15 - int-dictionary - Minimized - Bound - [ int-dictionary]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..23)::14 - [int-dictionary] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[int-dictionary];
+                                    MarkupTextLiteral - [23..25)::2 - [/>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [25..25)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [26..26)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.stree.txt
index 7684a43a56..2f52d89c24 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block7.stree.txt
@@ -1,18 +1,33 @@
-Markup block - Gen<None> - 30 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 30 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 27 - (2:0,2)
-            Tag block - Gen<TagHelper> - 27 - (2:0,2) - input - InputTagHelper3
-                SelfClosing - <input string-dictionary />
-                string-dictionary - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (29:0,29) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..30)::30 - [@{<input string-dictionary />}]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..30)::30
+            CSharpStatement - [0..30)::30
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..30)::29
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..29)::27
+                        MarkupBlock - [2..29)::27
+                            MarkupTagHelperElement - [2..29)::27 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..29)::27
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..26)::18 - string-dictionary - Minimized - Bound - [ string-dictionary]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..26)::17 - [string-dictionary] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[string-dictionary];
+                                    MarkupTextLiteral - [26..29)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [29..29)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [29..30)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [30..30)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.stree.txt
index 770dc82801..aa96354dea 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block8.stree.txt
@@ -1,18 +1,33 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 24 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 21 - (2:0,2)
-            Tag block - Gen<TagHelper> - 21 - (2:0,2) - input - InputTagHelper3
-                SelfClosing - <input int-prefix- />
-                int-prefix- - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..24)::24 - [@{<input int-prefix- />}]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..24)::24
+            CSharpStatement - [0..24)::24
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..24)::23
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..23)::21
+                        MarkupBlock - [2..23)::21
+                            MarkupTagHelperElement - [2..23)::21 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..23)::21
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..20)::12 - int-prefix- - Minimized - Bound - [ int-prefix-]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..20)::11 - [int-prefix-] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[int-prefix-];
+                                    MarkupTextLiteral - [20..23)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Whitespace;[ ];
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [23..23)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [24..24)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.stree.txt
index c76d08d9d9..a66614b0ff 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Block9.stree.txt
@@ -1,18 +1,32 @@
-Markup block - Gen<None> - 26 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 26 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 23 - (2:0,2)
-            Tag block - Gen<TagHelper> - 23 - (2:0,2) - input - InputTagHelper3
-                SelfClosing - <input string-prefix-/>
-                string-prefix- - Minimized
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..26)::26 - [@{<input string-prefix-/>}]
+    MarkupBlock - [0..26)::26
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..26)::26
+            CSharpStatement - [0..26)::26
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..26)::25
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..25)::23
+                        MarkupBlock - [2..25)::23
+                            MarkupTagHelperElement - [2..25)::23 - input[SelfClosing] - InputTagHelper3
+                                MarkupTagHelperStartTag - [2..25)::23
+                                    MarkupTextLiteral - [2..8)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        Text;[input];
+                                    MarkupMinimizedTagHelperAttribute - [8..23)::15 - string-prefix- - Minimized - Bound - [ string-prefix-]
+                                        MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Whitespace;[ ];
+                                        MarkupTextLiteral - [9..23)::14 - [string-prefix-] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            Text;[string-prefix-];
+                                    MarkupTextLiteral - [23..25)::2 - [/>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        ForwardSlash;[/];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [25..25)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [26..26)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document1.stree.txt
index 8a35bfa8f2..0c464f7241 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document1.stree.txt
@@ -1,4 +1,16 @@
-Markup block - Gen<None> - 26 - (0:0,0)
-    Tag block - Gen<TagHelper> - 26 - (0:0,0) - input - InputTagHelper1 - InputTagHelper3
-        SelfClosing - <input unbound-required />
-        unbound-required - Minimized
+RazorDocument - [0..26)::26 - [<input unbound-required />]
+    MarkupBlock - [0..26)::26
+        MarkupTagHelperElement - [0..26)::26 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..26)::26
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..23)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..23)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[unbound-required];
+                MarkupTextLiteral - [23..26)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.stree.txt
index 8c636ecf07..eb325261e0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document10.stree.txt
@@ -1,4 +1,15 @@
-Markup block - Gen<None> - 25 - (0:0,0)
-    Tag block - Gen<TagHelper> - 25 - (0:0,0) - input - InputTagHelper3
-        SelfClosing - <input int-prefix-value/>
-        int-prefix-value - Minimized
+RazorDocument - [0..25)::25 - [<input int-prefix-value/>]
+    MarkupBlock - [0..25)::25
+        MarkupTagHelperElement - [0..25)::25 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..25)::25
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..23)::17 - int-prefix-value - Minimized - Bound - [ int-prefix-value]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..23)::16 - [int-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[int-prefix-value];
+                MarkupTextLiteral - [23..25)::2 - [/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.stree.txt
index f8f403ef11..74209e5045 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document11.stree.txt
@@ -1,4 +1,16 @@
-Markup block - Gen<None> - 29 - (0:0,0)
-    Tag block - Gen<TagHelper> - 29 - (0:0,0) - input - InputTagHelper3
-        SelfClosing - <input string-prefix-value />
-        string-prefix-value - Minimized
+RazorDocument - [0..29)::29 - [<input string-prefix-value />]
+    MarkupBlock - [0..29)::29
+        MarkupTagHelperElement - [0..29)::29 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..29)::29
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..26)::20 - string-prefix-value - Minimized - Bound - [ string-prefix-value]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..26)::19 - [string-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[string-prefix-value];
+                MarkupTextLiteral - [26..29)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.cspans.txt
index e69de29bb2..fd32ae8345 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.cspans.txt
@@ -0,0 +1 @@
+Code span at (25:0,25 [0] ) (Accepts:AnyExceptNewline) - Parent: Tag block at (0:0,0 [29] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.stree.txt
index e5a9fb8e25..61cafbb65f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document12.stree.txt
@@ -1,5 +1,23 @@
-Markup block - Gen<None> - 29 - (0:0,0)
-    Tag block - Gen<TagHelper> - 29 - (0:0,0) - input - InputTagHelper3
-        SelfClosing - <input int-prefix-value='' />
-        int-prefix-value - SingleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
+RazorDocument - [0..29)::29 - [<input int-prefix-value='' />]
+    MarkupBlock - [0..29)::29
+        MarkupTagHelperElement - [0..29)::29 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..29)::29
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupTagHelperAttribute - [6..26)::20 - int-prefix-value - SingleQuotes - Bound - [ int-prefix-value='']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..23)::16 - [int-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[int-prefix-value];
+                    Equals;[=];
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [25..25)::0
+                        CSharpExpressionLiteral - [25..25)::0 - [] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                    MarkupTextLiteral - [25..26)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [26..29)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.cspans.txt
index e69de29bb2..8bfb200837 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.cspans.txt
@@ -0,0 +1 @@
+Markup span at (28:0,28 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [31] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.stree.txt
index 7f597a2b72..895be9f994 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document13.stree.txt
@@ -1,5 +1,22 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<TagHelper> - 31 - (0:0,0) - input - InputTagHelper3
-        SelfClosing - <input string-prefix-value=''/>
-        string-prefix-value - SingleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
+RazorDocument - [0..31)::31 - [<input string-prefix-value=''/>]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..31)::31
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupTagHelperAttribute - [6..29)::23 - string-prefix-value - SingleQuotes - Bound - [ string-prefix-value='']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..26)::19 - [string-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[string-prefix-value];
+                    Equals;[=];
+                    MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [28..28)::0
+                        MarkupTextLiteral - [28..28)::0 - []
+                    MarkupTextLiteral - [28..29)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [29..31)::2 - [/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.stree.txt
index 64c76b9e7c..e61b4bc806 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document14.stree.txt
@@ -1,6 +1,23 @@
-Markup block - Gen<None> - 29 - (0:0,0)
-    Tag block - Gen<TagHelper> - 29 - (0:0,0) - input - InputTagHelper3
-        SelfClosing - <input int-prefix-value='3'/>
-        int-prefix-value - SingleQuotes
-            Code span - Gen<Expr> - [3] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (25:0,25) - Tokens:1
-                HtmlTokenType.Text;[3];
+RazorDocument - [0..29)::29 - [<input int-prefix-value='3'/>]
+    MarkupBlock - [0..29)::29
+        MarkupTagHelperElement - [0..29)::29 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..29)::29
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupTagHelperAttribute - [6..27)::21 - int-prefix-value - SingleQuotes - Bound - [ int-prefix-value='3']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..23)::16 - [int-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[int-prefix-value];
+                    Equals;[=];
+                    MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [25..26)::1
+                        CSharpExpressionLiteral - [25..26)::1 - [3] - Gen<None> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                            Text;[3];
+                    MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [27..29)::2 - [/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.stree.txt
index e500df0361..24aba9fd43 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document15.stree.txt
@@ -1,10 +1,27 @@
-Markup block - Gen<None> - 43 - (0:0,0)
-    Tag block - Gen<TagHelper> - 43 - (0:0,0) - input - InputTagHelper3
-        SelfClosing - <input string-prefix-value='some string' />
-        string-prefix-value - SingleQuotes
-            Markup block - Gen<None> - 11 - (28:0,28)
-                Markup span - Gen<Markup> - [some] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:1
-                    HtmlTokenType.Text;[some];
-                Markup span - Gen<Markup> - [ string] - SpanEditHandler;Accepts:Any - (32:0,32) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[string];
+RazorDocument - [0..43)::43 - [<input string-prefix-value='some string' />]
+    MarkupBlock - [0..43)::43
+        MarkupTagHelperElement - [0..43)::43 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..43)::43
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupTagHelperAttribute - [6..40)::34 - string-prefix-value - SingleQuotes - Bound - [ string-prefix-value='some string']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..26)::19 - [string-prefix-value] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[string-prefix-value];
+                    Equals;[=];
+                    MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [28..39)::11
+                        MarkupTextLiteral - [28..32)::4 - [some] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[some];
+                        MarkupTextLiteral - [32..39)::7 - [ string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                            Text;[string];
+                    MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [40..43)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.stree.txt
index 670480e001..0b6e2afcbe 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document16.stree.txt
@@ -1,5 +1,21 @@
-Markup block - Gen<None> - 48 - (0:0,0)
-    Tag block - Gen<TagHelper> - 48 - (0:0,0) - input - InputTagHelper1 - InputTagHelper3
-        SelfClosing - <input unbound-required bound-required-string />
-        unbound-required - Minimized
-        bound-required-string - Minimized
+RazorDocument - [0..48)::48 - [<input unbound-required bound-required-string />]
+    MarkupBlock - [0..48)::48
+        MarkupTagHelperElement - [0..48)::48 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..48)::48
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..23)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..23)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[unbound-required];
+                MarkupMinimizedTagHelperAttribute - [23..45)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                    MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [24..45)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-string];
+                MarkupTextLiteral - [45..48)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.stree.txt
index f2b82508fc..721c05474f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document17.stree.txt
@@ -1,5 +1,25 @@
-Markup block - Gen<None> - 30 - (0:0,0)
-    Tag block - Gen<TagHelper> - 30 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p bound-int bound-string> ... </p>
-        bound-int - Minimized
-        bound-string - Minimized
+RazorDocument - [0..30)::30 - [<p bound-int bound-string></p>]
+    MarkupBlock - [0..30)::30
+        MarkupTagHelperElement - [0..30)::30 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..26)::26
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..12)::10 - bound-int - Minimized - Bound - [ bound-int]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..12)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
+                MarkupMinimizedTagHelperAttribute - [12..25)::13 - bound-string - Minimized - Bound - [ bound-string]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..25)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                MarkupTextLiteral - [25..26)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [26..30)::4
+                MarkupTextLiteral - [26..30)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.stree.txt
index 100a7b3984..289ffb0d02 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document18.stree.txt
@@ -1,6 +1,26 @@
-Markup block - Gen<None> - 67 - (0:0,0)
-    Tag block - Gen<TagHelper> - 67 - (0:0,0) - input - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
-        SelfClosing - <input bound-required-int unbound-required bound-required-string />
-        bound-required-int - Minimized
-        unbound-required - Minimized
-        bound-required-string - Minimized
+RazorDocument - [0..67)::67 - [<input bound-required-int unbound-required bound-required-string />]
+    MarkupBlock - [0..67)::67
+        MarkupTagHelperElement - [0..67)::67 - input[SelfClosing] - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..67)::67
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..25)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..25)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-int];
+                MarkupMinimizedTagHelperAttribute - [25..42)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..42)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[unbound-required];
+                MarkupMinimizedTagHelperAttribute - [42..64)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                    MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [43..64)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-string];
+                MarkupTextLiteral - [64..67)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.stree.txt
index a3c21fad15..eadd688119 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document19.stree.txt
@@ -1,6 +1,30 @@
-Markup block - Gen<None> - 43 - (0:0,0)
-    Tag block - Gen<TagHelper> - 43 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p bound-int bound-string bound-string> ... </p>
-        bound-int - Minimized
-        bound-string - Minimized
-        bound-string - Minimized
+RazorDocument - [0..43)::43 - [<p bound-int bound-string bound-string></p>]
+    MarkupBlock - [0..43)::43
+        MarkupTagHelperElement - [0..43)::43 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..39)::39
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..12)::10 - bound-int - Minimized - Bound - [ bound-int]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..12)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
+                MarkupMinimizedTagHelperAttribute - [12..25)::13 - bound-string - Minimized - Bound - [ bound-string]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..25)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                MarkupMinimizedTagHelperAttribute - [25..38)::13 - bound-string - Minimized - Bound - [ bound-string]
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..38)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                MarkupTextLiteral - [38..39)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [39..43)::4
+                MarkupTextLiteral - [39..43)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.stree.txt
index 43cbf94537..b8273f7553 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document2.stree.txt
@@ -1,4 +1,20 @@
-Markup block - Gen<None> - 20 - (0:0,0)
-    Tag block - Gen<TagHelper> - 20 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p bound-string> ... </p>
-        bound-string - Minimized
+RazorDocument - [0..20)::20 - [<p bound-string></p>]
+    MarkupBlock - [0..20)::20
+        MarkupTagHelperElement - [0..20)::20 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..16)::16
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..15)::13 - bound-string - Minimized - Bound - [ bound-string]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..15)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                MarkupTextLiteral - [15..16)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [16..20)::4
+                MarkupTextLiteral - [16..20)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.stree.txt
index c46d9a6bce..6260f25bcf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document20.stree.txt
@@ -1,7 +1,30 @@
-Markup block - Gen<None> - 38 - (0:0,0)
-    Tag block - Gen<TagHelper> - 38 - (0:0,0) - input - InputTagHelper1 - InputTagHelper3
-        SelfClosing - <input unbound-required class='btn' />
-        unbound-required - Minimized
-        class - SingleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..38)::38 - [<input unbound-required class='btn' />]
+    MarkupBlock - [0..38)::38
+        MarkupTagHelperElement - [0..38)::38 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..38)::38
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..23)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..23)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[unbound-required];
+                MarkupTagHelperAttribute - [23..35)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [24..29)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [30..31)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [31..34)::3
+                        MarkupLiteralAttributeValue - [31..34)::3 - [btn]
+                            MarkupTextLiteral - [31..34)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [34..35)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [35..38)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.stree.txt
index 72fa0f3ef7..bc6bcfe18e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document21.stree.txt
@@ -1,7 +1,34 @@
-Markup block - Gen<None> - 32 - (0:0,0)
-    Tag block - Gen<TagHelper> - 32 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p bound-string class='btn'> ... </p>
-        bound-string - Minimized
-        class - SingleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..32)::32 - [<p bound-string class='btn'></p>]
+    MarkupBlock - [0..32)::32
+        MarkupTagHelperElement - [0..32)::32 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..28)::28
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..15)::13 - bound-string - Minimized - Bound - [ bound-string]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..15)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                MarkupTagHelperAttribute - [15..27)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [16..21)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [23..26)::3
+                        MarkupLiteralAttributeValue - [23..26)::3 - [btn]
+                            MarkupTextLiteral - [23..26)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [26..27)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [27..28)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [28..32)::4
+                MarkupTextLiteral - [28..32)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.stree.txt
index 01fa70a056..412a844fc9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document22.stree.txt
@@ -1,7 +1,30 @@
-Markup block - Gen<None> - 38 - (0:0,0)
-    Tag block - Gen<TagHelper> - 38 - (0:0,0) - input - InputTagHelper1 - InputTagHelper3
-        SelfClosing - <input class='btn' unbound-required />
-        class - SingleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        unbound-required - Minimized
+RazorDocument - [0..38)::38 - [<input class='btn' unbound-required />]
+    MarkupBlock - [0..38)::38
+        MarkupTagHelperElement - [0..38)::38 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..38)::38
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupTagHelperAttribute - [6..18)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..12)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [14..17)::3
+                        MarkupLiteralAttributeValue - [14..17)::3 - [btn]
+                            MarkupTextLiteral - [14..17)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [18..35)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [19..35)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[unbound-required];
+                MarkupTextLiteral - [35..38)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.stree.txt
index 07993f58f3..5e6900b358 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document23.stree.txt
@@ -1,7 +1,34 @@
-Markup block - Gen<None> - 32 - (0:0,0)
-    Tag block - Gen<TagHelper> - 32 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p class='btn' bound-string> ... </p>
-        class - SingleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        bound-string - Minimized
+RazorDocument - [0..32)::32 - [<p class='btn' bound-string></p>]
+    MarkupBlock - [0..32)::32
+        MarkupTagHelperElement - [0..32)::32 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..28)::28
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [14..27)::13 - bound-string - Minimized - Bound - [ bound-string]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..27)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                MarkupTextLiteral - [27..28)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [28..32)::4
+                MarkupTextLiteral - [28..32)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.stree.txt
index a6b7b69d57..56f18db51b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document24.stree.txt
@@ -1,7 +1,30 @@
-Markup block - Gen<None> - 43 - (0:0,0)
-    Tag block - Gen<TagHelper> - 43 - (0:0,0) - input - InputTagHelper1 - InputTagHelper3
-        SelfClosing - <input bound-required-string class='btn' />
-        bound-required-string - Minimized
-        class - SingleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..43)::43 - [<input bound-required-string class='btn' />]
+    MarkupBlock - [0..43)::43
+        MarkupTagHelperElement - [0..43)::43 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..43)::43
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..28)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..28)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-string];
+                MarkupTagHelperAttribute - [28..40)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [29..34)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [36..39)::3
+                        MarkupLiteralAttributeValue - [36..39)::3 - [btn]
+                            MarkupTextLiteral - [36..39)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [40..43)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.stree.txt
index 937bc74536..8fd68a1de3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document25.stree.txt
@@ -1,7 +1,30 @@
-Markup block - Gen<None> - 43 - (0:0,0)
-    Tag block - Gen<TagHelper> - 43 - (0:0,0) - input - InputTagHelper1 - InputTagHelper3
-        SelfClosing - <input class='btn' bound-required-string />
-        class - SingleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        bound-required-string - Minimized
+RazorDocument - [0..43)::43 - [<input class='btn' bound-required-string />]
+    MarkupBlock - [0..43)::43
+        MarkupTagHelperElement - [0..43)::43 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..43)::43
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupTagHelperAttribute - [6..18)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..12)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [14..17)::3
+                        MarkupLiteralAttributeValue - [14..17)::3 - [btn]
+                            MarkupTextLiteral - [14..17)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [18..40)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [19..40)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-string];
+                MarkupTextLiteral - [40..43)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.stree.txt
index c6e4015f9d..a34464be07 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document26.stree.txt
@@ -1,7 +1,30 @@
-Markup block - Gen<None> - 40 - (0:0,0)
-    Tag block - Gen<TagHelper> - 40 - (0:0,0) - input - InputTagHelper2 - InputTagHelper3
-        SelfClosing - <input bound-required-int class='btn' />
-        bound-required-int - Minimized
-        class - SingleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..40)::40 - [<input bound-required-int class='btn' />]
+    MarkupBlock - [0..40)::40
+        MarkupTagHelperElement - [0..40)::40 - input[SelfClosing] - InputTagHelper2 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..40)::40
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..25)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..25)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-int];
+                MarkupTagHelperAttribute - [25..37)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..31)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [32..33)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [33..36)::3
+                        MarkupLiteralAttributeValue - [33..36)::3 - [btn]
+                            MarkupTextLiteral - [33..36)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [36..37)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [37..40)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.stree.txt
index c1d25b6b6b..512b71f23f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document27.stree.txt
@@ -1,7 +1,34 @@
-Markup block - Gen<None> - 29 - (0:0,0)
-    Tag block - Gen<TagHelper> - 29 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p bound-int class='btn'> ... </p>
-        bound-int - Minimized
-        class - SingleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..29)::29 - [<p bound-int class='btn'></p>]
+    MarkupBlock - [0..29)::29
+        MarkupTagHelperElement - [0..29)::29 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..25)::25
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..12)::10 - bound-int - Minimized - Bound - [ bound-int]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..12)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
+                MarkupTagHelperAttribute - [12..24)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..18)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [19..20)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [20..23)::3
+                        MarkupLiteralAttributeValue - [20..23)::3 - [btn]
+                            MarkupTextLiteral - [20..23)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [24..25)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [25..29)::4
+                MarkupTextLiteral - [25..29)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.stree.txt
index d4c1c1b099..6219a249f2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document28.stree.txt
@@ -1,7 +1,30 @@
-Markup block - Gen<None> - 40 - (0:0,0)
-    Tag block - Gen<TagHelper> - 40 - (0:0,0) - input - InputTagHelper2 - InputTagHelper3
-        SelfClosing - <input class='btn' bound-required-int />
-        class - SingleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        bound-required-int - Minimized
+RazorDocument - [0..40)::40 - [<input class='btn' bound-required-int />]
+    MarkupBlock - [0..40)::40
+        MarkupTagHelperElement - [0..40)::40 - input[SelfClosing] - InputTagHelper2 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..40)::40
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupTagHelperAttribute - [6..18)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..12)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [14..17)::3
+                        MarkupLiteralAttributeValue - [14..17)::3 - [btn]
+                            MarkupTextLiteral - [14..17)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [17..18)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [18..37)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [19..37)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-int];
+                MarkupTextLiteral - [37..40)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.stree.txt
index 9f983bf08a..00c2c37baa 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document29.stree.txt
@@ -1,7 +1,34 @@
-Markup block - Gen<None> - 29 - (0:0,0)
-    Tag block - Gen<TagHelper> - 29 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p class='btn' bound-int> ... </p>
-        class - SingleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        bound-int - Minimized
+RazorDocument - [0..29)::29 - [<p class='btn' bound-int></p>]
+    MarkupBlock - [0..29)::29
+        MarkupTagHelperElement - [0..29)::29 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..25)::25
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - SingleQuotes - Unbound - [ class='btn']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [14..24)::10 - bound-int - Minimized - Bound - [ bound-int]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..24)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
+                MarkupTextLiteral - [24..25)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [25..29)::4
+                MarkupTextLiteral - [25..29)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.stree.txt
index 8603a024a5..6b9b8a8977 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document3.stree.txt
@@ -1,4 +1,16 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<TagHelper> - 31 - (0:0,0) - input - InputTagHelper1 - InputTagHelper3
-        SelfClosing - <input bound-required-string />
-        bound-required-string - Minimized
+RazorDocument - [0..31)::31 - [<input bound-required-string />]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - input[SelfClosing] - InputTagHelper1 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..31)::31
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..28)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..28)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-string];
+                MarkupTextLiteral - [28..31)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.cspans.txt
index 0526b89aea..b7f3cfaf69 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.cspans.txt
@@ -1,4 +1,4 @@
 Transition span at (14:0,14 [1] ) (Accepts:None) - Parent: Expression block at (14:0,14 [13] )
-Code span at (15:0,15 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (14:0,14 [13] )
+Code span at (15:0,15 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (14:0,14 [13] )
 Markup span at (27:0,27 [2] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [17] )
 Markup span at (29:0,29 [2] ) (Accepts:Any) - Parent: Markup block at (14:0,14 [17] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.stree.txt
index 90a7370569..a94739906e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document30.stree.txt
@@ -1,20 +1,49 @@
-Markup block - Gen<None> - 54 - (0:0,0)
-    Tag block - Gen<TagHelper> - 54 - (0:0,0) - input - InputTagHelper2 - InputTagHelper3
-        SelfClosing - <input class='@DateTime.Now + 1' bound-required-int />
-        class - SingleQuotes
-            Markup block - Gen<None> - 17 - (14:0,14)
-                Markup block - Gen<DynAttr:@(14:0,14)> - 13 - (14:0,14)
-                    Expression block - Gen<Expr> - 13 - (14:0,14)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (15:0,15) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-                Markup span - Gen<LitAttr: @(27:0,27)> - [ +] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[+];
-                Markup span - Gen<LitAttr: @(29:0,29)> - [ 1] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[1];
-        bound-required-int - Minimized
+RazorDocument - [0..54)::54 - [<input class='@DateTime.Now + 1' bound-required-int />]
+    MarkupBlock - [0..54)::54
+        MarkupTagHelperElement - [0..54)::54 - input[SelfClosing] - InputTagHelper2 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..54)::54
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupTagHelperAttribute - [6..32)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..12)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [14..31)::17
+                        MarkupDynamicAttributeValue - [14..27)::13 - [@DateTime.Now]
+                            GenericBlock - [14..27)::13
+                                CSharpCodeBlock - [14..27)::13
+                                    CSharpImplicitExpression - [14..27)::13
+                                        CSharpTransition - [14..15)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [15..27)::12
+                                            CSharpCodeBlock - [15..27)::12
+                                                CSharpExpressionLiteral - [15..27)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                        MarkupLiteralAttributeValue - [27..29)::2 - [ +]
+                            MarkupTextLiteral - [27..28)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [28..29)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[+];
+                        MarkupLiteralAttributeValue - [29..31)::2 - [ 1]
+                            MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [30..31)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[1];
+                    MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [32..51)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                    MarkupTextLiteral - [32..33)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [33..51)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-int];
+                MarkupTextLiteral - [51..54)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.cspans.txt
index fc6620787c..5279ba8415 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.cspans.txt
@@ -1,4 +1,4 @@
 Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [13] )
-Code span at (11:0,11 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (10:0,10 [13] )
+Code span at (11:0,11 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [13] )
 Markup span at (23:0,23 [2] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [17] )
 Markup span at (25:0,25 [2] ) (Accepts:Any) - Parent: Markup block at (10:0,10 [17] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.stree.txt
index fd03138f60..c36cc99174 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document31.stree.txt
@@ -1,20 +1,53 @@
-Markup block - Gen<None> - 43 - (0:0,0)
-    Tag block - Gen<TagHelper> - 43 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p class='@DateTime.Now + 1' bound-int> ... </p>
-        class - SingleQuotes
-            Markup block - Gen<None> - 17 - (10:0,10)
-                Markup block - Gen<DynAttr:@(10:0,10)> - 13 - (10:0,10)
-                    Expression block - Gen<Expr> - 13 - (10:0,10)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (11:0,11) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-                Markup span - Gen<LitAttr: @(23:0,23)> - [ +] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[+];
-                Markup span - Gen<LitAttr: @(25:0,25)> - [ 1] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[1];
-        bound-int - Minimized
+RazorDocument - [0..43)::43 - [<p class='@DateTime.Now + 1' bound-int></p>]
+    MarkupBlock - [0..43)::43
+        MarkupTagHelperElement - [0..43)::43 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..39)::39
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..28)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [10..27)::17
+                        MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
+                            GenericBlock - [10..23)::13
+                                CSharpCodeBlock - [10..23)::13
+                                    CSharpImplicitExpression - [10..23)::13
+                                        CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [11..23)::12
+                                            CSharpCodeBlock - [11..23)::12
+                                                CSharpExpressionLiteral - [11..23)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                        MarkupLiteralAttributeValue - [23..25)::2 - [ +]
+                            MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [24..25)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[+];
+                        MarkupLiteralAttributeValue - [25..27)::2 - [ 1]
+                            MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [26..27)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[1];
+                    MarkupTextLiteral - [27..28)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [28..38)::10 - bound-int - Minimized - Bound - [ bound-int]
+                    MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [29..38)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
+                MarkupTextLiteral - [38..39)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [39..43)::4
+                MarkupTextLiteral - [39..43)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.cspans.txt
index f8a8fb9de1..d4bd228d1f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.cspans.txt
@@ -1,8 +1,8 @@
 Transition span at (36:0,36 [1] ) (Accepts:None) - Parent: Expression block at (36:0,36 [13] )
-Code span at (37:0,37 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (36:0,36 [13] )
+Code span at (37:0,37 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (36:0,36 [13] )
 Markup span at (49:0,49 [2] ) (Accepts:Any) - Parent: Markup block at (36:0,36 [17] )
 Markup span at (51:0,51 [2] ) (Accepts:Any) - Parent: Markup block at (36:0,36 [17] )
 Transition span at (86:0,86 [1] ) (Accepts:None) - Parent: Expression block at (86:0,86 [13] )
-Code span at (87:0,87 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (86:0,86 [13] )
+Code span at (87:0,87 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (86:0,86 [13] )
 Markup span at (99:0,99 [2] ) (Accepts:Any) - Parent: Markup block at (86:0,86 [17] )
 Markup span at (101:0,101 [2] ) (Accepts:Any) - Parent: Markup block at (86:0,86 [17] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.stree.txt
index 52c8fe2ac3..671c6cea10 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document32.stree.txt
@@ -1,38 +1,92 @@
-Markup block - Gen<None> - 126 - (0:0,0)
-    Tag block - Gen<TagHelper> - 126 - (0:0,0) - input - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
-        SelfClosing - <input    bound-required-int class='@DateTime.Now + 1'   bound-required-string class='@DateTime.Now + 1'  unbound-required  />
-        bound-required-int - Minimized
-        class - SingleQuotes
-            Markup block - Gen<None> - 17 - (36:0,36)
-                Markup block - Gen<DynAttr:@(36:0,36)> - 13 - (36:0,36)
-                    Expression block - Gen<Expr> - 13 - (36:0,36)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (37:0,37) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-                Markup span - Gen<LitAttr: @(49:0,49)> - [ +] - SpanEditHandler;Accepts:Any - (49:0,49) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[+];
-                Markup span - Gen<LitAttr: @(51:0,51)> - [ 1] - SpanEditHandler;Accepts:Any - (51:0,51) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[1];
-        bound-required-string - Minimized
-        class - SingleQuotes
-            Markup block - Gen<None> - 17 - (86:0,86)
-                Markup block - Gen<DynAttr:@(86:0,86)> - 13 - (86:0,86)
-                    Expression block - Gen<Expr> - 13 - (86:0,86)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (86:0,86) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (87:0,87) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-                Markup span - Gen<LitAttr: @(99:0,99)> - [ +] - SpanEditHandler;Accepts:Any - (99:0,99) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[+];
-                Markup span - Gen<LitAttr: @(101:0,101)> - [ 1] - SpanEditHandler;Accepts:Any - (101:0,101) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[1];
-        unbound-required - Minimized
+RazorDocument - [0..126)::126 - [<input    bound-required-int class='@DateTime.Now + 1'   bound-required-string class='@DateTime.Now + 1'  unbound-required  />]
+    MarkupBlock - [0..126)::126
+        MarkupTagHelperElement - [0..126)::126 - input[SelfClosing] - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..126)::126
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..28)::22 - bound-required-int - Minimized - Bound - [    bound-required-int]
+                    MarkupTextLiteral - [6..10)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[    ];
+                    MarkupTextLiteral - [10..28)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-int];
+                MarkupTagHelperAttribute - [28..54)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                    MarkupTextLiteral - [28..29)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [29..34)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [35..36)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [36..53)::17
+                        MarkupDynamicAttributeValue - [36..49)::13 - [@DateTime.Now]
+                            GenericBlock - [36..49)::13
+                                CSharpCodeBlock - [36..49)::13
+                                    CSharpImplicitExpression - [36..49)::13
+                                        CSharpTransition - [36..37)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [37..49)::12
+                                            CSharpCodeBlock - [37..49)::12
+                                                CSharpExpressionLiteral - [37..49)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                        MarkupLiteralAttributeValue - [49..51)::2 - [ +]
+                            MarkupTextLiteral - [49..50)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [50..51)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[+];
+                        MarkupLiteralAttributeValue - [51..53)::2 - [ 1]
+                            MarkupTextLiteral - [51..52)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [52..53)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[1];
+                    MarkupTextLiteral - [53..54)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [54..78)::24 - bound-required-string - Minimized - Bound - [   bound-required-string]
+                    MarkupTextLiteral - [54..57)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[   ];
+                    MarkupTextLiteral - [57..78)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-string];
+                MarkupTagHelperAttribute - [78..104)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                    MarkupTextLiteral - [78..79)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [79..84)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [85..86)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [86..103)::17
+                        MarkupDynamicAttributeValue - [86..99)::13 - [@DateTime.Now]
+                            GenericBlock - [86..99)::13
+                                CSharpCodeBlock - [86..99)::13
+                                    CSharpImplicitExpression - [86..99)::13
+                                        CSharpTransition - [86..87)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [87..99)::12
+                                            CSharpCodeBlock - [87..99)::12
+                                                CSharpExpressionLiteral - [87..99)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                        MarkupLiteralAttributeValue - [99..101)::2 - [ +]
+                            MarkupTextLiteral - [99..100)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [100..101)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[+];
+                        MarkupLiteralAttributeValue - [101..103)::2 - [ 1]
+                            MarkupTextLiteral - [101..102)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [102..103)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[1];
+                    MarkupTextLiteral - [103..104)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [104..122)::18 - unbound-required - Minimized - Unbound - [  unbound-required]
+                    MarkupTextLiteral - [104..106)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[  ];
+                    MarkupTextLiteral - [106..122)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[unbound-required];
+                MarkupTextLiteral - [122..126)::4 - [  />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[  ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.cspans.txt
index 78c6d0cf66..0a331cbddd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.cspans.txt
@@ -1,8 +1,8 @@
 Transition span at (23:0,23 [1] ) (Accepts:None) - Parent: Expression block at (23:0,23 [13] )
-Code span at (24:0,24 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (23:0,23 [13] )
+Code span at (24:0,24 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (23:0,23 [13] )
 Markup span at (36:0,36 [2] ) (Accepts:Any) - Parent: Markup block at (23:0,23 [17] )
 Markup span at (38:0,38 [2] ) (Accepts:Any) - Parent: Markup block at (23:0,23 [17] )
 Transition span at (64:0,64 [1] ) (Accepts:None) - Parent: Expression block at (64:0,64 [13] )
-Code span at (65:0,65 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (64:0,64 [13] )
+Code span at (65:0,65 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (64:0,64 [13] )
 Markup span at (77:0,77 [2] ) (Accepts:Any) - Parent: Markup block at (64:0,64 [17] )
 Markup span at (79:0,79 [2] ) (Accepts:Any) - Parent: Markup block at (64:0,64 [17] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.stree.txt
index 107b45fabe..1e06d3cd05 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document33.stree.txt
@@ -1,38 +1,96 @@
-Markup block - Gen<None> - 101 - (0:0,0)
-    Tag block - Gen<TagHelper> - 101 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p    bound-int class='@DateTime.Now + 1'   bound-string class='@DateTime.Now + 1'  bound-string> ... </p>
-        bound-int - Minimized
-        class - SingleQuotes
-            Markup block - Gen<None> - 17 - (23:0,23)
-                Markup block - Gen<DynAttr:@(23:0,23)> - 13 - (23:0,23)
-                    Expression block - Gen<Expr> - 13 - (23:0,23)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (24:0,24) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-                Markup span - Gen<LitAttr: @(36:0,36)> - [ +] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[+];
-                Markup span - Gen<LitAttr: @(38:0,38)> - [ 1] - SpanEditHandler;Accepts:Any - (38:0,38) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[1];
-        bound-string - Minimized
-        class - SingleQuotes
-            Markup block - Gen<None> - 17 - (64:0,64)
-                Markup block - Gen<DynAttr:@(64:0,64)> - 13 - (64:0,64)
-                    Expression block - Gen<Expr> - 13 - (64:0,64)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (64:0,64) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (65:0,65) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-                Markup span - Gen<LitAttr: @(77:0,77)> - [ +] - SpanEditHandler;Accepts:Any - (77:0,77) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[+];
-                Markup span - Gen<LitAttr: @(79:0,79)> - [ 1] - SpanEditHandler;Accepts:Any - (79:0,79) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[1];
-        bound-string - Minimized
+RazorDocument - [0..101)::101 - [<p    bound-int class='@DateTime.Now + 1'   bound-string class='@DateTime.Now + 1'  bound-string></p>]
+    MarkupBlock - [0..101)::101
+        MarkupTagHelperElement - [0..101)::101 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..97)::97
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..15)::13 - bound-int - Minimized - Bound - [    bound-int]
+                    MarkupTextLiteral - [2..6)::4 - [    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[    ];
+                    MarkupTextLiteral - [6..15)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
+                MarkupTagHelperAttribute - [15..41)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                    MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [16..21)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [23..40)::17
+                        MarkupDynamicAttributeValue - [23..36)::13 - [@DateTime.Now]
+                            GenericBlock - [23..36)::13
+                                CSharpCodeBlock - [23..36)::13
+                                    CSharpImplicitExpression - [23..36)::13
+                                        CSharpTransition - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [24..36)::12
+                                            CSharpCodeBlock - [24..36)::12
+                                                CSharpExpressionLiteral - [24..36)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                        MarkupLiteralAttributeValue - [36..38)::2 - [ +]
+                            MarkupTextLiteral - [36..37)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [37..38)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[+];
+                        MarkupLiteralAttributeValue - [38..40)::2 - [ 1]
+                            MarkupTextLiteral - [38..39)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [39..40)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[1];
+                    MarkupTextLiteral - [40..41)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [41..56)::15 - bound-string - Minimized - Bound - [   bound-string]
+                    MarkupTextLiteral - [41..44)::3 - [   ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[   ];
+                    MarkupTextLiteral - [44..56)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                MarkupTagHelperAttribute - [56..82)::26 - class - SingleQuotes - Unbound - [ class='@DateTime.Now + 1']
+                    MarkupTextLiteral - [56..57)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [57..62)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [63..64)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    MarkupTagHelperAttributeValue - [64..81)::17
+                        MarkupDynamicAttributeValue - [64..77)::13 - [@DateTime.Now]
+                            GenericBlock - [64..77)::13
+                                CSharpCodeBlock - [64..77)::13
+                                    CSharpImplicitExpression - [64..77)::13
+                                        CSharpTransition - [64..65)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [65..77)::12
+                                            CSharpCodeBlock - [65..77)::12
+                                                CSharpExpressionLiteral - [65..77)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                        MarkupLiteralAttributeValue - [77..79)::2 - [ +]
+                            MarkupTextLiteral - [77..78)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [78..79)::1 - [+] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[+];
+                        MarkupLiteralAttributeValue - [79..81)::2 - [ 1]
+                            MarkupTextLiteral - [79..80)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [80..81)::1 - [1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[1];
+                    MarkupTextLiteral - [81..82)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupMinimizedTagHelperAttribute - [82..96)::14 - bound-string - Minimized - Bound - [  bound-string]
+                    MarkupTextLiteral - [82..84)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[  ];
+                    MarkupTextLiteral - [84..96)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
+                MarkupTextLiteral - [96..97)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [97..101)::4
+                MarkupTextLiteral - [97..101)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.stree.txt
index fc50535f18..e0d945f134 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document4.stree.txt
@@ -1,4 +1,16 @@
-Markup block - Gen<None> - 28 - (0:0,0)
-    Tag block - Gen<TagHelper> - 28 - (0:0,0) - input - InputTagHelper2 - InputTagHelper3
-        SelfClosing - <input bound-required-int />
-        bound-required-int - Minimized
+RazorDocument - [0..28)::28 - [<input bound-required-int />]
+    MarkupBlock - [0..28)::28
+        MarkupTagHelperElement - [0..28)::28 - input[SelfClosing] - InputTagHelper2 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..28)::28
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..25)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..25)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-int];
+                MarkupTextLiteral - [25..28)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.stree.txt
index 1808af976c..624fe61ebe 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document5.stree.txt
@@ -1,4 +1,20 @@
-Markup block - Gen<None> - 17 - (0:0,0)
-    Tag block - Gen<TagHelper> - 17 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p bound-int> ... </p>
-        bound-int - Minimized
+RazorDocument - [0..17)::17 - [<p bound-int></p>]
+    MarkupBlock - [0..17)::17
+        MarkupTagHelperElement - [0..17)::17 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..13)::13
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..12)::10 - bound-int - Minimized - Bound - [ bound-int]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..12)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
+                MarkupTextLiteral - [12..13)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [13..17)::4
+                MarkupTextLiteral - [13..17)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.stree.txt
index 74632783f3..ae93684dd6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document6.stree.txt
@@ -1,4 +1,15 @@
-Markup block - Gen<None> - 23 - (0:0,0)
-    Tag block - Gen<TagHelper> - 23 - (0:0,0) - input - InputTagHelper3
-        SelfClosing - <input int-dictionary/>
-        int-dictionary - Minimized
+RazorDocument - [0..23)::23 - [<input int-dictionary/>]
+    MarkupBlock - [0..23)::23
+        MarkupTagHelperElement - [0..23)::23 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..23)::23
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..21)::15 - int-dictionary - Minimized - Bound - [ int-dictionary]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..21)::14 - [int-dictionary] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[int-dictionary];
+                MarkupTextLiteral - [21..23)::2 - [/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.stree.txt
index 938c61a112..54840502c3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document7.stree.txt
@@ -1,4 +1,16 @@
-Markup block - Gen<None> - 27 - (0:0,0)
-    Tag block - Gen<TagHelper> - 27 - (0:0,0) - input - InputTagHelper3
-        SelfClosing - <input string-dictionary />
-        string-dictionary - Minimized
+RazorDocument - [0..27)::27 - [<input string-dictionary />]
+    MarkupBlock - [0..27)::27
+        MarkupTagHelperElement - [0..27)::27 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..27)::27
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..24)::18 - string-dictionary - Minimized - Bound - [ string-dictionary]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..24)::17 - [string-dictionary] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[string-dictionary];
+                MarkupTextLiteral - [24..27)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.stree.txt
index 766a4da8bc..012bb8c2ee 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document8.stree.txt
@@ -1,4 +1,16 @@
-Markup block - Gen<None> - 21 - (0:0,0)
-    Tag block - Gen<TagHelper> - 21 - (0:0,0) - input - InputTagHelper3
-        SelfClosing - <input int-prefix- />
-        int-prefix- - Minimized
+RazorDocument - [0..21)::21 - [<input int-prefix- />]
+    MarkupBlock - [0..21)::21
+        MarkupTagHelperElement - [0..21)::21 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..21)::21
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..18)::12 - int-prefix- - Minimized - Bound - [ int-prefix-]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..18)::11 - [int-prefix-] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[int-prefix-];
+                MarkupTextLiteral - [18..21)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.stree.txt
index 65f176bb55..0e590ed9f3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_Document9.stree.txt
@@ -1,4 +1,15 @@
-Markup block - Gen<None> - 23 - (0:0,0)
-    Tag block - Gen<TagHelper> - 23 - (0:0,0) - input - InputTagHelper3
-        SelfClosing - <input string-prefix-/>
-        string-prefix- - Minimized
+RazorDocument - [0..23)::23 - [<input string-prefix-/>]
+    MarkupBlock - [0..23)::23
+        MarkupTagHelperElement - [0..23)::23 - input[SelfClosing] - InputTagHelper3
+            MarkupTagHelperStartTag - [0..23)::23
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..21)::15 - string-prefix- - Minimized - Bound - [ string-prefix-]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..21)::14 - [string-prefix-] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[string-prefix-];
+                MarkupTextLiteral - [21..23)::2 - [/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.stree.txt
index f19a3803ba..331c5156d2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags1.stree.txt
@@ -1,4 +1,12 @@
-Markup block - Gen<None> - 23 - (0:0,0)
-    Tag block - Gen<TagHelper> - 23 - (0:0,0) - input - InputTagHelper1 - InputTagHelper3
-        StartTagAndEndTag - <input unbound-required
-        unbound-required - Minimized
+RazorDocument - [0..23)::23 - [<input unbound-required]
+    MarkupBlock - [0..23)::23
+        MarkupTagHelperElement - [0..23)::23 - input[StartTagAndEndTag] - InputTagHelper1 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..23)::23
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..23)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..23)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[unbound-required];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.stree.txt
index 599738b0e8..a2daf7a554 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags2.stree.txt
@@ -1,4 +1,12 @@
-Markup block - Gen<None> - 28 - (0:0,0)
-    Tag block - Gen<TagHelper> - 28 - (0:0,0) - input - InputTagHelper1 - InputTagHelper3
-        StartTagAndEndTag - <input bound-required-string
-        bound-required-string - Minimized
+RazorDocument - [0..28)::28 - [<input bound-required-string]
+    MarkupBlock - [0..28)::28
+        MarkupTagHelperElement - [0..28)::28 - input[StartTagAndEndTag] - InputTagHelper1 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..28)::28
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..28)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..28)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-string];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.stree.txt
index 51350e1bd2..4943c90567 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags3.stree.txt
@@ -1,4 +1,12 @@
-Markup block - Gen<None> - 25 - (0:0,0)
-    Tag block - Gen<TagHelper> - 25 - (0:0,0) - input - InputTagHelper2 - InputTagHelper3
-        StartTagAndEndTag - <input bound-required-int
-        bound-required-int - Minimized
+RazorDocument - [0..25)::25 - [<input bound-required-int]
+    MarkupBlock - [0..25)::25
+        MarkupTagHelperElement - [0..25)::25 - input[StartTagAndEndTag] - InputTagHelper2 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..25)::25
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..25)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..25)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-int];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.stree.txt
index dd174f8f53..bd5f5d9de6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags4.stree.txt
@@ -1,6 +1,22 @@
-Markup block - Gen<None> - 64 - (0:0,0)
-    Tag block - Gen<TagHelper> - 64 - (0:0,0) - input - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
-        StartTagAndEndTag - <input bound-required-int unbound-required bound-required-string
-        bound-required-int - Minimized
-        unbound-required - Minimized
-        bound-required-string - Minimized
+RazorDocument - [0..64)::64 - [<input bound-required-int unbound-required bound-required-string]
+    MarkupBlock - [0..64)::64
+        MarkupTagHelperElement - [0..64)::64 - input[StartTagAndEndTag] - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..64)::64
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..25)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..25)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-int];
+                MarkupMinimizedTagHelperAttribute - [25..42)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..42)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[unbound-required];
+                MarkupMinimizedTagHelperAttribute - [42..64)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                    MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [43..64)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-string];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.stree.txt
index bfbc9958be..c8ba64d903 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags5.stree.txt
@@ -1,4 +1,12 @@
-Markup block - Gen<None> - 15 - (0:0,0)
-    Tag block - Gen<TagHelper> - 15 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p bound-string
-        bound-string - Minimized
+RazorDocument - [0..15)::15 - [<p bound-string]
+    MarkupBlock - [0..15)::15
+        MarkupTagHelperElement - [0..15)::15 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..15)::15
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..15)::13 - bound-string - Minimized - Bound - [ bound-string]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..15)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.stree.txt
index cf33d9f99a..b96cd258d2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags6.stree.txt
@@ -1,4 +1,12 @@
-Markup block - Gen<None> - 12 - (0:0,0)
-    Tag block - Gen<TagHelper> - 12 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p bound-int
-        bound-int - Minimized
+RazorDocument - [0..12)::12 - [<p bound-int]
+    MarkupBlock - [0..12)::12
+        MarkupTagHelperElement - [0..12)::12 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..12)::12
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..12)::10 - bound-int - Minimized - Bound - [ bound-int]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..12)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.stree.txt
index b8bf70c910..6b54e555fa 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags7.stree.txt
@@ -1,5 +1,17 @@
-Markup block - Gen<None> - 25 - (0:0,0)
-    Tag block - Gen<TagHelper> - 25 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p bound-int bound-string
-        bound-int - Minimized
-        bound-string - Minimized
+RazorDocument - [0..25)::25 - [<p bound-int bound-string]
+    MarkupBlock - [0..25)::25
+        MarkupTagHelperElement - [0..25)::25 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..25)::25
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupMinimizedTagHelperAttribute - [2..12)::10 - bound-int - Minimized - Bound - [ bound-int]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..12)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-int];
+                MarkupMinimizedTagHelperAttribute - [12..25)::13 - bound-string - Minimized - Bound - [ bound-string]
+                    MarkupTextLiteral - [12..13)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [13..25)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-string];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.stree.txt
index 5ea2f5855b..e623f0ac11 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedAttributes_PartialTags8.stree.txt
@@ -1,10 +1,37 @@
-Markup block - Gen<None> - 89 - (0:0,0)
-    Tag block - Gen<TagHelper> - 89 - (0:0,0) - input - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
-        StartTagAndEndTag - <input bound-required-int unbound-required bound-required-string
-        bound-required-int - Minimized
-        unbound-required - Minimized
-        bound-required-string - Minimized
-        Tag block - Gen<TagHelper> - 25 - (64:0,64) - p - PTagHelper
-            StartTagAndEndTag - <p bound-int bound-string
-            bound-int - Minimized
-            bound-string - Minimized
+RazorDocument - [0..89)::89 - [<input bound-required-int unbound-required bound-required-string<p bound-int bound-string]
+    MarkupBlock - [0..89)::89
+        MarkupTagHelperElement - [0..89)::89 - input[StartTagAndEndTag] - InputTagHelper1 - InputTagHelper2 - InputTagHelper3
+            MarkupTagHelperStartTag - [0..64)::64
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..25)::19 - bound-required-int - Minimized - Bound - [ bound-required-int]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..25)::18 - [bound-required-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-int];
+                MarkupMinimizedTagHelperAttribute - [25..42)::17 - unbound-required - Minimized - Unbound - [ unbound-required]
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..42)::16 - [unbound-required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[unbound-required];
+                MarkupMinimizedTagHelperAttribute - [42..64)::22 - bound-required-string - Minimized - Bound - [ bound-required-string]
+                    MarkupTextLiteral - [42..43)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [43..64)::21 - [bound-required-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound-required-string];
+            MarkupTagHelperElement - [64..89)::25 - p[StartTagAndEndTag] - PTagHelper
+                MarkupTagHelperStartTag - [64..89)::25
+                    MarkupTextLiteral - [64..66)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                    MarkupMinimizedTagHelperAttribute - [66..76)::10 - bound-int - Minimized - Bound - [ bound-int]
+                        MarkupTextLiteral - [66..67)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [67..76)::9 - [bound-int] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[bound-int];
+                    MarkupMinimizedTagHelperAttribute - [76..89)::13 - bound-string - Minimized - Bound - [ bound-string]
+                        MarkupTextLiteral - [76..77)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [77..89)::12 - [bound-string] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[bound-string];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedBooleanBoundAttributes.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedBooleanBoundAttributes.stree.txt
index 8ff170117e..1d5ebc5e25 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedBooleanBoundAttributes.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperBlockRewriterTest/UnderstandsMinimizedBooleanBoundAttributes.stree.txt
@@ -1,5 +1,21 @@
-Markup block - Gen<None> - 37 - (0:0,0)
-    Tag block - Gen<TagHelper> - 37 - (0:0,0) - input - InputTagHelper
-        SelfClosing - <input boundbool boundbooldict-key />
-        boundbool - Minimized
-        boundbooldict-key - Minimized
+RazorDocument - [0..37)::37 - [<input boundbool boundbooldict-key />]
+    MarkupBlock - [0..37)::37
+        MarkupTagHelperElement - [0..37)::37 - input[SelfClosing] - InputTagHelper
+            MarkupTagHelperStartTag - [0..37)::37
+                MarkupTextLiteral - [0..6)::6 - [<input] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                MarkupMinimizedTagHelperAttribute - [6..16)::10 - boundbool - Minimized - Bound - [ boundbool]
+                    MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [7..16)::9 - [boundbool] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[boundbool];
+                MarkupMinimizedTagHelperAttribute - [16..34)::18 - boundbooldict-key - Minimized - Bound - [ boundbooldict-key]
+                    MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [17..34)::17 - [boundbooldict-key] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[boundbooldict-key];
+                MarkupTextLiteral - [34..37)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers1.stree.txt
index 5b17336d95..be3ea59653 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers1.stree.txt
@@ -1,8 +1,9 @@
-Markup block - Gen<None> - 7 - (0:0,0)
-    Tag block - Gen<None> - 7 - (0:0,0)
-        Markup span - Gen<Markup> - [<th: />] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:5
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[th:];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..7)::7 - [<th: />]
+    MarkupBlock - [0..7)::7
+        MarkupTagBlock - [0..7)::7 - [<th: />]
+            MarkupTextLiteral - [0..7)::7 - [<th: />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[th:];
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.stree.txt
index 57ede0c7c8..962cf6cf6f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers10.stree.txt
@@ -1,12 +1,35 @@
-Markup block - Gen<None> - 47 - (0:0,0)
-    Tag block - Gen<TagHelper> - 47 - (0:0,0) - th:myth - mythTagHelper
-        StartTagAndEndTag - <th:myth class="btn"> ... </th:myth>
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        Markup span - Gen<Markup> - [words and spaces] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:5
-            HtmlTokenType.Text;[words];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[and];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[spaces];
+RazorDocument - [0..47)::47 - [<th:myth class="btn">words and spaces</th:myth>]
+    MarkupBlock - [0..47)::47
+        MarkupTagHelperElement - [0..47)::47 - th:myth[StartTagAndEndTag] - mythTagHelper
+            MarkupTagHelperStartTag - [0..21)::21
+                MarkupTextLiteral - [0..8)::8 - [<th:myth] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[th:myth];
+                MarkupTagHelperAttribute - [8..20)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [16..19)::3
+                        MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                            MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [20..21)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [21..37)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [37..47)::10
+                MarkupTextLiteral - [37..47)::10 - [</th:myth>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[th:myth];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.stree.txt
index 2aa9416c4e..a15006bfd4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers11.stree.txt
@@ -1,13 +1,33 @@
-Markup block - Gen<None> - 34 - (0:0,0)
-    Tag block - Gen<TagHelper> - 34 - (0:0,0) - th:myth2 - mythTagHelper2
-        SelfClosing - <th:myth2 bound="@DateTime.Now" />
-        bound - DoubleQuotes
-            Markup block - Gen<None> - 13 - (17:0,17)
-                Markup block - Gen<None> - 13 - (17:0,17)
-                    Expression block - Gen<Expr> - 13 - (17:0,17)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14 - (18:0,18) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
+RazorDocument - [0..34)::34 - [<th:myth2 bound="@DateTime.Now" />]
+    MarkupBlock - [0..34)::34
+        MarkupTagHelperElement - [0..34)::34 - th:myth2[SelfClosing] - mythTagHelper2
+            MarkupTagHelperStartTag - [0..34)::34
+                MarkupTextLiteral - [0..9)::9 - [<th:myth2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[th:myth2];
+                MarkupTagHelperAttribute - [9..31)::22 - bound - DoubleQuotes - Bound - [ bound="@DateTime.Now"]
+                    MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [10..15)::5 - [bound] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[bound];
+                    Equals;[=];
+                    MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [17..30)::13
+                        MarkupBlock - [17..30)::13
+                            CSharpCodeBlock - [17..30)::13
+                                CSharpImplicitExpression - [17..30)::13
+                                    CSharpTransition - [17..18)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [18..30)::12
+                                        CSharpCodeBlock - [18..30)::12
+                                            CSharpExpressionLiteral - [18..30)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[ATD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [31..34)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers2.stree.txt
index ff9ec4c836..5e102b0e0e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers2.stree.txt
@@ -1,18 +1,19 @@
-Markup block - Gen<None> - 27 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<th:>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[th:];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [words and spaces] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:5
-        HtmlTokenType.Text;[words];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[and];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[spaces];
-    Tag block - Gen<None> - 6 - (21:0,21)
-        Markup span - Gen<Markup> - [</th:>] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[th:];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..27)::27 - [<th:>words and spaces</th:>]
+    MarkupBlock - [0..27)::27
+        MarkupTagBlock - [0..5)::5 - [<th:>]
+            MarkupTextLiteral - [0..5)::5 - [<th:>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[th:];
+                CloseAngle;[>];
+        MarkupTextLiteral - [5..21)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[words];
+            Whitespace;[ ];
+            Text;[and];
+            Whitespace;[ ];
+            Text;[spaces];
+        MarkupTagBlock - [21..27)::6 - [</th:>]
+            MarkupTextLiteral - [21..27)::6 - [</th:>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[th:];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers3.stree.txt
index 6fa88c654b..b6594f7006 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers3.stree.txt
@@ -1,3 +1,10 @@
-Markup block - Gen<None> - 11 - (0:0,0)
-    Tag block - Gen<TagHelper> - 11 - (0:0,0) - th:myth - mythTagHelper
-        SelfClosing - <th:myth />
+RazorDocument - [0..11)::11 - [<th:myth />]
+    MarkupBlock - [0..11)::11
+        MarkupTagHelperElement - [0..11)::11 - th:myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..11)::11
+                MarkupTextLiteral - [0..11)::11 - [<th:myth />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[th:myth];
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers4.stree.txt
index 25308b73be..b53776a026 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers4.stree.txt
@@ -1,3 +1,14 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Tag block - Gen<TagHelper> - 19 - (0:0,0) - th:myth - mythTagHelper
-        StartTagAndEndTag - <th:myth> ... </th:myth>
+RazorDocument - [0..19)::19 - [<th:myth></th:myth>]
+    MarkupBlock - [0..19)::19
+        MarkupTagHelperElement - [0..19)::19 - th:myth[StartTagAndEndTag] - mythTagHelper
+            MarkupTagHelperStartTag - [0..9)::9
+                MarkupTextLiteral - [0..9)::9 - [<th:myth>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[th:myth];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [9..19)::10
+                MarkupTextLiteral - [9..19)::10 - [</th:myth>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[th:myth];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers5.stree.txt
index 4c385a7618..734aa85116 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers5.stree.txt
@@ -1,14 +1,25 @@
-Markup block - Gen<None> - 40 - (0:0,0)
-    Tag block - Gen<TagHelper> - 40 - (0:0,0) - th:myth - mythTagHelper
-        StartTagAndEndTag - <th:myth> ... </th:myth>
-        Tag block - Gen<None> - 10 - (9:0,9)
-            Markup span - Gen<Markup> - [<th:my2th>] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[th:my2th];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 11 - (19:0,19)
-            Markup span - Gen<Markup> - [</th:my2th>] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[th:my2th];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..40)::40 - [<th:myth><th:my2th></th:my2th></th:myth>]
+    MarkupBlock - [0..40)::40
+        MarkupTagHelperElement - [0..40)::40 - th:myth[StartTagAndEndTag] - mythTagHelper
+            MarkupTagHelperStartTag - [0..9)::9
+                MarkupTextLiteral - [0..9)::9 - [<th:myth>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[th:myth];
+                    CloseAngle;[>];
+            MarkupTagBlock - [9..19)::10 - [<th:my2th>]
+                MarkupTextLiteral - [9..19)::10 - [<th:my2th>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[th:my2th];
+                    CloseAngle;[>];
+            MarkupTagBlock - [19..30)::11 - [</th:my2th>]
+                MarkupTextLiteral - [19..30)::11 - [</th:my2th>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[th:my2th];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [30..40)::10
+                MarkupTextLiteral - [30..40)::10 - [</th:myth>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[th:myth];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers6.stree.txt
index 85f332a96a..9a36af554a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers6.stree.txt
@@ -1,11 +1,12 @@
-Markup block - Gen<None> - 12 - (0:0,0)
-    Tag block - Gen<None> - 12 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [th:myth />] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:4
-            HtmlTokenType.Text;[th:myth];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..12)::12 - [<!th:myth />]
+    MarkupBlock - [0..12)::12
+        MarkupTagBlock - [0..12)::12 - [<!th:myth />]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [2..12)::10 - [th:myth />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[th:myth];
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers7.stree.txt
index d1c61da136..29d040629d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers7.stree.txt
@@ -1,18 +1,19 @@
-Markup block - Gen<None> - 21 - (0:0,0)
-    Tag block - Gen<None> - 10 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [th:myth>] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:2
-            HtmlTokenType.Text;[th:myth];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 11 - (10:0,10)
-        Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [th:myth>] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:2
-            HtmlTokenType.Text;[th:myth];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..21)::21 - [<!th:myth></!th:myth>]
+    MarkupBlock - [0..21)::21
+        MarkupTagBlock - [0..10)::10 - [<!th:myth>]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [2..10)::8 - [th:myth>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[th:myth];
+                CloseAngle;[>];
+        MarkupTagBlock - [10..21)::11 - [</!th:myth>]
+            MarkupTextLiteral - [10..12)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+            RazorMetaCode - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [13..21)::8 - [th:myth>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[th:myth];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.stree.txt
index 127d21b3c0..838fb64cca 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers8.stree.txt
@@ -1,6 +1,25 @@
-Markup block - Gen<None> - 23 - (0:0,0)
-    Tag block - Gen<TagHelper> - 23 - (0:0,0) - th:myth - mythTagHelper
-        SelfClosing - <th:myth class="btn" />
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..23)::23 - [<th:myth class="btn" />]
+    MarkupBlock - [0..23)::23
+        MarkupTagHelperElement - [0..23)::23 - th:myth[SelfClosing] - mythTagHelper
+            MarkupTagHelperStartTag - [0..23)::23
+                MarkupTextLiteral - [0..8)::8 - [<th:myth] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[th:myth];
+                MarkupTagHelperAttribute - [8..20)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [16..19)::3
+                        MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                            MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [20..23)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.stree.txt
index 0d0bec57c7..11055a52cd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsPrefixedTagHelpers9.stree.txt
@@ -1,6 +1,25 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Tag block - Gen<TagHelper> - 24 - (0:0,0) - th:myth2 - mythTagHelper2
-        SelfClosing - <th:myth2 class="btn" />
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..24)::24 - [<th:myth2 class="btn" />]
+    MarkupBlock - [0..24)::24
+        MarkupTagHelperElement - [0..24)::24 - th:myth2[SelfClosing] - mythTagHelper2
+            MarkupTagHelperStartTag - [0..24)::24
+                MarkupTextLiteral - [0..9)::9 - [<th:myth2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[th:myth2];
+                MarkupTagHelperAttribute - [9..21)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [10..15)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [17..20)::3
+                        MarkupLiteralAttributeValue - [17..20)::3 - [btn]
+                            MarkupTextLiteral - [17..20)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [21..24)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorCommentsAsChildren.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorCommentsAsChildren.stree.txt
index 65a33c1dd7..c9fe5d35d7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorCommentsAsChildren.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorCommentsAsChildren.stree.txt
@@ -1,27 +1,33 @@
-Markup block - Gen<None> - 26 - (0:0,0)
-    Tag block - Gen<TagHelper> - 26 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 3 - (3:0,3)
-            Markup span - Gen<Markup> - [<b>] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[b];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [asdf] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:1
-            HtmlTokenType.Text;[asdf];
-        Tag block - Gen<None> - 4 - (10:0,10)
-            Markup span - Gen<Markup> - [</b>] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[b];
-                HtmlTokenType.CloseAngle;[>];
-        Comment block - Gen<RazorComment> - 8 - (14:0,14)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:1
-                HtmlTokenType.RazorCommentTransition;[@];
-            MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-                HtmlTokenType.RazorCommentStar;[*];
-            Comment span - Gen<None> - [asdf] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                HtmlTokenType.RazorComment;[asdf];
-            MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1
-                HtmlTokenType.RazorCommentStar;[*];
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-                HtmlTokenType.RazorCommentTransition;[@];
+RazorDocument - [0..26)::26 - [<p><b>asdf</b>@*asdf*@</p>]
+    MarkupBlock - [0..26)::26
+        MarkupTagHelperElement - [0..26)::26 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [3..6)::3 - [<b>]
+                MarkupTextLiteral - [3..6)::3 - [<b>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[b];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [6..10)::4 - [asdf] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[asdf];
+            MarkupTagBlock - [10..14)::4 - [</b>]
+                MarkupTextLiteral - [10..14)::4 - [</b>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[b];
+                    CloseAngle;[>];
+            RazorComment - [14..22)::8
+                RazorCommentTransition;[@];
+                RazorCommentStar;[*];
+                RazorCommentLiteral;[asdf];
+                RazorCommentStar;[*];
+                RazorCommentTransition;[@];
+            MarkupTagHelperEndTag - [22..26)::4
+                MarkupTextLiteral - [22..26)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.cspans.txt
index 904b971906..841cefa3f9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.cspans.txt
@@ -2,7 +2,7 @@ Markup span at (3:0,3 [3] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [3] )
 Markup span at (6:0,6 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [37] )
 Markup span at (10:0,10 [4] ) (Accepts:Any) - Parent: Tag block at (10:0,10 [4] )
 Markup span at (14:0,14 [4] ) (Accepts:None) - Parent: HtmlComment block at (14:0,14 [19] )
-Markup span at (18:0,18 [6] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (14:0,14 [19] )
+Markup span at (18:0,18 [6] ) (Accepts:Whitespace) - Parent: HtmlComment block at (14:0,14 [19] )
 Transition span at (24:0,24 [1] ) (Accepts:None) - Parent: Expression block at (24:0,24 [6] )
-Code span at (25:0,25 [5] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (24:0,24 [6] )
+Code span at (25:0,25 [5] ) (Accepts:NonWhitespace) - Parent: Expression block at (24:0,24 [6] )
 Markup span at (30:0,30 [3] ) (Accepts:None) - Parent: HtmlComment block at (14:0,14 [19] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.stree.txt
index e2c3d3f02e..113f4d1534 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsRazorMarkupInHtmlComment.stree.txt
@@ -1,32 +1,46 @@
-Markup block - Gen<None> - 37 - (0:0,0)
-    Tag block - Gen<TagHelper> - 37 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 3 - (3:0,3)
-            Markup span - Gen<Markup> - [<b>] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[b];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [asdf] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:1
-            HtmlTokenType.Text;[asdf];
-        Tag block - Gen<None> - 4 - (10:0,10)
-            Markup span - Gen<Markup> - [</b>] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[b];
-                HtmlTokenType.CloseAngle;[>];
-        HtmlComment block - Gen<None> - 19 - (14:0,14)
-            Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Bang;[!];
-                HtmlTokenType.DoubleHyphen;[--];
-            Markup span - Gen<Markup> - [Hello ] - SpanEditHandler;Accepts:WhiteSpace - (18:0,18) - Tokens:2
-                HtmlTokenType.Text;[Hello];
-                HtmlTokenType.WhiteSpace;[ ];
-            Expression block - Gen<Expr> - 6 - (24:0,24)
-                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:1
-                    CSharpTokenType.Transition;[@];
-                Code span - Gen<Expr> - [World] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (25:0,25) - Tokens:1
-                    CSharpTokenType.Identifier;[World];
-            Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (30:0,30) - Tokens:2
-                HtmlTokenType.DoubleHyphen;[--];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..37)::37 - [<p><b>asdf</b><!--Hello @World--></p>]
+    MarkupBlock - [0..37)::37
+        MarkupTagHelperElement - [0..37)::37 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [3..6)::3 - [<b>]
+                MarkupTextLiteral - [3..6)::3 - [<b>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[b];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [6..10)::4 - [asdf] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[asdf];
+            MarkupTagBlock - [10..14)::4 - [</b>]
+                MarkupTextLiteral - [10..14)::4 - [</b>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[b];
+                    CloseAngle;[>];
+            MarkupCommentBlock - [14..33)::19
+                MarkupTextLiteral - [14..18)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Bang;[!];
+                    DoubleHyphen;[--];
+                MarkupTextLiteral - [18..24)::6 - [Hello ] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                    Text;[Hello];
+                    Whitespace;[ ];
+                CSharpCodeBlock - [24..30)::6
+                    CSharpImplicitExpression - [24..30)::6
+                        CSharpTransition - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                            Transition;[@];
+                        CSharpImplicitExpressionBody - [25..30)::5
+                            CSharpCodeBlock - [25..30)::5
+                                CSharpExpressionLiteral - [25..30)::5 - [World] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                    Identifier;[World];
+                MarkupTextLiteral - [30..33)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    DoubleHyphen;[--];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [33..37)::4
+                MarkupTextLiteral - [33..37)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.cspans.txt
index cef1544567..df900ecba5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.cspans.txt
@@ -2,5 +2,5 @@ Markup span at (3:0,3 [3] ) (Accepts:Any) - Parent: Tag block at (3:0,3 [3] )
 Markup span at (6:0,6 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [36] )
 Markup span at (10:0,10 [4] ) (Accepts:Any) - Parent: Tag block at (10:0,10 [4] )
 Markup span at (14:0,14 [4] ) (Accepts:None) - Parent: HtmlComment block at (14:0,14 [18] )
-Markup span at (18:0,18 [11] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (14:0,14 [18] )
+Markup span at (18:0,18 [11] ) (Accepts:Whitespace) - Parent: HtmlComment block at (14:0,14 [18] )
 Markup span at (29:0,29 [3] ) (Accepts:None) - Parent: HtmlComment block at (14:0,14 [18] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.stree.txt
index 6bded863a8..b74bc809e2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsSimpleHtmlCommentsAsChildren.stree.txt
@@ -1,28 +1,39 @@
-Markup block - Gen<None> - 36 - (0:0,0)
-    Tag block - Gen<TagHelper> - 36 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 3 - (3:0,3)
-            Markup span - Gen<Markup> - [<b>] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[b];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [asdf] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:1
-            HtmlTokenType.Text;[asdf];
-        Tag block - Gen<None> - 4 - (10:0,10)
-            Markup span - Gen<Markup> - [</b>] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[b];
-                HtmlTokenType.CloseAngle;[>];
-        HtmlComment block - Gen<None> - 18 - (14:0,14)
-            Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Bang;[!];
-                HtmlTokenType.DoubleHyphen;[--];
-            Markup span - Gen<Markup> - [Hello World] - SpanEditHandler;Accepts:WhiteSpace - (18:0,18) - Tokens:3
-                HtmlTokenType.Text;[Hello];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[World];
-            Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (29:0,29) - Tokens:2
-                HtmlTokenType.DoubleHyphen;[--];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..36)::36 - [<p><b>asdf</b><!--Hello World--></p>]
+    MarkupBlock - [0..36)::36
+        MarkupTagHelperElement - [0..36)::36 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [3..6)::3 - [<b>]
+                MarkupTextLiteral - [3..6)::3 - [<b>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[b];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [6..10)::4 - [asdf] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[asdf];
+            MarkupTagBlock - [10..14)::4 - [</b>]
+                MarkupTextLiteral - [10..14)::4 - [</b>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[b];
+                    CloseAngle;[>];
+            MarkupCommentBlock - [14..32)::18
+                MarkupTextLiteral - [14..18)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Bang;[!];
+                    DoubleHyphen;[--];
+                MarkupTextLiteral - [18..29)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                    Text;[Hello];
+                    Whitespace;[ ];
+                    Text;[World];
+                MarkupTextLiteral - [29..32)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    DoubleHyphen;[--];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [32..36)::4
+                MarkupTextLiteral - [32..36)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.stree.txt
index c21f1cce81..1820cae1f6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag1.stree.txt
@@ -1,30 +1,40 @@
-Markup block - Gen<None> - 22 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 22 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 20 - (2:0,2)
-            Tag block - Gen<None> - 19 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[text];
-                Markup block - Gen<Attr:class, class="@(8:0,8),"@(19:0,19)> - 12 - (8:0,8)
-                    Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.DoubleQuote;["];
-                    Markup span - Gen<LitAttr:@(16:0,16)> - [btn] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-                    Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:1
-                        HtmlTokenType.DoubleQuote;["];
-                Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-                HtmlTokenType.Text;[}];
+RazorDocument - [0..22)::22 - [@{<!text class="btn">}]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            CSharpStatement - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..22)::21
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..22)::20
+                        MarkupBlock - [2..22)::20
+                            MarkupTagBlock - [2..21)::19 - [<!text class="btn">]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..8)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[text];
+                                MarkupAttributeBlock - [8..20)::12 - [ class="btn"]
+                                    MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                    GenericBlock - [16..19)::3
+                                        MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                                            MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn];
+                                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                MarkupTextLiteral - [20..21)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [21..22)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[}];
+                    RazorMetaCode - [22..22)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag2.stree.txt
index 398a2b4463..cbdf9ea724 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag2.stree.txt
@@ -1,43 +1,51 @@
-Markup block - Gen<None> - 30 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 30 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 27 - (2:0,2)
-            Tag block - Gen<None> - 19 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[text];
-                Markup block - Gen<Attr:class, class="@(8:0,8),"@(19:0,19)> - 12 - (8:0,8)
-                    Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.DoubleQuote;["];
-                    Markup span - Gen<LitAttr:@(16:0,16)> - [btn] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-                    Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:1
-                        HtmlTokenType.DoubleQuote;["];
-                Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 8 - (21:0,21)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text>] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (29:0,29) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..30)::30 - [@{<!text class="btn"></!text>}]
+    MarkupBlock - [0..30)::30
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..30)::30
+            CSharpStatement - [0..30)::30
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..30)::29
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..29)::27
+                        MarkupBlock - [2..29)::27
+                            MarkupTagBlock - [2..21)::19 - [<!text class="btn">]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..8)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[text];
+                                MarkupAttributeBlock - [8..20)::12 - [ class="btn"]
+                                    MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                    GenericBlock - [16..19)::3
+                                        MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                                            MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn];
+                                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                MarkupTextLiteral - [20..21)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [21..29)::8 - [</!text>]
+                                MarkupTextLiteral - [21..23)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [24..29)::5 - [text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [29..29)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [29..30)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [30..30)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag3.stree.txt
index 65396549d1..9ccfbc3083 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag3.stree.txt
@@ -1,49 +1,57 @@
-Markup block - Gen<None> - 47 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 47 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 44 - (2:0,2)
-            Tag block - Gen<None> - 19 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[text];
-                Markup block - Gen<Attr:class, class="@(8:0,8),"@(19:0,19)> - 12 - (8:0,8)
-                    Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.DoubleQuote;["];
-                    Markup span - Gen<LitAttr:@(16:0,16)> - [btn] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-                    Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:1
-                        HtmlTokenType.DoubleQuote;["];
-                Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [words with spaces] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:5
-                HtmlTokenType.Text;[words];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[with];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[spaces];
-            Tag block - Gen<None> - 8 - (38:0,38)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (38:0,38) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text>] - SpanEditHandler;Accepts:None - (41:0,41) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (46:0,46) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..47)::47 - [@{<!text class="btn">words with spaces</!text>}]
+    MarkupBlock - [0..47)::47
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..47)::47
+            CSharpStatement - [0..47)::47
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..47)::46
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..46)::44
+                        MarkupBlock - [2..46)::44
+                            MarkupTagBlock - [2..21)::19 - [<!text class="btn">]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..8)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[text];
+                                MarkupAttributeBlock - [8..20)::12 - [ class="btn"]
+                                    MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                    GenericBlock - [16..19)::3
+                                        MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                                            MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn];
+                                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                MarkupTextLiteral - [20..21)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [21..38)::17 - [words with spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[words];
+                                Whitespace;[ ];
+                                Text;[with];
+                                Whitespace;[ ];
+                                Text;[spaces];
+                            MarkupTagBlock - [38..46)::8 - [</!text>]
+                                MarkupTextLiteral - [38..40)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [40..41)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [41..46)::5 - [text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [46..46)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [46..47)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [47..47)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag4.stree.txt
index 7695d59acb..fd66721f5c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag4.stree.txt
@@ -1,53 +1,66 @@
-Markup block - Gen<None> - 47 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 47 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 44 - (2:0,2)
-            Tag block - Gen<None> - 36 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[text];
-                Markup block - Gen<Attr:class, class='@(8:0,8),'@(25:0,25)> - 18 - (8:0,8)
-                    Markup span - Gen<None> - [ class='] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.SingleQuote;['];
-                    Markup span - Gen<LitAttr:@(16:0,16)> - [btn1] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                        HtmlTokenType.Text;[btn1];
-                    Markup span - Gen<LitAttr: @(20:0,20)> - [ btn2] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:2
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[btn2];
-                    Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
-                        HtmlTokenType.SingleQuote;['];
-                Markup block - Gen<Attr:class2, class2=@(26:0,26),@(37:0,37)> - 11 - (26:0,26)
-                    Markup span - Gen<None> - [ class2=] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:3
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class2];
-                        HtmlTokenType.Equals;[=];
-                    Markup span - Gen<LitAttr:@(34:0,34)> - [btn] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-                Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (37:0,37) - Tokens:1
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 8 - (38:0,38)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (38:0,38) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text>] - SpanEditHandler;Accepts:None - (41:0,41) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (46:0,46) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..47)::47 - [@{<!text class='btn1 btn2' class2=btn></!text>}]
+    MarkupBlock - [0..47)::47
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..47)::47
+            CSharpStatement - [0..47)::47
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..47)::46
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..46)::44
+                        MarkupBlock - [2..46)::44
+                            MarkupTagBlock - [2..38)::36 - [<!text class='btn1 btn2' class2=btn>]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..8)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[text];
+                                MarkupAttributeBlock - [8..26)::18 - [ class='btn1 btn2']
+                                    MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        SingleQuote;['];
+                                    GenericBlock - [16..25)::9
+                                        MarkupLiteralAttributeValue - [16..20)::4 - [btn1]
+                                            MarkupTextLiteral - [16..20)::4 - [btn1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn1];
+                                        MarkupLiteralAttributeValue - [20..25)::5 - [ btn2]
+                                            MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                            MarkupTextLiteral - [21..25)::4 - [btn2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn2];
+                                    MarkupTextLiteral - [25..26)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        SingleQuote;['];
+                                MarkupAttributeBlock - [26..37)::11 - [ class2=btn]
+                                    MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [27..33)::6 - [class2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class2];
+                                    Equals;[=];
+                                    GenericBlock - [34..37)::3
+                                        MarkupLiteralAttributeValue - [34..37)::3 - [btn]
+                                            MarkupTextLiteral - [34..37)::3 - [btn] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                Text;[btn];
+                                MarkupTextLiteral - [37..38)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [38..46)::8 - [</!text>]
+                                MarkupTextLiteral - [38..40)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [40..41)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [41..46)::5 - [text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [46..46)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [46..47)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [47..47)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.cspans.txt
index b856d8398b..8543c4eeb6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.cspans.txt
@@ -8,7 +8,7 @@ Markup span at (8:0,8 [8] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [32]
 Markup span at (16:0,16 [4] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [32] )
 Markup span at (20:0,20 [1] ) (Accepts:Any) - Parent: Markup block at (20:0,20 [14] )
 Transition span at (21:0,21 [1] ) (Accepts:None) - Parent: Expression block at (21:0,21 [13] )
-Code span at (22:0,22 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (21:0,21 [13] )
+Code span at (22:0,22 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (21:0,21 [13] )
 Markup span at (34:0,34 [5] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [32] )
 Markup span at (39:0,39 [1] ) (Accepts:Any) - Parent: Markup block at (8:0,8 [32] )
 Markup span at (40:0,40 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [39] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.stree.txt
index 1b64304b61..ae63cba1bc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithAttrTextTag5.stree.txt
@@ -1,56 +1,70 @@
-Markup block - Gen<None> - 50 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 50 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 47 - (2:0,2)
-            Tag block - Gen<None> - 39 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[text];
-                Markup block - Gen<Attr:class, class='@(8:0,8),'@(39:0,39)> - 32 - (8:0,8)
-                    Markup span - Gen<None> - [ class='] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.SingleQuote;['];
-                    Markup span - Gen<LitAttr:@(16:0,16)> - [btn1] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                        HtmlTokenType.Text;[btn1];
-                    Markup block - Gen<DynAttr: @(20:0,20)> - 14 - (20:0,20)
-                        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-                            HtmlTokenType.WhiteSpace;[ ];
-                        Expression block - Gen<Expr> - 13 - (21:0,21)
-                            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
-                                CSharpTokenType.Transition;[@];
-                            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (22:0,22) - Tokens:3
-                                CSharpTokenType.Identifier;[DateTime];
-                                CSharpTokenType.Dot;[.];
-                                CSharpTokenType.Identifier;[Now];
-                    Markup span - Gen<LitAttr: @(34:0,34)> - [ btn2] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:2
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[btn2];
-                    Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:1
-                        HtmlTokenType.SingleQuote;['];
-                Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:1
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 8 - (41:0,41)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (43:0,43) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text>] - SpanEditHandler;Accepts:None - (44:0,44) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (49:0,49) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (49:0,49) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (50:0,50) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..50)::50 - [@{<!text class='btn1 @DateTime.Now btn2'></!text>}]
+    MarkupBlock - [0..50)::50
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..50)::50
+            CSharpStatement - [0..50)::50
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..50)::49
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..49)::47
+                        MarkupBlock - [2..49)::47
+                            MarkupTagBlock - [2..41)::39 - [<!text class='btn1 @DateTime.Now btn2'>]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..8)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[text];
+                                MarkupAttributeBlock - [8..40)::32 - [ class='btn1 @DateTime.Now btn2']
+                                    MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [15..16)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        SingleQuote;['];
+                                    GenericBlock - [16..39)::23
+                                        MarkupLiteralAttributeValue - [16..20)::4 - [btn1]
+                                            MarkupTextLiteral - [16..20)::4 - [btn1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn1];
+                                        MarkupDynamicAttributeValue - [20..34)::14 - [ @DateTime.Now]
+                                            MarkupTextLiteral - [20..21)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                            GenericBlock - [21..34)::13
+                                                CSharpCodeBlock - [21..34)::13
+                                                    CSharpImplicitExpression - [21..34)::13
+                                                        CSharpTransition - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                            Transition;[@];
+                                                        CSharpImplicitExpressionBody - [22..34)::12
+                                                            CSharpCodeBlock - [22..34)::12
+                                                                CSharpExpressionLiteral - [22..34)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                    Identifier;[DateTime];
+                                                                    Dot;[.];
+                                                                    Identifier;[Now];
+                                        MarkupLiteralAttributeValue - [34..39)::5 - [ btn2]
+                                            MarkupTextLiteral - [34..35)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                            MarkupTextLiteral - [35..39)::4 - [btn2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn2];
+                                    MarkupTextLiteral - [39..40)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        SingleQuote;['];
+                                MarkupTextLiteral - [40..41)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [41..49)::8 - [</!text>]
+                                MarkupTextLiteral - [41..43)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [43..44)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [44..49)::5 - [text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [49..49)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [49..50)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [50..50)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1.stree.txt
index d50cac9af1..e0dba1948e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag1.stree.txt
@@ -1,19 +1,25 @@
-Markup block - Gen<None> - 10 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 10 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 8 - (2:0,2)
-            Tag block - Gen<None> - 7 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text>] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-                HtmlTokenType.Text;[}];
+RazorDocument - [0..10)::10 - [@{<!text>}]
+    MarkupBlock - [0..10)::10
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..10)::10
+            CSharpStatement - [0..10)::10
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..10)::9
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..10)::8
+                        MarkupBlock - [2..10)::8
+                            MarkupTagBlock - [2..9)::7 - [<!text>]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..9)::5 - [text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [9..10)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[}];
+                    RazorMetaCode - [10..10)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2.stree.txt
index 57a1776c02..a77624de57 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag2.stree.txt
@@ -1,24 +1,28 @@
-Markup block - Gen<None> - 11 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 11 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 8 - (2:0,2)
-            Tag block - Gen<None> - 8 - (2:0,2)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text>] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..11)::11 - [@{</!text>}]
+    MarkupBlock - [0..11)::11
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..11)::11
+            CSharpStatement - [0..11)::11
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..11)::10
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..10)::8
+                        MarkupBlock - [2..10)::8
+                            MarkupTagBlock - [2..10)::8 - [</!text>]
+                                MarkupTextLiteral - [2..4)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [5..10)::5 - [text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [10..10)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [11..11)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag3.stree.txt
index 955cfed333..dd4a2f53e8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag3.stree.txt
@@ -1,32 +1,36 @@
-Markup block - Gen<None> - 18 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 18 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 15 - (2:0,2)
-            Tag block - Gen<None> - 7 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text>] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 8 - (9:0,9)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (11:0,11) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text>] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..18)::18 - [@{<!text></!text>}]
+    MarkupBlock - [0..18)::18
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..18)::18
+            CSharpStatement - [0..18)::18
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..18)::17
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..17)::15
+                        MarkupBlock - [2..17)::15
+                            MarkupTagBlock - [2..9)::7 - [<!text>]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..9)::5 - [text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [9..17)::8 - [</!text>]
+                                MarkupTextLiteral - [9..11)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [12..17)::5 - [text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [17..17)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [17..18)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [18..18)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag4.stree.txt
index 378766df7d..76ed69993a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag4.stree.txt
@@ -1,38 +1,42 @@
-Markup block - Gen<None> - 34 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 34 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 31 - (2:0,2)
-            Tag block - Gen<None> - 7 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text>] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [words and spaces] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:5
-                HtmlTokenType.Text;[words];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[and];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[spaces];
-            Tag block - Gen<None> - 8 - (25:0,25)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text>] - SpanEditHandler;Accepts:None - (28:0,28) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (33:0,33) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..34)::34 - [@{<!text>words and spaces</!text>}]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        MarkupBlock - [2..33)::31
+                            MarkupTagBlock - [2..9)::7 - [<!text>]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..9)::5 - [text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [9..25)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[words];
+                                Whitespace;[ ];
+                                Text;[and];
+                                Whitespace;[ ];
+                                Text;[spaces];
+                            MarkupTagBlock - [25..33)::8 - [</!text>]
+                                MarkupTextLiteral - [25..27)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [27..28)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [28..33)::5 - [text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5.stree.txt
index 4cd1004f88..f25f69c178 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag5.stree.txt
@@ -1,29 +1,33 @@
-Markup block - Gen<None> - 17 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 17 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 14 - (2:0,2)
-            Tag block - Gen<None> - 7 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text>] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 7 - (9:0,9)
-                Markup span - Gen<Markup> - [</text>] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..17)::17 - [@{<!text></text>}]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            CSharpStatement - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..17)::16
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..16)::14
+                        MarkupBlock - [2..16)::14
+                            MarkupTagBlock - [2..9)::7 - [<!text>]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..9)::5 - [text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [9..16)::7 - [</text>]
+                                MarkupTextLiteral - [9..16)::7 - [</text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [16..16)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6.stree.txt
index b879b58136..d1f5b43057 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag6.stree.txt
@@ -1,29 +1,33 @@
-Markup block - Gen<None> - 17 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 17 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 14 - (2:0,2)
-            Tag block - Gen<None> - 6 - (2:0,2)
-                Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 8 - (8:0,8)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text>] - SpanEditHandler;Accepts:None - (11:0,11) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..17)::17 - [@{<text></!text>}]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            CSharpStatement - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..17)::16
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..16)::14
+                        MarkupBlock - [2..16)::14
+                            MarkupTagBlock - [2..8)::6 - [<text>]
+                                MarkupTransition - [2..8)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [8..16)::8 - [</!text>]
+                                MarkupTextLiteral - [8..10)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [11..16)::5 - [text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [16..16)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7.stree.txt
index 3bb04cb468..0a1ea6c257 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag7.stree.txt
@@ -1,34 +1,48 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 31 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 28 - (2:0,2)
-            Tag block - Gen<None> - 7 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text>] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<TagHelper> - 13 - (9:0,9) - text - texttaghelper
-                StartTagAndEndTag - <text> ... </text>
-            Tag block - Gen<None> - 8 - (22:0,22)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text>] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (30:0,30) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..31)::31 - [@{<!text><text></text></!text>}]
+    MarkupBlock - [0..31)::31
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..31)::31
+            CSharpStatement - [0..31)::31
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..31)::30
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..30)::28
+                        MarkupBlock - [2..30)::28
+                            MarkupTagBlock - [2..9)::7 - [<!text>]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..9)::5 - [text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTagHelperElement - [9..22)::13 - text[StartTagAndEndTag] - texttaghelper
+                                MarkupTagHelperStartTag - [9..15)::6
+                                    MarkupTextLiteral - [9..15)::6 - [<text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[text];
+                                        CloseAngle;[>];
+                                MarkupTagHelperEndTag - [15..22)::7
+                                    MarkupTextLiteral - [15..22)::7 - [</text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[text];
+                                        CloseAngle;[>];
+                            MarkupTagBlock - [22..30)::8 - [</!text>]
+                                MarkupTextLiteral - [22..24)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [25..30)::5 - [text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [30..30)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [30..31)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [31..31)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8.stree.txt
index 799e59b7e1..44eb53c511 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag8.stree.txt
@@ -1,33 +1,39 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 24 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 22 - (2:0,2)
-            Tag block - Gen<None> - 6 - (2:0,2)
-                Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 7 - (8:0,8)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text>] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 8 - (15:0,15)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text>] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:1
-                HtmlTokenType.Text;[}];
+RazorDocument - [0..24)::24 - [@{<text><!text></!text>}]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..24)::24
+            CSharpStatement - [0..24)::24
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..24)::23
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..24)::22
+                        MarkupBlock - [2..24)::22
+                            MarkupTagBlock - [2..8)::6 - [<text>]
+                                MarkupTransition - [2..8)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [8..15)::7 - [<!text>]
+                                MarkupTextLiteral - [8..9)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                RazorMetaCode - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [10..15)::5 - [text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [15..23)::8 - [</!text>]
+                                MarkupTextLiteral - [15..17)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [17..18)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [18..23)::5 - [text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [23..24)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[}];
+                    RazorMetaCode - [24..24)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9.stree.txt
index e094423eca..846d0090a9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTHElementOptForCompleteTextTagInCSharpBlock_WithBlockTextTag9.stree.txt
@@ -1,39 +1,43 @@
-Markup block - Gen<None> - 25 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 25 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 15 - (2:0,2)
-            Tag block - Gen<None> - 7 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text>] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 8 - (9:0,9)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (11:0,11) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text>] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-        Markup block - Gen<None> - 7 - (17:0,17)
-            Tag block - Gen<None> - 7 - (17:0,17)
-                Markup span - Gen<Markup> - [</text>] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..25)::25 - [@{<!text></!text></text>}]
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..25)::25
+            CSharpStatement - [0..25)::25
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..25)::24
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..24)::22
+                        MarkupBlock - [2..17)::15
+                            MarkupTagBlock - [2..9)::7 - [<!text>]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..9)::5 - [text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [9..17)::8 - [</!text>]
+                                MarkupTextLiteral - [9..11)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [12..17)::5 - [text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        MarkupBlock - [17..24)::7
+                            MarkupTagBlock - [17..24)::7 - [</text>]
+                                MarkupTextLiteral - [17..24)::7 - [</text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [24..24)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [25..25)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML1.stree.txt
index 930898261d..61c1a03dc4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML1.stree.txt
@@ -1,4 +1,5 @@
-Markup block - Gen<None> - 2 - (0:0,0)
-    Markup span - Gen<Markup> - [<!] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Bang;[!];
+RazorDocument - [0..2)::2 - [<!]
+    MarkupBlock - [0..2)::2
+        MarkupTextLiteral - [0..2)::2 - [<!] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Bang;[!];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML2.stree.txt
index 4ac5c7309b..52d9469e77 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML2.stree.txt
@@ -1,8 +1,9 @@
-Markup block - Gen<None> - 3 - (0:0,0)
-    Tag block - Gen<None> - 3 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-            HtmlTokenType.Text;[p];
+RazorDocument - [0..3)::3 - [<!p]
+    MarkupBlock - [0..3)::3
+        MarkupTagBlock - [0..3)::3 - [<!p]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [2..3)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML3.stree.txt
index d3db79796e..3a79c373e3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML3.stree.txt
@@ -1,10 +1,11 @@
-Markup block - Gen<None> - 5 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p /] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:3
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
+RazorDocument - [0..5)::5 - [<!p /]
+    MarkupBlock - [0..5)::5
+        MarkupTagBlock - [0..5)::5 - [<!p /]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [2..5)::3 - [p /] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+                Whitespace;[ ];
+                ForwardSlash;[/];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML4.stree.txt
index 611bfccbb5..9208c63b1d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML4.stree.txt
@@ -1,13 +1,15 @@
-Markup block - Gen<None> - 10 - (0:0,0)
-    Tag block - Gen<None> - 10 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-            HtmlTokenType.Text;[p];
-        Markup block - Gen<Attr:class, class=@(3:0,3),@(10:0,10)> - 7 - (3:0,3)
-            Markup span - Gen<None> - [ class=] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[class];
-                HtmlTokenType.Equals;[=];
+RazorDocument - [0..10)::10 - [<!p class=]
+    MarkupBlock - [0..10)::10
+        MarkupTagBlock - [0..10)::10 - [<!p class=]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [2..3)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+            MarkupAttributeBlock - [3..10)::7 - [ class=]
+                MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[class];
+                Equals;[=];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML5.stree.txt
index b694b57857..0d4e13b188 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML5.stree.txt
@@ -1,16 +1,21 @@
-Markup block - Gen<None> - 14 - (0:0,0)
-    Tag block - Gen<None> - 14 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-            HtmlTokenType.Text;[p];
-        Markup block - Gen<Attr:class, class="@(3:0,3),@(14:0,14)> - 11 - (3:0,3)
-            Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[class];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<LitAttr:@(11:0,11)> - [btn] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..14)::14 - [<!p class="btn]
+    MarkupBlock - [0..14)::14
+        MarkupTagBlock - [0..14)::14 - [<!p class="btn]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [2..3)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+            MarkupAttributeBlock - [3..14)::11 - [ class="btn]
+                MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[class];
+                Equals;[=];
+                MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+                GenericBlock - [11..14)::3
+                    MarkupLiteralAttributeValue - [11..14)::3 - [btn]
+                        MarkupTextLiteral - [11..14)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[btn];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML6.stree.txt
index 1bd3369f3a..4a49cc9474 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML6.stree.txt
@@ -1,18 +1,23 @@
-Markup block - Gen<None> - 15 - (0:0,0)
-    Tag block - Gen<None> - 15 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-            HtmlTokenType.Text;[p];
-        Markup block - Gen<Attr:class, class="@(3:0,3),"@(14:0,14)> - 12 - (3:0,3)
-            Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[class];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<LitAttr:@(11:0,11)> - [btn] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-                HtmlTokenType.Text;[btn];
-            Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.DoubleQuote;["];
+RazorDocument - [0..15)::15 - [<!p class="btn"]
+    MarkupBlock - [0..15)::15
+        MarkupTagBlock - [0..15)::15 - [<!p class="btn"]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [2..3)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+            MarkupAttributeBlock - [3..15)::12 - [ class="btn"]
+                MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[class];
+                Equals;[=];
+                MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+                GenericBlock - [11..14)::3
+                    MarkupLiteralAttributeValue - [11..14)::3 - [btn]
+                        MarkupTextLiteral - [11..14)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[btn];
+                MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML7.stree.txt
index 8a9c2cd03a..6c37a7d5cd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTML7.stree.txt
@@ -1,21 +1,26 @@
-Markup block - Gen<None> - 17 - (0:0,0)
-    Tag block - Gen<None> - 17 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-            HtmlTokenType.Text;[p];
-        Markup block - Gen<Attr:class, class="@(3:0,3),"@(14:0,14)> - 12 - (3:0,3)
-            Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[class];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<LitAttr:@(11:0,11)> - [btn] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-                HtmlTokenType.Text;[btn];
-            Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.DoubleQuote;["];
-        Markup span - Gen<Markup> - [ /] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:2
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
+RazorDocument - [0..17)::17 - [<!p class="btn" /]
+    MarkupBlock - [0..17)::17
+        MarkupTagBlock - [0..17)::17 - [<!p class="btn" /]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [2..3)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+            MarkupAttributeBlock - [3..15)::12 - [ class="btn"]
+                MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[class];
+                Equals;[=];
+                MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+                GenericBlock - [11..14)::3
+                    MarkupLiteralAttributeValue - [11..14)::3 - [btn]
+                        MarkupTextLiteral - [11..14)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[btn];
+                MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+            MarkupTextLiteral - [15..17)::2 - [ /] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                ForwardSlash;[/];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1.stree.txt
index cb39861023..b8d82590bd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock1.stree.txt
@@ -1,16 +1,22 @@
-Markup block - Gen<None> - 5 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 5 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 3 - (2:0,2)
-            Tag block - Gen<None> - 3 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[}];
+RazorDocument - [0..5)::5 - [@{<!}]
+    MarkupBlock - [0..5)::5
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..5)::5
+            CSharpStatement - [0..5)::5
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..5)::4
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..5)::3
+                        MarkupBlock - [2..5)::3
+                            MarkupTagBlock - [2..5)::3 - [<!}]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..5)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[}];
+                    RazorMetaCode - [5..5)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2.stree.txt
index 7ea5891786..5e474138d3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock2.stree.txt
@@ -1,16 +1,22 @@
-Markup block - Gen<None> - 6 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 6 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 4 - (2:0,2)
-            Tag block - Gen<None> - 4 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p}] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[p}];
+RazorDocument - [0..6)::6 - [@{<!p}]
+    MarkupBlock - [0..6)::6
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..6)::6
+            CSharpStatement - [0..6)::6
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..6)::5
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..6)::4
+                        MarkupBlock - [2..6)::4
+                            MarkupTagBlock - [2..6)::4 - [<!p}]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..6)::2 - [p}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[p}];
+                    RazorMetaCode - [6..6)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3.stree.txt
index c9f074f150..34a66c67b7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock3.stree.txt
@@ -1,21 +1,27 @@
-Markup block - Gen<None> - 8 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 8 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 6 - (2:0,2)
-            Tag block - Gen<None> - 6 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p /] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:3
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.ForwardSlash;[/];
-                Markup block - Gen<None> - 1 - (7:0,7)
-                    Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:1
-                        HtmlTokenType.Text;[}];
+RazorDocument - [0..8)::8 - [@{<!p /}]
+    MarkupBlock - [0..8)::8
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            CSharpStatement - [0..8)::8
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..8)::7
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..8)::6
+                        MarkupBlock - [2..8)::6
+                            MarkupTagBlock - [2..8)::6 - [<!p /}]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..7)::3 - [p /] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[p];
+                                    Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                MarkupMinimizedAttributeBlock - [7..8)::1 - [}]
+                                    MarkupTextLiteral - [7..8)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[}];
+                    RazorMetaCode - [8..8)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.stree.txt
index c2036909f9..b417b1cecc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock4.stree.txt
@@ -1,23 +1,32 @@
-Markup block - Gen<None> - 13 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 13 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 11 - (2:0,2)
-            Tag block - Gen<None> - 11 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[p];
-                Markup block - Gen<Attr:class, class=@(5:0,5),@(13:0,13)> - 8 - (5:0,5)
-                    Markup span - Gen<None> - [ class=] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:3
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                    Markup span - Gen<LitAttr:@(12:0,12)> - [}] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                        HtmlTokenType.Text;[}];
+RazorDocument - [0..13)::13 - [@{<!p class=}]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..13)::13
+            CSharpStatement - [0..13)::13
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..13)::12
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..13)::11
+                        MarkupBlock - [2..13)::11
+                            MarkupTagBlock - [2..13)::11 - [<!p class=}]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..5)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[p];
+                                MarkupAttributeBlock - [5..13)::8 - [ class=}]
+                                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    GenericBlock - [12..13)::1
+                                        MarkupLiteralAttributeValue - [12..13)::1 - [}]
+                                            MarkupTextLiteral - [12..13)::1 - [}] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                Text;[}];
+                    RazorMetaCode - [13..13)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.stree.txt
index 6fc784eeb8..4917b1deee 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock5.stree.txt
@@ -1,24 +1,34 @@
-Markup block - Gen<None> - 17 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 17 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 15 - (2:0,2)
-            Tag block - Gen<None> - 15 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[p];
-                Markup block - Gen<Attr:class, class="@(5:0,5),@(17:0,17)> - 12 - (5:0,5)
-                    Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.DoubleQuote;["];
-                    Markup span - Gen<LitAttr:@(13:0,13)> - [btn}] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                        HtmlTokenType.Text;[btn}];
+RazorDocument - [0..17)::17 - [@{<!p class="btn}]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            CSharpStatement - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..17)::16
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..17)::15
+                        MarkupBlock - [2..17)::15
+                            MarkupTagBlock - [2..17)::15 - [<!p class="btn}]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..5)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[p];
+                                MarkupAttributeBlock - [5..17)::12 - [ class="btn}]
+                                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                    GenericBlock - [13..17)::4
+                                        MarkupLiteralAttributeValue - [13..17)::4 - [btn}]
+                                            MarkupTextLiteral - [13..17)::4 - [btn}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn}];
+                    RazorMetaCode - [17..17)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.stree.txt
index 5d701b8fec..65b84da2ec 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock6.stree.txt
@@ -1,31 +1,42 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 19 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 17 - (2:0,2)
-            Tag block - Gen<None> - 17 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[p];
-                Markup block - Gen<Attr:class, class="@(5:0,5),@(19:0,19)> - 14 - (5:0,5)
-                    Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.DoubleQuote;["];
-                    Markup span - Gen<LitAttr:@(13:0,13)> - [btn] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-                    Markup block - Gen<None> - 2 - (16:0,16)
-                        Markup span - Gen<LitAttr:@(16:0,16)> - [@] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-                            HtmlTokenType.Transition;[@];
-                        Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:1
-                            HtmlTokenType.Transition;[@];
-                    Markup span - Gen<LitAttr:@(18:0,18)> - [}] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
-                        HtmlTokenType.Text;[}];
+RazorDocument - [0..19)::19 - [@{<!p class="btn@@}]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            CSharpStatement - [0..19)::19
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..19)::18
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..19)::17
+                        MarkupBlock - [2..19)::17
+                            MarkupTagBlock - [2..19)::17 - [<!p class="btn@@}]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..5)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[p];
+                                MarkupAttributeBlock - [5..19)::14 - [ class="btn@@}]
+                                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                    GenericBlock - [13..19)::6
+                                        MarkupLiteralAttributeValue - [13..16)::3 - [btn]
+                                            MarkupTextLiteral - [13..16)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn];
+                                        MarkupBlock - [16..18)::2
+                                            MarkupTextLiteral - [16..17)::1 - [@] - Gen<LitAttr:@(16:0,16)> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                            MarkupEphemeralTextLiteral - [17..18)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                                Transition;[@];
+                                        MarkupLiteralAttributeValue - [18..19)::1 - [}]
+                                            MarkupTextLiteral - [18..19)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[}];
+                    RazorMetaCode - [19..19)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.stree.txt
index 505e5c9373..c3e2ac96b5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock7.stree.txt
@@ -1,29 +1,39 @@
-Markup block - Gen<None> - 18 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 18 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 16 - (2:0,2)
-            Tag block - Gen<None> - 16 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[p];
-                Markup block - Gen<Attr:class, class="@(5:0,5),"@(16:0,16)> - 12 - (5:0,5)
-                    Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.DoubleQuote;["];
-                    Markup span - Gen<LitAttr:@(13:0,13)> - [btn] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-                    Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                        HtmlTokenType.DoubleQuote;["];
-                Markup block - Gen<None> - 1 - (17:0,17)
-                    Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-                        HtmlTokenType.Text;[}];
+RazorDocument - [0..18)::18 - [@{<!p class="btn"}]
+    MarkupBlock - [0..18)::18
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..18)::18
+            CSharpStatement - [0..18)::18
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..18)::17
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..18)::16
+                        MarkupBlock - [2..18)::16
+                            MarkupTagBlock - [2..18)::16 - [<!p class="btn"}]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..5)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[p];
+                                MarkupAttributeBlock - [5..17)::12 - [ class="btn"]
+                                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                    GenericBlock - [13..16)::3
+                                        MarkupLiteralAttributeValue - [13..16)::3 - [btn]
+                                            MarkupTextLiteral - [13..16)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn];
+                                    MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                MarkupMinimizedAttributeBlock - [17..18)::1 - [}]
+                                    MarkupTextLiteral - [17..18)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[}];
+                    RazorMetaCode - [18..18)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.stree.txt
index 8d56ef1281..26ffe4ab64 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteHTMLInCSharpBlock8.stree.txt
@@ -1,32 +1,42 @@
-Markup block - Gen<None> - 20 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 20 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 18 - (2:0,2)
-            Tag block - Gen<None> - 18 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[p];
-                Markup block - Gen<Attr:class, class="@(5:0,5),"@(16:0,16)> - 12 - (5:0,5)
-                    Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.DoubleQuote;["];
-                    Markup span - Gen<LitAttr:@(13:0,13)> - [btn] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-                    Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                        HtmlTokenType.DoubleQuote;["];
-                Markup span - Gen<Markup> - [ /] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.ForwardSlash;[/];
-                Markup block - Gen<None> - 1 - (19:0,19)
-                    Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:1
-                        HtmlTokenType.Text;[}];
+RazorDocument - [0..20)::20 - [@{<!p class="btn" /}]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            CSharpStatement - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..20)::19
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..20)::18
+                        MarkupBlock - [2..20)::18
+                            MarkupTagBlock - [2..20)::18 - [<!p class="btn" /}]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..5)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[p];
+                                MarkupAttributeBlock - [5..17)::12 - [ class="btn"]
+                                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                    GenericBlock - [13..16)::3
+                                        MarkupLiteralAttributeValue - [13..16)::3 - [btn]
+                                            MarkupTextLiteral - [13..16)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn];
+                                    MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                MarkupTextLiteral - [17..19)::2 - [ /] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                MarkupMinimizedAttributeBlock - [19..20)::1 - [}]
+                                    MarkupTextLiteral - [19..20)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[}];
+                    RazorMetaCode - [20..20)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1.stree.txt
index d8d21b12b4..bdbf9331b4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock1.stree.txt
@@ -1,16 +1,22 @@
-Markup block - Gen<None> - 9 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 9 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 7 - (2:0,2)
-            Tag block - Gen<None> - 7 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text}] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[text}];
+RazorDocument - [0..9)::9 - [@{<!text}]
+    MarkupBlock - [0..9)::9
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..9)::9
+            CSharpStatement - [0..9)::9
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..9)::8
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..9)::7
+                        MarkupBlock - [2..9)::7
+                            MarkupTagBlock - [2..9)::7 - [<!text}]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..9)::5 - [text}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[text}];
+                    RazorMetaCode - [9..9)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2.stree.txt
index c11b477e02..97ba0757a2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock2.stree.txt
@@ -1,21 +1,27 @@
-Markup block - Gen<None> - 11 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 11 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 9 - (2:0,2)
-            Tag block - Gen<None> - 9 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text /] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:3
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.ForwardSlash;[/];
-                Markup block - Gen<None> - 1 - (10:0,10)
-                    Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                        HtmlTokenType.Text;[}];
+RazorDocument - [0..11)::11 - [@{<!text /}]
+    MarkupBlock - [0..11)::11
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..11)::11
+            CSharpStatement - [0..11)::11
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..11)::10
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..11)::9
+                        MarkupBlock - [2..11)::9
+                            MarkupTagBlock - [2..11)::9 - [<!text /}]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..10)::6 - [text /] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[text];
+                                    Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                MarkupMinimizedAttributeBlock - [10..11)::1 - [}]
+                                    MarkupTextLiteral - [10..11)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[}];
+                    RazorMetaCode - [11..11)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.stree.txt
index 35b6ea0043..331006644d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock3.stree.txt
@@ -1,23 +1,32 @@
-Markup block - Gen<None> - 16 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 16 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 14 - (2:0,2)
-            Tag block - Gen<None> - 14 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[text];
-                Markup block - Gen<Attr:class, class=@(8:0,8),@(16:0,16)> - 8 - (8:0,8)
-                    Markup span - Gen<None> - [ class=] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:3
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                    Markup span - Gen<LitAttr:@(15:0,15)> - [}] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-                        HtmlTokenType.Text;[}];
+RazorDocument - [0..16)::16 - [@{<!text class=}]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            CSharpStatement - [0..16)::16
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..16)::15
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..16)::14
+                        MarkupBlock - [2..16)::14
+                            MarkupTagBlock - [2..16)::14 - [<!text class=}]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..8)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[text];
+                                MarkupAttributeBlock - [8..16)::8 - [ class=}]
+                                    MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    GenericBlock - [15..16)::1
+                                        MarkupLiteralAttributeValue - [15..16)::1 - [}]
+                                            MarkupTextLiteral - [15..16)::1 - [}] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                Text;[}];
+                    RazorMetaCode - [16..16)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.stree.txt
index 72aa4c34a5..cfb0682b6f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock4.stree.txt
@@ -1,24 +1,34 @@
-Markup block - Gen<None> - 20 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 20 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 18 - (2:0,2)
-            Tag block - Gen<None> - 18 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[text];
-                Markup block - Gen<Attr:class, class="@(8:0,8),@(20:0,20)> - 12 - (8:0,8)
-                    Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.DoubleQuote;["];
-                    Markup span - Gen<LitAttr:@(16:0,16)> - [btn}] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                        HtmlTokenType.Text;[btn}];
+RazorDocument - [0..20)::20 - [@{<!text class="btn}]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..20)::20
+            CSharpStatement - [0..20)::20
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..20)::19
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..20)::18
+                        MarkupBlock - [2..20)::18
+                            MarkupTagBlock - [2..20)::18 - [<!text class="btn}]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..8)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[text];
+                                MarkupAttributeBlock - [8..20)::12 - [ class="btn}]
+                                    MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                    GenericBlock - [16..20)::4
+                                        MarkupLiteralAttributeValue - [16..20)::4 - [btn}]
+                                            MarkupTextLiteral - [16..20)::4 - [btn}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn}];
+                    RazorMetaCode - [20..20)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.stree.txt
index d17d63a064..72c4f51c25 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock5.stree.txt
@@ -1,29 +1,39 @@
-Markup block - Gen<None> - 21 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 21 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 19 - (2:0,2)
-            Tag block - Gen<None> - 19 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[text];
-                Markup block - Gen<Attr:class, class="@(8:0,8),"@(19:0,19)> - 12 - (8:0,8)
-                    Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.DoubleQuote;["];
-                    Markup span - Gen<LitAttr:@(16:0,16)> - [btn] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-                    Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:1
-                        HtmlTokenType.DoubleQuote;["];
-                Markup block - Gen<None> - 1 - (20:0,20)
-                    Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-                        HtmlTokenType.Text;[}];
+RazorDocument - [0..21)::21 - [@{<!text class="btn"}]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            CSharpStatement - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..21)::20
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..21)::19
+                        MarkupBlock - [2..21)::19
+                            MarkupTagBlock - [2..21)::19 - [<!text class="btn"}]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..8)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[text];
+                                MarkupAttributeBlock - [8..20)::12 - [ class="btn"]
+                                    MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                    GenericBlock - [16..19)::3
+                                        MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                                            MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn];
+                                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                MarkupMinimizedAttributeBlock - [20..21)::1 - [}]
+                                    MarkupTextLiteral - [20..21)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[}];
+                    RazorMetaCode - [21..21)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.stree.txt
index 3b2fb45793..35141aa096 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptForIncompleteTextTagInCSharpBlock6.stree.txt
@@ -1,32 +1,42 @@
-Markup block - Gen<None> - 23 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 23 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 21 - (2:0,2)
-            Tag block - Gen<None> - 21 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [text] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[text];
-                Markup block - Gen<Attr:class, class="@(8:0,8),"@(19:0,19)> - 12 - (8:0,8)
-                    Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.DoubleQuote;["];
-                    Markup span - Gen<LitAttr:@(16:0,16)> - [btn] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-                    Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:1
-                        HtmlTokenType.DoubleQuote;["];
-                Markup span - Gen<Markup> - [ /] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.ForwardSlash;[/];
-                Markup block - Gen<None> - 1 - (22:0,22)
-                    Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-                        HtmlTokenType.Text;[}];
+RazorDocument - [0..23)::23 - [@{<!text class="btn" /}]
+    MarkupBlock - [0..23)::23
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..23)::23
+            CSharpStatement - [0..23)::23
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..23)::22
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..23)::21
+                        MarkupBlock - [2..23)::21
+                            MarkupTagBlock - [2..23)::21 - [<!text class="btn" /}]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..8)::4 - [text] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[text];
+                                MarkupAttributeBlock - [8..20)::12 - [ class="btn"]
+                                    MarkupTextLiteral - [8..9)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [9..14)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                    GenericBlock - [16..19)::3
+                                        MarkupLiteralAttributeValue - [16..19)::3 - [btn]
+                                            MarkupTextLiteral - [16..19)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn];
+                                    MarkupTextLiteral - [19..20)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                MarkupTextLiteral - [20..22)::2 - [ /] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Whitespace;[ ];
+                                    ForwardSlash;[/];
+                                MarkupMinimizedAttributeBlock - [22..23)::1 - [}]
+                                    MarkupTextLiteral - [22..23)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[}];
+                    RazorMetaCode - [23..23)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.stree.txt
index d43333af02..726257ea8e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData1.stree.txt
@@ -1,30 +1,40 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 19 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 17 - (2:0,2)
-            Tag block - Gen<None> - 16 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[p];
-                Markup block - Gen<Attr:class, class="@(5:0,5),"@(16:0,16)> - 12 - (5:0,5)
-                    Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.DoubleQuote;["];
-                    Markup span - Gen<LitAttr:@(13:0,13)> - [btn] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-                    Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                        HtmlTokenType.DoubleQuote;["];
-                Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:1
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
-                HtmlTokenType.Text;[}];
+RazorDocument - [0..19)::19 - [@{<!p class="btn">}]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            CSharpStatement - [0..19)::19
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..19)::18
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..19)::17
+                        MarkupBlock - [2..19)::17
+                            MarkupTagBlock - [2..18)::16 - [<!p class="btn">]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..5)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[p];
+                                MarkupAttributeBlock - [5..17)::12 - [ class="btn"]
+                                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                    GenericBlock - [13..16)::3
+                                        MarkupLiteralAttributeValue - [13..16)::3 - [btn]
+                                            MarkupTextLiteral - [13..16)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn];
+                                    MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                MarkupTextLiteral - [17..18)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [18..19)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[}];
+                    RazorMetaCode - [19..19)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData2.stree.txt
index b0d7eda4a0..ec8de2b664 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData2.stree.txt
@@ -1,43 +1,51 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 24 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 21 - (2:0,2)
-            Tag block - Gen<None> - 16 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[p];
-                Markup block - Gen<Attr:class, class="@(5:0,5),"@(16:0,16)> - 12 - (5:0,5)
-                    Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.DoubleQuote;["];
-                    Markup span - Gen<LitAttr:@(13:0,13)> - [btn] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-                    Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                        HtmlTokenType.DoubleQuote;["];
-                Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:1
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 5 - (18:0,18)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:2
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..24)::24 - [@{<!p class="btn"></!p>}]
+    MarkupBlock - [0..24)::24
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..24)::24
+            CSharpStatement - [0..24)::24
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..24)::23
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..23)::21
+                        MarkupBlock - [2..23)::21
+                            MarkupTagBlock - [2..18)::16 - [<!p class="btn">]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..5)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[p];
+                                MarkupAttributeBlock - [5..17)::12 - [ class="btn"]
+                                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                    GenericBlock - [13..16)::3
+                                        MarkupLiteralAttributeValue - [13..16)::3 - [btn]
+                                            MarkupTextLiteral - [13..16)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn];
+                                    MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                MarkupTextLiteral - [17..18)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [18..23)::5 - [</!p>]
+                                MarkupTextLiteral - [18..20)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [21..23)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [23..23)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [24..24)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData3.stree.txt
index 52222c1743..70c21e5b7f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData3.stree.txt
@@ -1,49 +1,57 @@
-Markup block - Gen<None> - 41 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 41 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 38 - (2:0,2)
-            Tag block - Gen<None> - 16 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[p];
-                Markup block - Gen<Attr:class, class="@(5:0,5),"@(16:0,16)> - 12 - (5:0,5)
-                    Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.DoubleQuote;["];
-                    Markup span - Gen<LitAttr:@(13:0,13)> - [btn] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-                    Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                        HtmlTokenType.DoubleQuote;["];
-                Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:1
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [words with spaces] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:5
-                HtmlTokenType.Text;[words];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[with];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[spaces];
-            Tag block - Gen<None> - 5 - (35:0,35)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (37:0,37) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:2
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..41)::41 - [@{<!p class="btn">words with spaces</!p>}]
+    MarkupBlock - [0..41)::41
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..41)::41
+            CSharpStatement - [0..41)::41
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..41)::40
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..40)::38
+                        MarkupBlock - [2..40)::38
+                            MarkupTagBlock - [2..18)::16 - [<!p class="btn">]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..5)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[p];
+                                MarkupAttributeBlock - [5..17)::12 - [ class="btn"]
+                                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                    GenericBlock - [13..16)::3
+                                        MarkupLiteralAttributeValue - [13..16)::3 - [btn]
+                                            MarkupTextLiteral - [13..16)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn];
+                                    MarkupTextLiteral - [16..17)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        DoubleQuote;["];
+                                MarkupTextLiteral - [17..18)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [18..35)::17 - [words with spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[words];
+                                Whitespace;[ ];
+                                Text;[with];
+                                Whitespace;[ ];
+                                Text;[spaces];
+                            MarkupTagBlock - [35..40)::5 - [</!p>]
+                                MarkupTextLiteral - [35..37)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [37..38)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [38..40)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [40..40)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [40..41)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [41..41)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData4.stree.txt
index fd89639bd4..daf3730423 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData4.stree.txt
@@ -1,53 +1,66 @@
-Markup block - Gen<None> - 41 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 41 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 38 - (2:0,2)
-            Tag block - Gen<None> - 33 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[p];
-                Markup block - Gen<Attr:class, class='@(5:0,5),'@(22:0,22)> - 18 - (5:0,5)
-                    Markup span - Gen<None> - [ class='] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.SingleQuote;['];
-                    Markup span - Gen<LitAttr:@(13:0,13)> - [btn1] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                        HtmlTokenType.Text;[btn1];
-                    Markup span - Gen<LitAttr: @(17:0,17)> - [ btn2] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:2
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[btn2];
-                    Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
-                        HtmlTokenType.SingleQuote;['];
-                Markup block - Gen<Attr:class2, class2=@(23:0,23),@(34:0,34)> - 11 - (23:0,23)
-                    Markup span - Gen<None> - [ class2=] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:3
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class2];
-                        HtmlTokenType.Equals;[=];
-                    Markup span - Gen<LitAttr:@(31:0,31)> - [btn] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-                        HtmlTokenType.Text;[btn];
-                Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (34:0,34) - Tokens:1
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 5 - (35:0,35)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (37:0,37) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:2
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..41)::41 - [@{<!p class='btn1 btn2' class2=btn></!p>}]
+    MarkupBlock - [0..41)::41
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..41)::41
+            CSharpStatement - [0..41)::41
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..41)::40
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..40)::38
+                        MarkupBlock - [2..40)::38
+                            MarkupTagBlock - [2..35)::33 - [<!p class='btn1 btn2' class2=btn>]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..5)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[p];
+                                MarkupAttributeBlock - [5..23)::18 - [ class='btn1 btn2']
+                                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        SingleQuote;['];
+                                    GenericBlock - [13..22)::9
+                                        MarkupLiteralAttributeValue - [13..17)::4 - [btn1]
+                                            MarkupTextLiteral - [13..17)::4 - [btn1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn1];
+                                        MarkupLiteralAttributeValue - [17..22)::5 - [ btn2]
+                                            MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                            MarkupTextLiteral - [18..22)::4 - [btn2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn2];
+                                    MarkupTextLiteral - [22..23)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        SingleQuote;['];
+                                MarkupAttributeBlock - [23..34)::11 - [ class2=btn]
+                                    MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [24..30)::6 - [class2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class2];
+                                    Equals;[=];
+                                    GenericBlock - [31..34)::3
+                                        MarkupLiteralAttributeValue - [31..34)::3 - [btn]
+                                            MarkupTextLiteral - [31..34)::3 - [btn] - Gen<None> - SpanEditHandler;Accepts:Any
+                                                Text;[btn];
+                                MarkupTextLiteral - [34..35)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [35..40)::5 - [</!p>]
+                                MarkupTextLiteral - [35..37)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [37..38)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [38..40)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [40..40)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [40..41)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [41..41)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.cspans.txt
index b84f524679..a539659df7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.cspans.txt
@@ -8,7 +8,7 @@ Markup span at (5:0,5 [8] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [32]
 Markup span at (13:0,13 [4] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [32] )
 Markup span at (17:0,17 [1] ) (Accepts:Any) - Parent: Markup block at (17:0,17 [14] )
 Transition span at (18:0,18 [1] ) (Accepts:None) - Parent: Expression block at (18:0,18 [13] )
-Code span at (19:0,19 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (18:0,18 [13] )
+Code span at (19:0,19 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (18:0,18 [13] )
 Markup span at (31:0,31 [5] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [32] )
 Markup span at (36:0,36 [1] ) (Accepts:Any) - Parent: Markup block at (5:0,5 [32] )
 Markup span at (37:0,37 [1] ) (Accepts:None) - Parent: Tag block at (2:0,2 [36] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.stree.txt
index dd8d0acef8..025747eb00 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithAttributeData5.stree.txt
@@ -1,56 +1,70 @@
-Markup block - Gen<None> - 44 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 44 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 41 - (2:0,2)
-            Tag block - Gen<None> - 36 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                    HtmlTokenType.Text;[p];
-                Markup block - Gen<Attr:class, class='@(5:0,5),'@(36:0,36)> - 32 - (5:0,5)
-                    Markup span - Gen<None> - [ class='] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:4
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[class];
-                        HtmlTokenType.Equals;[=];
-                        HtmlTokenType.SingleQuote;['];
-                    Markup span - Gen<LitAttr:@(13:0,13)> - [btn1] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                        HtmlTokenType.Text;[btn1];
-                    Markup block - Gen<DynAttr: @(17:0,17)> - 14 - (17:0,17)
-                        Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-                            HtmlTokenType.WhiteSpace;[ ];
-                        Expression block - Gen<Expr> - 13 - (18:0,18)
-                            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:1
-                                CSharpTokenType.Transition;[@];
-                            Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (19:0,19) - Tokens:3
-                                CSharpTokenType.Identifier;[DateTime];
-                                CSharpTokenType.Dot;[.];
-                                CSharpTokenType.Identifier;[Now];
-                    Markup span - Gen<LitAttr: @(31:0,31)> - [ btn2] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:2
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[btn2];
-                    Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:1
-                        HtmlTokenType.SingleQuote;['];
-                Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (37:0,37) - Tokens:1
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 5 - (38:0,38)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (38:0,38) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (41:0,41) - Tokens:2
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (43:0,43) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (44:0,44) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..44)::44 - [@{<!p class='btn1 @DateTime.Now btn2'></!p>}]
+    MarkupBlock - [0..44)::44
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..44)::44
+            CSharpStatement - [0..44)::44
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..44)::43
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..43)::41
+                        MarkupBlock - [2..43)::41
+                            MarkupTagBlock - [2..38)::36 - [<!p class='btn1 @DateTime.Now btn2'>]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..5)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[p];
+                                MarkupAttributeBlock - [5..37)::32 - [ class='btn1 @DateTime.Now btn2']
+                                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Whitespace;[ ];
+                                    MarkupTextLiteral - [6..11)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[class];
+                                    Equals;[=];
+                                    MarkupTextLiteral - [12..13)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        SingleQuote;['];
+                                    GenericBlock - [13..36)::23
+                                        MarkupLiteralAttributeValue - [13..17)::4 - [btn1]
+                                            MarkupTextLiteral - [13..17)::4 - [btn1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn1];
+                                        MarkupDynamicAttributeValue - [17..31)::14 - [ @DateTime.Now]
+                                            MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                            GenericBlock - [18..31)::13
+                                                CSharpCodeBlock - [18..31)::13
+                                                    CSharpImplicitExpression - [18..31)::13
+                                                        CSharpTransition - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                                            Transition;[@];
+                                                        CSharpImplicitExpressionBody - [19..31)::12
+                                                            CSharpCodeBlock - [19..31)::12
+                                                                CSharpExpressionLiteral - [19..31)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                                    Identifier;[DateTime];
+                                                                    Dot;[.];
+                                                                    Identifier;[Now];
+                                        MarkupLiteralAttributeValue - [31..36)::5 - [ btn2]
+                                            MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Whitespace;[ ];
+                                            MarkupTextLiteral - [32..36)::4 - [btn2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                                Text;[btn2];
+                                    MarkupTextLiteral - [36..37)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                                        SingleQuote;['];
+                                MarkupTextLiteral - [37..38)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [38..43)::5 - [</!p>]
+                                MarkupTextLiteral - [38..40)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [40..41)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [41..43)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [43..43)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [43..44)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [44..44)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData1.stree.txt
index 99414e9377..50b192a1b1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData1.stree.txt
@@ -1,19 +1,25 @@
-Markup block - Gen<None> - 7 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 7 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 5 - (2:0,2)
-            Tag block - Gen<None> - 4 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:2
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:1
-                HtmlTokenType.Text;[}];
+RazorDocument - [0..7)::7 - [@{<!p>}]
+    MarkupBlock - [0..7)::7
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..7)::7
+            CSharpStatement - [0..7)::7
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..7)::6
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..7)::5
+                        MarkupBlock - [2..7)::5
+                            MarkupTagBlock - [2..6)::4 - [<!p>]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..6)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [6..7)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[}];
+                    RazorMetaCode - [7..7)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.stree.txt
index 96345ffe51..1618647cbe 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData10.stree.txt
@@ -1,33 +1,41 @@
-Markup block - Gen<None> - 25 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 25 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 13 - (2:0,2)
-            Tag block - Gen<TagHelper> - 13 - (2:0,2) - strong - strongtaghelper
-                StartTagAndEndTag - <strong>
-                Tag block - Gen<None> - 5 - (10:0,10)
-                    Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:2
-                        HtmlTokenType.OpenAngle;[<];
-                        HtmlTokenType.ForwardSlash;[/];
-                    MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-                        HtmlTokenType.Bang;[!];
-                    Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:2
-                        HtmlTokenType.Text;[p];
-                        HtmlTokenType.CloseAngle;[>];
-        Markup block - Gen<None> - 9 - (15:0,15)
-            Tag block - Gen<None> - 9 - (15:0,15)
-                Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[strong];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..25)::25 - [@{<strong></!p></strong>}]
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..25)::25
+            CSharpStatement - [0..25)::25
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..25)::24
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..24)::22
+                        MarkupBlock - [2..15)::13
+                            MarkupTagHelperElement - [2..15)::13 - strong[StartTagAndEndTag] - strongtaghelper
+                                MarkupTagHelperStartTag - [2..10)::8
+                                    MarkupTextLiteral - [2..10)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[strong];
+                                        CloseAngle;[>];
+                                MarkupTagBlock - [10..15)::5 - [</!p>]
+                                    MarkupTextLiteral - [10..12)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                    RazorMetaCode - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Bang;[!];
+                                    MarkupTextLiteral - [13..15)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        MarkupBlock - [15..24)::9
+                            MarkupTagBlock - [15..24)::9 - [</strong>]
+                                MarkupTextLiteral - [15..24)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[strong];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [24..24)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [25..25)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData11.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData11.stree.txt
index 64dae19a93..687be1c9a8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData11.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData11.stree.txt
@@ -1,35 +1,49 @@
-Markup block - Gen<None> - 29 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 29 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 17 - (2:0,2)
-            Tag block - Gen<TagHelper> - 17 - (2:0,2) - strong - strongtaghelper
-                StartTagAndEndTag - <strong> ... </strong>
-        Markup block - Gen<None> - 9 - (19:0,19)
-            Tag block - Gen<None> - 4 - (19:0,19)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:2
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 5 - (23:0,23)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (26:0,26) - Tokens:2
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (28:0,28) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..29)::29 - [@{<strong></strong><!p></!p>}]
+    MarkupBlock - [0..29)::29
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..29)::29
+            CSharpStatement - [0..29)::29
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..29)::28
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..28)::26
+                        MarkupBlock - [2..19)::17
+                            MarkupTagHelperElement - [2..19)::17 - strong[StartTagAndEndTag] - strongtaghelper
+                                MarkupTagHelperStartTag - [2..10)::8
+                                    MarkupTextLiteral - [2..10)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[strong];
+                                        CloseAngle;[>];
+                                MarkupTagHelperEndTag - [10..19)::9
+                                    MarkupTextLiteral - [10..19)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[strong];
+                                        CloseAngle;[>];
+                        MarkupBlock - [19..28)::9
+                            MarkupTagBlock - [19..23)::4 - [<!p>]
+                                MarkupTextLiteral - [19..20)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [21..23)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [23..28)::5 - [</!p>]
+                                MarkupTextLiteral - [23..25)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [25..26)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [26..28)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [28..28)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [28..29)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [29..29)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.stree.txt
index aaf040b611..9794d12749 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData12.stree.txt
@@ -1,53 +1,65 @@
-Markup block - Gen<None> - 42 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 42 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 21 - (2:0,2)
-            Tag block - Gen<TagHelper> - 21 - (2:0,2) - p - ptaghelper
-                StartTagAndEndTag - <p>
-                Tag block - Gen<TagHelper> - 18 - (5:0,5) - strong - strongtaghelper
-                    StartTagAndEndTag - <strong>
-                    Tag block - Gen<None> - 10 - (13:0,13)
-                        Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:2
-                            HtmlTokenType.OpenAngle;[<];
-                            HtmlTokenType.ForwardSlash;[/];
-                        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-                            HtmlTokenType.Bang;[!];
-                        Markup span - Gen<Markup> - [strong>] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:2
-                            HtmlTokenType.Text;[strong];
-                            HtmlTokenType.CloseAngle;[>];
-        Markup block - Gen<None> - 13 - (23:0,23)
-            Tag block - Gen<None> - 4 - (23:0,23)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:2
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 9 - (27:0,27)
-                Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[strong];
-                    HtmlTokenType.CloseAngle;[>];
-        Markup block - Gen<None> - 5 - (36:0,36)
-            Tag block - Gen<None> - 5 - (36:0,36)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (39:0,39) - Tokens:2
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (41:0,41) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (42:0,42) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..42)::42 - [@{<p><strong></!strong><!p></strong></!p>}]
+    MarkupBlock - [0..42)::42
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..42)::42
+            CSharpStatement - [0..42)::42
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..42)::41
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..41)::39
+                        MarkupBlock - [2..23)::21
+                            MarkupTagHelperElement - [2..23)::21 - p[StartTagAndEndTag] - ptaghelper
+                                MarkupTagHelperStartTag - [2..5)::3
+                                    MarkupTextLiteral - [2..5)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                MarkupTagHelperElement - [5..23)::18 - strong[StartTagAndEndTag] - strongtaghelper
+                                    MarkupTagHelperStartTag - [5..13)::8
+                                        MarkupTextLiteral - [5..13)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            Text;[strong];
+                                            CloseAngle;[>];
+                                    MarkupTagBlock - [13..23)::10 - [</!strong>]
+                                        MarkupTextLiteral - [13..15)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                            OpenAngle;[<];
+                                            ForwardSlash;[/];
+                                        RazorMetaCode - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Bang;[!];
+                                        MarkupTextLiteral - [16..23)::7 - [strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            Text;[strong];
+                                            CloseAngle;[>];
+                        MarkupBlock - [23..36)::13
+                            MarkupTagBlock - [23..27)::4 - [<!p>]
+                                MarkupTextLiteral - [23..24)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [25..27)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [27..36)::9 - [</strong>]
+                                MarkupTextLiteral - [27..36)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[strong];
+                                    CloseAngle;[>];
+                        MarkupBlock - [36..41)::5
+                            MarkupTagBlock - [36..41)::5 - [</!p>]
+                                MarkupTextLiteral - [36..38)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [38..39)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [39..41)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [41..41)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [41..42)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [42..42)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData2.stree.txt
index c530ade8df..b77794b95c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData2.stree.txt
@@ -1,24 +1,28 @@
-Markup block - Gen<None> - 8 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 8 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 5 - (2:0,2)
-            Tag block - Gen<None> - 5 - (2:0,2)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:2
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (7:0,7) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..8)::8 - [@{</!p>}]
+    MarkupBlock - [0..8)::8
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            CSharpStatement - [0..8)::8
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..8)::7
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..7)::5
+                        MarkupBlock - [2..7)::5
+                            MarkupTagBlock - [2..7)::5 - [</!p>]
+                                MarkupTextLiteral - [2..4)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [5..7)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [7..7)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [7..8)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [8..8)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData3.stree.txt
index 6662bb95c9..c8c84f6492 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData3.stree.txt
@@ -1,32 +1,36 @@
-Markup block - Gen<None> - 12 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 12 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 9 - (2:0,2)
-            Tag block - Gen<None> - 4 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:2
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 5 - (6:0,6)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:2
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (11:0,11) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..12)::12 - [@{<!p></!p>}]
+    MarkupBlock - [0..12)::12
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..12)::12
+            CSharpStatement - [0..12)::12
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..12)::11
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..11)::9
+                        MarkupBlock - [2..11)::9
+                            MarkupTagBlock - [2..6)::4 - [<!p>]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..6)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [6..11)::5 - [</!p>]
+                                MarkupTextLiteral - [6..8)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [9..11)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [11..11)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [12..12)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData4.stree.txt
index 16c7bfa795..bf95348d72 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData4.stree.txt
@@ -1,38 +1,42 @@
-Markup block - Gen<None> - 28 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 28 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 25 - (2:0,2)
-            Tag block - Gen<None> - 4 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:2
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [words and spaces] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:5
-                HtmlTokenType.Text;[words];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[and];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[spaces];
-            Tag block - Gen<None> - 5 - (22:0,22)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:2
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..28)::28 - [@{<!p>words and spaces</!p>}]
+    MarkupBlock - [0..28)::28
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..28)::28
+            CSharpStatement - [0..28)::28
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..28)::27
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..27)::25
+                        MarkupBlock - [2..27)::25
+                            MarkupTagBlock - [2..6)::4 - [<!p>]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..6)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [6..22)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[words];
+                                Whitespace;[ ];
+                                Text;[and];
+                                Whitespace;[ ];
+                                Text;[spaces];
+                            MarkupTagBlock - [22..27)::5 - [</!p>]
+                                MarkupTextLiteral - [22..24)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [25..27)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [27..27)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [27..28)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [28..28)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData5.stree.txt
index e0c6701892..dc8aabd048 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData5.stree.txt
@@ -1,29 +1,33 @@
-Markup block - Gen<None> - 11 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 11 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 8 - (2:0,2)
-            Tag block - Gen<None> - 4 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:2
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 4 - (6:0,6)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..11)::11 - [@{<!p></p>}]
+    MarkupBlock - [0..11)::11
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..11)::11
+            CSharpStatement - [0..11)::11
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..11)::10
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..10)::8
+                        MarkupBlock - [2..10)::8
+                            MarkupTagBlock - [2..6)::4 - [<!p>]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..6)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [6..10)::4 - [</p>]
+                                MarkupTextLiteral - [6..10)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [10..10)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [11..11)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.stree.txt
index 5145e35c2a..530c8a0c56 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData6.stree.txt
@@ -1,26 +1,34 @@
-Markup block - Gen<None> - 11 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 11 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 8 - (2:0,2)
-            Tag block - Gen<TagHelper> - 8 - (2:0,2) - p - ptaghelper
-                StartTagAndEndTag - <p>
-                Tag block - Gen<None> - 5 - (5:0,5)
-                    Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:2
-                        HtmlTokenType.OpenAngle;[<];
-                        HtmlTokenType.ForwardSlash;[/];
-                    MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (7:0,7) - Tokens:1
-                        HtmlTokenType.Bang;[!];
-                    Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:2
-                        HtmlTokenType.Text;[p];
-                        HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..11)::11 - [@{<p></!p>}]
+    MarkupBlock - [0..11)::11
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..11)::11
+            CSharpStatement - [0..11)::11
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..11)::10
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..10)::8
+                        MarkupBlock - [2..10)::8
+                            MarkupTagHelperElement - [2..10)::8 - p[StartTagAndEndTag] - ptaghelper
+                                MarkupTagHelperStartTag - [2..5)::3
+                                    MarkupTextLiteral - [2..5)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                MarkupTagBlock - [5..10)::5 - [</!p>]
+                                    MarkupTextLiteral - [5..7)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                    RazorMetaCode - [7..8)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Bang;[!];
+                                    MarkupTextLiteral - [8..10)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [10..10)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [11..11)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData7.stree.txt
index e54d0df5bd..c278e58160 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData7.stree.txt
@@ -1,34 +1,48 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 19 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 16 - (2:0,2)
-            Tag block - Gen<TagHelper> - 16 - (2:0,2) - p - ptaghelper
-                StartTagAndEndTag - <p> ... </p>
-                Tag block - Gen<None> - 4 - (5:0,5)
-                    Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:1
-                        HtmlTokenType.OpenAngle;[<];
-                    MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:1
-                        HtmlTokenType.Bang;[!];
-                    Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (7:0,7) - Tokens:2
-                        HtmlTokenType.Text;[p];
-                        HtmlTokenType.CloseAngle;[>];
-                Tag block - Gen<None> - 5 - (9:0,9)
-                    Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:2
-                        HtmlTokenType.OpenAngle;[<];
-                        HtmlTokenType.ForwardSlash;[/];
-                    MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (11:0,11) - Tokens:1
-                        HtmlTokenType.Bang;[!];
-                    Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:2
-                        HtmlTokenType.Text;[p];
-                        HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..19)::19 - [@{<p><!p></!p></p>}]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..19)::19
+            CSharpStatement - [0..19)::19
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..19)::18
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..18)::16
+                        MarkupBlock - [2..18)::16
+                            MarkupTagHelperElement - [2..18)::16 - p[StartTagAndEndTag] - ptaghelper
+                                MarkupTagHelperStartTag - [2..5)::3
+                                    MarkupTextLiteral - [2..5)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                MarkupTagBlock - [5..9)::4 - [<!p>]
+                                    MarkupTextLiteral - [5..6)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                    RazorMetaCode - [6..7)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Bang;[!];
+                                    MarkupTextLiteral - [7..9)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                MarkupTagBlock - [9..14)::5 - [</!p>]
+                                    MarkupTextLiteral - [9..11)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                    RazorMetaCode - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Bang;[!];
+                                    MarkupTextLiteral - [12..14)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                MarkupTagHelperEndTag - [14..18)::4
+                                    MarkupTextLiteral - [14..18)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [18..18)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [19..19)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.stree.txt
index 8960c8158e..2a1f08d6e9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData8.stree.txt
@@ -1,30 +1,40 @@
-Markup block - Gen<None> - 15 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 15 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 13 - (2:0,2)
-            Tag block - Gen<TagHelper> - 13 - (2:0,2) - p - ptaghelper
-                StartTagAndEndTag - <p>
-                Tag block - Gen<None> - 4 - (5:0,5)
-                    Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:1
-                        HtmlTokenType.OpenAngle;[<];
-                    MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:1
-                        HtmlTokenType.Bang;[!];
-                    Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (7:0,7) - Tokens:2
-                        HtmlTokenType.Text;[p];
-                        HtmlTokenType.CloseAngle;[>];
-                Tag block - Gen<None> - 5 - (9:0,9)
-                    Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:2
-                        HtmlTokenType.OpenAngle;[<];
-                        HtmlTokenType.ForwardSlash;[/];
-                    MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (11:0,11) - Tokens:1
-                        HtmlTokenType.Bang;[!];
-                    Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:2
-                        HtmlTokenType.Text;[p];
-                        HtmlTokenType.CloseAngle;[>];
-                Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                    HtmlTokenType.Text;[}];
+RazorDocument - [0..15)::15 - [@{<p><!p></!p>}]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..15)::15
+            CSharpStatement - [0..15)::15
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..15)::14
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..15)::13
+                        MarkupBlock - [2..15)::13
+                            MarkupTagHelperElement - [2..15)::13 - p[StartTagAndEndTag] - ptaghelper
+                                MarkupTagHelperStartTag - [2..5)::3
+                                    MarkupTextLiteral - [2..5)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                MarkupTagBlock - [5..9)::4 - [<!p>]
+                                    MarkupTextLiteral - [5..6)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                    RazorMetaCode - [6..7)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Bang;[!];
+                                    MarkupTextLiteral - [7..9)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                MarkupTagBlock - [9..14)::5 - [</!p>]
+                                    MarkupTextLiteral - [9..11)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                    RazorMetaCode - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Bang;[!];
+                                    MarkupTextLiteral - [12..14)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                MarkupTextLiteral - [14..15)::1 - [}] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[}];
+                    RazorMetaCode - [15..15)::0 - Gen<None> - SpanEditHandler;Accepts:Any
+                        RightBrace;[<Missing>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData9.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData9.stree.txt
index eb74e865c1..334df5c465 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData9.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutCSharp_WithBlockData9.stree.txt
@@ -1,39 +1,43 @@
-Markup block - Gen<None> - 16 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 16 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 9 - (2:0,2)
-            Tag block - Gen<None> - 4 - (2:0,2)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:2
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 5 - (6:0,6)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:2
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-        Markup block - Gen<None> - 4 - (11:0,11)
-            Tag block - Gen<None> - 4 - (11:0,11)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (11:0,11) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..16)::16 - [@{<!p></!p></p>}]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            CSharpStatement - [0..16)::16
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..16)::15
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..15)::13
+                        MarkupBlock - [2..11)::9
+                            MarkupTagBlock - [2..6)::4 - [<!p>]
+                                MarkupTextLiteral - [2..3)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                RazorMetaCode - [3..4)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [4..6)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[p];
+                                    CloseAngle;[>];
+                            MarkupTagBlock - [6..11)::5 - [</!p>]
+                                MarkupTextLiteral - [6..8)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                RazorMetaCode - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Bang;[!];
+                                MarkupTextLiteral - [9..11)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        MarkupBlock - [11..15)::4
+                            MarkupTagBlock - [11..15)::4 - [</p>]
+                                MarkupTextLiteral - [11..15)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[p];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [15..15)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [16..16)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData1.stree.txt
index e462b024e0..7036ebb7e9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData1.stree.txt
@@ -1,20 +1,25 @@
-Markup block - Gen<None> - 16 - (0:0,0)
-    Tag block - Gen<None> - 16 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-            HtmlTokenType.Text;[p];
-        Markup block - Gen<Attr:class, class="@(3:0,3),"@(14:0,14)> - 12 - (3:0,3)
-            Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[class];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<LitAttr:@(11:0,11)> - [btn] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-                HtmlTokenType.Text;[btn];
-            Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.DoubleQuote;["];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..16)::16 - [<!p class="btn">]
+    MarkupBlock - [0..16)::16
+        MarkupTagBlock - [0..16)::16 - [<!p class="btn">]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [2..3)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+            MarkupAttributeBlock - [3..15)::12 - [ class="btn"]
+                MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[class];
+                Equals;[=];
+                MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+                GenericBlock - [11..14)::3
+                    MarkupLiteralAttributeValue - [11..14)::3 - [btn]
+                        MarkupTextLiteral - [11..14)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[btn];
+                MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+            MarkupTextLiteral - [15..16)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData2.stree.txt
index 2e9826beb7..c7c25082ea 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData2.stree.txt
@@ -1,29 +1,34 @@
-Markup block - Gen<None> - 21 - (0:0,0)
-    Tag block - Gen<None> - 16 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-            HtmlTokenType.Text;[p];
-        Markup block - Gen<Attr:class, class="@(3:0,3),"@(14:0,14)> - 12 - (3:0,3)
-            Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[class];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<LitAttr:@(11:0,11)> - [btn] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-                HtmlTokenType.Text;[btn];
-            Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.DoubleQuote;["];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 5 - (16:0,16)
-        Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:2
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..21)::21 - [<!p class="btn"></!p>]
+    MarkupBlock - [0..21)::21
+        MarkupTagBlock - [0..16)::16 - [<!p class="btn">]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [2..3)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+            MarkupAttributeBlock - [3..15)::12 - [ class="btn"]
+                MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[class];
+                Equals;[=];
+                MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+                GenericBlock - [11..14)::3
+                    MarkupLiteralAttributeValue - [11..14)::3 - [btn]
+                        MarkupTextLiteral - [11..14)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[btn];
+                MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+            MarkupTextLiteral - [15..16)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+        MarkupTagBlock - [16..21)::5 - [</!p>]
+            MarkupTextLiteral - [16..18)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+            RazorMetaCode - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [19..21)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData3.stree.txt
index 89bdbd9827..b9a298b12d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData3.stree.txt
@@ -1,35 +1,40 @@
-Markup block - Gen<None> - 37 - (0:0,0)
-    Tag block - Gen<None> - 16 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-            HtmlTokenType.Text;[p];
-        Markup block - Gen<Attr:class, class="@(3:0,3),"@(14:0,14)> - 12 - (3:0,3)
-            Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[class];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<LitAttr:@(11:0,11)> - [btn] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-                HtmlTokenType.Text;[btn];
-            Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-                HtmlTokenType.DoubleQuote;["];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [words and spaces] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:5
-        HtmlTokenType.Text;[words];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[and];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[spaces];
-    Tag block - Gen<None> - 5 - (32:0,32)
-        Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (32:0,32) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (34:0,34) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:2
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..37)::37 - [<!p class="btn">words and spaces</!p>]
+    MarkupBlock - [0..37)::37
+        MarkupTagBlock - [0..16)::16 - [<!p class="btn">]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [2..3)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+            MarkupAttributeBlock - [3..15)::12 - [ class="btn"]
+                MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[class];
+                Equals;[=];
+                MarkupTextLiteral - [10..11)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+                GenericBlock - [11..14)::3
+                    MarkupLiteralAttributeValue - [11..14)::3 - [btn]
+                        MarkupTextLiteral - [11..14)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[btn];
+                MarkupTextLiteral - [14..15)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+            MarkupTextLiteral - [15..16)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+        MarkupTextLiteral - [16..32)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[words];
+            Whitespace;[ ];
+            Text;[and];
+            Whitespace;[ ];
+            Text;[spaces];
+        MarkupTagBlock - [32..37)::5 - [</!p>]
+            MarkupTextLiteral - [32..34)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+            RazorMetaCode - [34..35)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [35..37)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData4.stree.txt
index b9ea21a3ad..d2f267594a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData4.stree.txt
@@ -1,39 +1,49 @@
-Markup block - Gen<None> - 38 - (0:0,0)
-    Tag block - Gen<None> - 33 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-            HtmlTokenType.Text;[p];
-        Markup block - Gen<Attr:class, class='@(3:0,3),'@(20:0,20)> - 18 - (3:0,3)
-            Markup span - Gen<None> - [ class='] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[class];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(11:0,11)> - [btn1] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-                HtmlTokenType.Text;[btn1];
-            Markup span - Gen<LitAttr: @(15:0,15)> - [ btn2] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:2
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[btn2];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:class2, class2=@(21:0,21),@(32:0,32)> - 11 - (21:0,21)
-            Markup span - Gen<None> - [ class2=] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:3
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[class2];
-                HtmlTokenType.Equals;[=];
-            Markup span - Gen<LitAttr:@(29:0,29)> - [btn] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (32:0,32) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 5 - (33:0,33)
-        Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (35:0,35) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:2
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..38)::38 - [<!p class='btn1 btn2' class2=btn></!p>]
+    MarkupBlock - [0..38)::38
+        MarkupTagBlock - [0..33)::33 - [<!p class='btn1 btn2' class2=btn>]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [2..3)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+            MarkupAttributeBlock - [3..21)::18 - [ class='btn1 btn2']
+                MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[class];
+                Equals;[=];
+                MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [11..20)::9
+                    MarkupLiteralAttributeValue - [11..15)::4 - [btn1]
+                        MarkupTextLiteral - [11..15)::4 - [btn1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[btn1];
+                    MarkupLiteralAttributeValue - [15..20)::5 - [ btn2]
+                        MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [16..20)::4 - [btn2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[btn2];
+                MarkupTextLiteral - [20..21)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupAttributeBlock - [21..32)::11 - [ class2=btn]
+                MarkupTextLiteral - [21..22)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [22..28)::6 - [class2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[class2];
+                Equals;[=];
+                GenericBlock - [29..32)::3
+                    MarkupLiteralAttributeValue - [29..32)::3 - [btn]
+                        MarkupTextLiteral - [29..32)::3 - [btn] - Gen<None> - SpanEditHandler;Accepts:Any
+                            Text;[btn];
+            MarkupTextLiteral - [32..33)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+        MarkupTagBlock - [33..38)::5 - [</!p>]
+            MarkupTextLiteral - [33..35)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+            RazorMetaCode - [35..36)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [36..38)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.cspans.txt
index bce20a79ac..08163d8b85 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.cspans.txt
@@ -5,7 +5,7 @@ Markup span at (3:0,3 [8] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [32]
 Markup span at (11:0,11 [4] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [32] )
 Markup span at (15:0,15 [1] ) (Accepts:Any) - Parent: Markup block at (15:0,15 [14] )
 Transition span at (16:0,16 [1] ) (Accepts:None) - Parent: Expression block at (16:0,16 [13] )
-Code span at (17:0,17 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (16:0,16 [13] )
+Code span at (17:0,17 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (16:0,16 [13] )
 Markup span at (29:0,29 [5] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [32] )
 Markup span at (34:0,34 [1] ) (Accepts:Any) - Parent: Markup block at (3:0,3 [32] )
 Markup span at (35:0,35 [1] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [36] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.stree.txt
index 1a34d1c18b..b3856ca506 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithAttributeData5.stree.txt
@@ -1,42 +1,53 @@
-Markup block - Gen<None> - 41 - (0:0,0)
-    Tag block - Gen<None> - 36 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1
-            HtmlTokenType.Text;[p];
-        Markup block - Gen<Attr:class, class='@(3:0,3),'@(34:0,34)> - 32 - (3:0,3)
-            Markup span - Gen<None> - [ class='] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[class];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(11:0,11)> - [btn1] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-                HtmlTokenType.Text;[btn1];
-            Markup block - Gen<DynAttr: @(15:0,15)> - 14 - (15:0,15)
-                Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-                    HtmlTokenType.WhiteSpace;[ ];
-                Expression block - Gen<Expr> - 13 - (16:0,16)
-                    Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-                        CSharpTokenType.Transition;[@];
-                    Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (17:0,17) - Tokens:3
-                        CSharpTokenType.Identifier;[DateTime];
-                        CSharpTokenType.Dot;[.];
-                        CSharpTokenType.Identifier;[Now];
-            Markup span - Gen<LitAttr: @(29:0,29)> - [ btn2] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:2
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[btn2];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 5 - (36:0,36)
-        Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:2
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..41)::41 - [<!p class='btn1 @DateTime.Now btn2'></!p>]
+    MarkupBlock - [0..41)::41
+        MarkupTagBlock - [0..36)::36 - [<!p class='btn1 @DateTime.Now btn2'>]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [2..3)::1 - [p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+            MarkupAttributeBlock - [3..35)::32 - [ class='btn1 @DateTime.Now btn2']
+                MarkupTextLiteral - [3..4)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [4..9)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[class];
+                Equals;[=];
+                MarkupTextLiteral - [10..11)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [11..34)::23
+                    MarkupLiteralAttributeValue - [11..15)::4 - [btn1]
+                        MarkupTextLiteral - [11..15)::4 - [btn1] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[btn1];
+                    MarkupDynamicAttributeValue - [15..29)::14 - [ @DateTime.Now]
+                        MarkupTextLiteral - [15..16)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        GenericBlock - [16..29)::13
+                            CSharpCodeBlock - [16..29)::13
+                                CSharpImplicitExpression - [16..29)::13
+                                    CSharpTransition - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                        Transition;[@];
+                                    CSharpImplicitExpressionBody - [17..29)::12
+                                        CSharpCodeBlock - [17..29)::12
+                                            CSharpExpressionLiteral - [17..29)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                Identifier;[DateTime];
+                                                Dot;[.];
+                                                Identifier;[Now];
+                    MarkupLiteralAttributeValue - [29..34)::5 - [ btn2]
+                        MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [30..34)::4 - [btn2] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[btn2];
+                MarkupTextLiteral - [34..35)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupTextLiteral - [35..36)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+        MarkupTagBlock - [36..41)::5 - [</!p>]
+            MarkupTextLiteral - [36..38)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+            RazorMetaCode - [38..39)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [39..41)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData1.stree.txt
index 4a705e12c2..acb1f0a40c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData1.stree.txt
@@ -1,9 +1,10 @@
-Markup block - Gen<None> - 4 - (0:0,0)
-    Tag block - Gen<None> - 4 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:2
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..4)::4 - [<!p>]
+    MarkupBlock - [0..4)::4
+        MarkupTagBlock - [0..4)::4 - [<!p>]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [2..4)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData10.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData10.stree.txt
index db20c96c8d..37731b8767 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData10.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData10.stree.txt
@@ -1,12 +1,23 @@
-Markup block - Gen<None> - 22 - (0:0,0)
-    Tag block - Gen<TagHelper> - 22 - (0:0,0) - strong - strongtaghelper
-        StartTagAndEndTag - <strong> ... </strong>
-        Tag block - Gen<None> - 5 - (8:0,8)
-            Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-            MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-                HtmlTokenType.Bang;[!];
-            Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:2
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..22)::22 - [<strong></!p></strong>]
+    MarkupBlock - [0..22)::22
+        MarkupTagHelperElement - [0..22)::22 - strong[StartTagAndEndTag] - strongtaghelper
+            MarkupTagHelperStartTag - [0..8)::8
+                MarkupTextLiteral - [0..8)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagBlock - [8..13)::5 - [</!p>]
+                MarkupTextLiteral - [8..10)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                RazorMetaCode - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Bang;[!];
+                MarkupTextLiteral - [11..13)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [13..22)::9
+                MarkupTextLiteral - [13..22)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData11.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData11.stree.txt
index 17f6670b16..7852dcdd41 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData11.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData11.stree.txt
@@ -1,20 +1,31 @@
-Markup block - Gen<None> - 26 - (0:0,0)
-    Tag block - Gen<TagHelper> - 17 - (0:0,0) - strong - strongtaghelper
-        StartTagAndEndTag - <strong> ... </strong>
-    Tag block - Gen<None> - 4 - (17:0,17)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:2
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 5 - (21:0,21)
-        Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:2
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..26)::26 - [<strong></strong><!p></!p>]
+    MarkupBlock - [0..26)::26
+        MarkupTagHelperElement - [0..17)::17 - strong[StartTagAndEndTag] - strongtaghelper
+            MarkupTagHelperStartTag - [0..8)::8
+                MarkupTextLiteral - [0..8)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [8..17)::9
+                MarkupTextLiteral - [8..17)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+        MarkupTagBlock - [17..21)::4 - [<!p>]
+            MarkupTextLiteral - [17..18)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [19..21)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTagBlock - [21..26)::5 - [</!p>]
+            MarkupTextLiteral - [21..23)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+            RazorMetaCode - [23..24)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [24..26)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.stree.txt
index 6f41367358..b246c4a31d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData12.stree.txt
@@ -1,31 +1,46 @@
-Markup block - Gen<None> - 39 - (0:0,0)
-    Tag block - Gen<TagHelper> - 39 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p>
-        Tag block - Gen<TagHelper> - 31 - (3:0,3) - strong - strongtaghelper
-            StartTagAndEndTag - <strong> ... </strong>
-            Tag block - Gen<None> - 10 - (11:0,11)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [strong>] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:2
-                    HtmlTokenType.Text;[strong];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 4 - (21:0,21)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-                MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:1
-                    HtmlTokenType.Bang;[!];
-                Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:2
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 5 - (34:0,34)
-            Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-            MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:1
-                HtmlTokenType.Bang;[!];
-            Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (37:0,37) - Tokens:2
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..39)::39 - [<p><strong></!strong><!p></strong></!p>]
+    MarkupBlock - [0..39)::39
+        MarkupTagHelperElement - [0..39)::39 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..34)::31 - strong[StartTagAndEndTag] - strongtaghelper
+                MarkupTagHelperStartTag - [3..11)::8
+                    MarkupTextLiteral - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagBlock - [11..21)::10 - [</!strong>]
+                    MarkupTextLiteral - [11..13)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                    RazorMetaCode - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Bang;[!];
+                    MarkupTextLiteral - [14..21)::7 - [strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagBlock - [21..25)::4 - [<!p>]
+                    MarkupTextLiteral - [21..22)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                    RazorMetaCode - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Bang;[!];
+                    MarkupTextLiteral - [23..25)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [25..34)::9
+                    MarkupTextLiteral - [25..34)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTagBlock - [34..39)::5 - [</!p>]
+                MarkupTextLiteral - [34..36)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                RazorMetaCode - [36..37)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Bang;[!];
+                MarkupTextLiteral - [37..39)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData2.stree.txt
index 440457c847..504c231e53 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData2.stree.txt
@@ -1,10 +1,11 @@
-Markup block - Gen<None> - 5 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:2
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..5)::5 - [</!p>]
+    MarkupBlock - [0..5)::5
+        MarkupTagBlock - [0..5)::5 - [</!p>]
+            MarkupTextLiteral - [0..2)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+            RazorMetaCode - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [3..5)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData3.stree.txt
index 3aeed7d6a0..c5f2ee2fbf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData3.stree.txt
@@ -1,18 +1,19 @@
-Markup block - Gen<None> - 9 - (0:0,0)
-    Tag block - Gen<None> - 4 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:2
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 5 - (4:0,4)
-        Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:2
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..9)::9 - [<!p></!p>]
+    MarkupBlock - [0..9)::9
+        MarkupTagBlock - [0..4)::4 - [<!p>]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [2..4)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTagBlock - [4..9)::5 - [</!p>]
+            MarkupTextLiteral - [4..6)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+            RazorMetaCode - [6..7)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [7..9)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData4.stree.txt
index b54b9b523d..fe05aa041f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData4.stree.txt
@@ -1,24 +1,25 @@
-Markup block - Gen<None> - 25 - (0:0,0)
-    Tag block - Gen<None> - 4 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:2
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [words and spaces] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:5
-        HtmlTokenType.Text;[words];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[and];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[spaces];
-    Tag block - Gen<None> - 5 - (20:0,20)
-        Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:2
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..25)::25 - [<!p>words and spaces</!p>]
+    MarkupBlock - [0..25)::25
+        MarkupTagBlock - [0..4)::4 - [<!p>]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [2..4)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTextLiteral - [4..20)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[words];
+            Whitespace;[ ];
+            Text;[and];
+            Whitespace;[ ];
+            Text;[spaces];
+        MarkupTagBlock - [20..25)::5 - [</!p>]
+            MarkupTextLiteral - [20..22)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+            RazorMetaCode - [22..23)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [23..25)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData5.stree.txt
index ca71bddd4e..b2ba2a2b28 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData5.stree.txt
@@ -1,15 +1,16 @@
-Markup block - Gen<None> - 8 - (0:0,0)
-    Tag block - Gen<None> - 4 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:2
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 4 - (4:0,4)
-        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..8)::8 - [<!p></p>]
+    MarkupBlock - [0..8)::8
+        MarkupTagBlock - [0..4)::4 - [<!p>]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [2..4)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTagBlock - [4..8)::4 - [</p>]
+            MarkupTextLiteral - [4..8)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.stree.txt
index e19eefc1f6..2dd48d43cf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData6.stree.txt
@@ -1,12 +1,17 @@
-Markup block - Gen<None> - 8 - (0:0,0)
-    Tag block - Gen<TagHelper> - 8 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p>
-        Tag block - Gen<None> - 5 - (3:0,3)
-            Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-            MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:1
-                HtmlTokenType.Bang;[!];
-            Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:2
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..8)::8 - [<p></!p>]
+    MarkupBlock - [0..8)::8
+        MarkupTagHelperElement - [0..8)::8 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [3..8)::5 - [</!p>]
+                MarkupTextLiteral - [3..5)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                RazorMetaCode - [5..6)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Bang;[!];
+                MarkupTextLiteral - [6..8)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData7.stree.txt
index 9c1f8c8aac..cdd50c0283 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData7.stree.txt
@@ -1,20 +1,31 @@
-Markup block - Gen<None> - 16 - (0:0,0)
-    Tag block - Gen<TagHelper> - 16 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 4 - (3:0,3)
-            Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
-                HtmlTokenType.OpenAngle;[<];
-            MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:1
-                HtmlTokenType.Bang;[!];
-            Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:2
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 5 - (7:0,7)
-            Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-            MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:1
-                HtmlTokenType.Bang;[!];
-            Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:2
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..16)::16 - [<p><!p></!p></p>]
+    MarkupBlock - [0..16)::16
+        MarkupTagHelperElement - [0..16)::16 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [3..7)::4 - [<!p>]
+                MarkupTextLiteral - [3..4)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                RazorMetaCode - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Bang;[!];
+                MarkupTextLiteral - [5..7)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [7..12)::5 - [</!p>]
+                MarkupTextLiteral - [7..9)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                RazorMetaCode - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Bang;[!];
+                MarkupTextLiteral - [10..12)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [12..16)::4
+                MarkupTextLiteral - [12..16)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.stree.txt
index f4ac65c919..187d7fbe98 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData8.stree.txt
@@ -1,20 +1,25 @@
-Markup block - Gen<None> - 12 - (0:0,0)
-    Tag block - Gen<TagHelper> - 12 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p>
-        Tag block - Gen<None> - 4 - (3:0,3)
-            Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
-                HtmlTokenType.OpenAngle;[<];
-            MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:1
-                HtmlTokenType.Bang;[!];
-            Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:2
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 5 - (7:0,7)
-            Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-            MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:1
-                HtmlTokenType.Bang;[!];
-            Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:2
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..12)::12 - [<p><!p></!p>]
+    MarkupBlock - [0..12)::12
+        MarkupTagHelperElement - [0..12)::12 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [3..7)::4 - [<!p>]
+                MarkupTextLiteral - [3..4)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                RazorMetaCode - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Bang;[!];
+                MarkupTextLiteral - [5..7)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [7..12)::5 - [</!p>]
+                MarkupTextLiteral - [7..9)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                RazorMetaCode - [9..10)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Bang;[!];
+                MarkupTextLiteral - [10..12)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData9.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData9.stree.txt
index 9827f7494a..06cd6f9334 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData9.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/AllowsTagHelperElementOptOutHTML_WithBlockData9.stree.txt
@@ -1,24 +1,25 @@
-Markup block - Gen<None> - 13 - (0:0,0)
-    Tag block - Gen<None> - 4 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:2
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 5 - (4:0,4)
-        Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-        MetaCode span - Gen<None> - [!] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:1
-            HtmlTokenType.Bang;[!];
-        Markup span - Gen<Markup> - [p>] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:2
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 4 - (9:0,9)
-        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..13)::13 - [<!p></!p></p>]
+    MarkupBlock - [0..13)::13
+        MarkupTagBlock - [0..4)::4 - [<!p>]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+            RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [2..4)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTagBlock - [4..9)::5 - [</!p>]
+            MarkupTextLiteral - [4..6)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+            RazorMetaCode - [6..7)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                Bang;[!];
+            MarkupTextLiteral - [7..9)::2 - [p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTagBlock - [9..13)::4 - [</p>]
+            MarkupTextLiteral - [9..13)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.stree.txt
index 0e2b3ad177..af792a8cc4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleInvalidChildrenWithWhitespace.stree.txt
@@ -1,25 +1,36 @@
-Markup block - Gen<None> - 53 - (0:0,0)
-    Tag block - Gen<TagHelper> - 53 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [LF    ] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:2
-            HtmlTokenType.NewLine;[LF];
-            HtmlTokenType.WhiteSpace;[    ];
-        Tag block - Gen<None> - 8 - (9:1,4)
-            Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (9:1,4) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF        HelloLF    ] - SpanEditHandler;Accepts:Any - (17:1,12) - Tokens:5
-            HtmlTokenType.NewLine;[LF];
-            HtmlTokenType.WhiteSpace;[        ];
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.NewLine;[LF];
-            HtmlTokenType.WhiteSpace;[    ];
-        Tag block - Gen<None> - 9 - (38:3,4)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (38:3,4) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (47:3,13) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
+RazorDocument - [0..53)::53 - [<p>LF    <strong>LF        HelloLF    </strong>LF</p>]
+    MarkupBlock - [0..53)::53
+        MarkupTagHelperElement - [0..53)::53 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [3..9)::6 - [LF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                Whitespace;[    ];
+            MarkupTagBlock - [9..17)::8 - [<strong>]
+                MarkupTextLiteral - [9..17)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [17..38)::21 - [LF        HelloLF    ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+                Whitespace;[        ];
+                Text;[Hello];
+                NewLine;[LF];
+                Whitespace;[    ];
+            MarkupTagBlock - [38..47)::9 - [</strong>]
+                MarkupTextLiteral - [38..47)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [47..49)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupTagHelperEndTag - [49..53)::4
+                MarkupTextLiteral - [49..53)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren.stree.txt
index 39abf8bc1c..2fa4f737af 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren.stree.txt
@@ -1,11 +1,36 @@
-Markup block - Gen<None> - 39 - (0:0,0)
-    Tag block - Gen<TagHelper> - 39 - (0:0,0) - p - PTagHelper1 - PTagHelper2
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<TagHelper> - 28 - (3:0,3) - strong - StrongTagHelper
-            StartTagAndEndTag - <strong> ... </strong>
-            Markup span - Gen<Markup> - [Hello World] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:3
-                HtmlTokenType.Text;[Hello];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[World];
-        Tag block - Gen<TagHelper> - 4 - (31:0,31) - br - BRTagHelper
-            StartTagOnly - <br>
+RazorDocument - [0..39)::39 - [<p><strong>Hello World</strong><br></p>]
+    MarkupBlock - [0..39)::39
+        MarkupTagHelperElement - [0..39)::39 - p[StartTagAndEndTag] - PTagHelper1 - PTagHelper2
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..31)::28 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [3..11)::8
+                    MarkupTextLiteral - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [11..22)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[Hello];
+                    Whitespace;[ ];
+                    Text;[World];
+                MarkupTagHelperEndTag - [22..31)::9
+                    MarkupTextLiteral - [22..31)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTagHelperElement - [31..35)::4 - br[StartTagOnly] - BRTagHelper
+                MarkupTagHelperStartTag - [31..35)::4
+                    MarkupTextLiteral - [31..35)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [35..39)::4
+                MarkupTextLiteral - [35..39)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren_OneNull.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren_OneNull.stree.txt
index 39abf8bc1c..2fa4f737af 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren_OneNull.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleMultipleTagHelpersWithAllowedChildren_OneNull.stree.txt
@@ -1,11 +1,36 @@
-Markup block - Gen<None> - 39 - (0:0,0)
-    Tag block - Gen<TagHelper> - 39 - (0:0,0) - p - PTagHelper1 - PTagHelper2
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<TagHelper> - 28 - (3:0,3) - strong - StrongTagHelper
-            StartTagAndEndTag - <strong> ... </strong>
-            Markup span - Gen<Markup> - [Hello World] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:3
-                HtmlTokenType.Text;[Hello];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[World];
-        Tag block - Gen<TagHelper> - 4 - (31:0,31) - br - BRTagHelper
-            StartTagOnly - <br>
+RazorDocument - [0..39)::39 - [<p><strong>Hello World</strong><br></p>]
+    MarkupBlock - [0..39)::39
+        MarkupTagHelperElement - [0..39)::39 - p[StartTagAndEndTag] - PTagHelper1 - PTagHelper2
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..31)::28 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [3..11)::8
+                    MarkupTextLiteral - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [11..22)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[Hello];
+                    Whitespace;[ ];
+                    Text;[World];
+                MarkupTagHelperEndTag - [22..31)::9
+                    MarkupTextLiteral - [22..31)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTagHelperElement - [31..35)::4 - br[StartTagOnly] - BRTagHelper
+                MarkupTagHelperStartTag - [31..35)::4
+                    MarkupTextLiteral - [31..35)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [35..39)::4
+                MarkupTextLiteral - [35..39)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleStartTagOnlyTagTagMode.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleStartTagOnlyTagTagMode.stree.txt
index 64f951bb83..764c76b22e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleStartTagOnlyTagTagMode.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CanHandleStartTagOnlyTagTagMode.stree.txt
@@ -1,3 +1,8 @@
-Markup block - Gen<None> - 7 - (0:0,0)
-    Tag block - Gen<TagHelper> - 7 - (0:0,0) - input - InputTagHelper
-        StartTagOnly - <input>
+RazorDocument - [0..7)::7 - [<input>]
+    MarkupBlock - [0..7)::7
+        MarkupTagHelperElement - [0..7)::7 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [0..7)::7
+                MarkupTextLiteral - [0..7)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.stree.txt
index ce48d34623..f75dab8e9a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForInconsistentTagStructures.stree.txt
@@ -1,3 +1,8 @@
-Markup block - Gen<None> - 7 - (0:0,0)
-    Tag block - Gen<TagHelper> - 7 - (0:0,0) - input - InputTagHelper1 - InputTagHelper2
-        StartTagOnly - <input>
+RazorDocument - [0..7)::7 - [<input>]
+    MarkupBlock - [0..7)::7
+        MarkupTagHelperElement - [0..7)::7 - input[StartTagOnly] - InputTagHelper1 - InputTagHelper2
+            MarkupTagHelperStartTag - [0..7)::7
+                MarkupTextLiteral - [0..7)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForWithoutEndTagTagStructureForEndTags.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForWithoutEndTagTagStructureForEndTags.stree.txt
index d4c86de303..bbad7a51ed 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForWithoutEndTagTagStructureForEndTags.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/CreatesErrorForWithoutEndTagTagStructureForEndTags.stree.txt
@@ -1,7 +1,8 @@
-Markup block - Gen<None> - 8 - (0:0,0)
-    Tag block - Gen<None> - 8 - (0:0,0)
-        Markup span - Gen<Markup> - [</input>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[input];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..8)::8 - [</input>]
+    MarkupBlock - [0..8)::8
+        MarkupTagBlock - [0..8)::8 - [</input>]
+            MarkupTextLiteral - [0..8)::8 - [</input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[input];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.cspans.txt
index bdde472ead..cc2e136b18 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.cspans.txt
@@ -1,5 +1,5 @@
 Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
 Markup span at (5:0,5 [4] ) (Accepts:None) - Parent: HtmlComment block at (5:0,5 [20] )
-Markup span at (9:0,9 [13] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (5:0,5 [20] )
+Markup span at (9:0,9 [13] ) (Accepts:Whitespace) - Parent: HtmlComment block at (5:0,5 [20] )
 Markup span at (22:0,22 [3] ) (Accepts:None) - Parent: HtmlComment block at (5:0,5 [20] )
 Markup span at (25:0,25 [6] ) (Accepts:Any) - Parent: Tag block at (25:0,25 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.diag.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.diag.txt
new file mode 100644
index 0000000000..67536937c3
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!--' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '?xml' because it contains a '?' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '[' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!DOCTYPE' because it contains a '!' character.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.stree.txt
index 3350d6cdf1..1d82e5c9d2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers1.stree.txt
@@ -1,26 +1,27 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    HtmlComment block - Gen<None> - 20 - (5:0,5)
-        Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Bang;[!];
-            HtmlTokenType.DoubleHyphen;[--];
-        Markup span - Gen<Markup> - [ Hello World ] - SpanEditHandler;Accepts:WhiteSpace - (9:0,9) - Tokens:5
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
-            HtmlTokenType.WhiteSpace;[ ];
-        Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:2
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (25:0,25)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..31)::31 - [<foo><!-- Hello World --></foo>]
+    MarkupBlock - [0..31)::31
+        MarkupTagBlock - [0..5)::5 - [<foo>]
+            MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+        MarkupCommentBlock - [5..25)::20
+            MarkupTextLiteral - [5..9)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Bang;[!];
+                DoubleHyphen;[--];
+            MarkupTextLiteral - [9..22)::13 - [ Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                Whitespace;[ ];
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+            MarkupTextLiteral - [22..25)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                DoubleHyphen;[--];
+                CloseAngle;[>];
+        MarkupTagBlock - [25..31)::6 - [</foo>]
+            MarkupTextLiteral - [25..31)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.cspans.txt
index a93868a143..60e78976ec 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.cspans.txt
@@ -1,8 +1,8 @@
 Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
 Markup span at (5:0,5 [4] ) (Accepts:None) - Parent: HtmlComment block at (5:0,5 [13] )
-Markup span at (9:0,9 [1] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (5:0,5 [13] )
+Markup span at (9:0,9 [1] ) (Accepts:Whitespace) - Parent: HtmlComment block at (5:0,5 [13] )
 Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [4] )
-Code span at (11:0,11 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (10:0,10 [4] )
-Markup span at (14:0,14 [1] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (5:0,5 [13] )
+Code span at (11:0,11 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [4] )
+Markup span at (14:0,14 [1] ) (Accepts:Whitespace) - Parent: HtmlComment block at (5:0,5 [13] )
 Markup span at (15:0,15 [3] ) (Accepts:None) - Parent: HtmlComment block at (5:0,5 [13] )
 Markup span at (18:0,18 [6] ) (Accepts:Any) - Parent: Tag block at (18:0,18 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.diag.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.diag.txt
new file mode 100644
index 0000000000..67536937c3
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!--' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '?xml' because it contains a '?' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '[' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!DOCTYPE' because it contains a '!' character.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.stree.txt
index 7733f1e646..6435e3cddf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers2.stree.txt
@@ -1,29 +1,33 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    HtmlComment block - Gen<None> - 13 - (5:0,5)
-        Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Bang;[!];
-            HtmlTokenType.DoubleHyphen;[--];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (9:0,9) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Expression block - Gen<Expr> - 4 - (10:0,10)
-            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-                CSharpTokenType.Transition;[@];
-            Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (11:0,11) - Tokens:1
-                CSharpTokenType.Identifier;[foo];
-        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:WhiteSpace - (14:0,14) - Tokens:1
-            HtmlTokenType.WhiteSpace;[ ];
-        Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:2
-            HtmlTokenType.DoubleHyphen;[--];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (18:0,18)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..24)::24 - [<foo><!-- @foo --></foo>]
+    MarkupBlock - [0..24)::24
+        MarkupTagBlock - [0..5)::5 - [<foo>]
+            MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+        MarkupCommentBlock - [5..18)::13
+            MarkupTextLiteral - [5..9)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                OpenAngle;[<];
+                Bang;[!];
+                DoubleHyphen;[--];
+            MarkupTextLiteral - [9..10)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                Whitespace;[ ];
+            CSharpCodeBlock - [10..14)::4
+                CSharpImplicitExpression - [10..14)::4
+                    CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        Transition;[@];
+                    CSharpImplicitExpressionBody - [11..14)::3
+                        CSharpCodeBlock - [11..14)::3
+                            CSharpExpressionLiteral - [11..14)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                Identifier;[foo];
+            MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                Whitespace;[ ];
+            MarkupTextLiteral - [15..18)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                DoubleHyphen;[--];
+                CloseAngle;[>];
+        MarkupTagBlock - [18..24)::6 - [</foo>]
+            MarkupTextLiteral - [18..24)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.diag.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.diag.txt
new file mode 100644
index 0000000000..67536937c3
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!--' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '?xml' because it contains a '?' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '[' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!DOCTYPE' because it contains a '!' character.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.stree.txt
index ae0fe4b2d3..a435551c46 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers3.stree.txt
@@ -1,23 +1,24 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<?xml Hello World ?>] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:10
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.QuestionMark;[?];
-        HtmlTokenType.Text;[xml];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[Hello];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[World];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.QuestionMark;[?];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (25:0,25)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..31)::31 - [<foo><?xml Hello World ?></foo>]
+    MarkupBlock - [0..31)::31
+        MarkupTagBlock - [0..5)::5 - [<foo>]
+            MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+        MarkupTextLiteral - [5..25)::20 - [<?xml Hello World ?>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            QuestionMark;[?];
+            Text;[xml];
+            Whitespace;[ ];
+            Text;[Hello];
+            Whitespace;[ ];
+            Text;[World];
+            Whitespace;[ ];
+            QuestionMark;[?];
+            CloseAngle;[>];
+        MarkupTagBlock - [25..31)::6 - [</foo>]
+            MarkupTextLiteral - [25..31)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.cspans.txt
index c257922b83..8abca4d638 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
 Markup span at (5:0,5 [6] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
 Transition span at (11:0,11 [1] ) (Accepts:None) - Parent: Expression block at (11:0,11 [4] )
-Code span at (12:0,12 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (11:0,11 [4] )
+Code span at (12:0,12 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (11:0,11 [4] )
 Markup span at (15:0,15 [3] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [24] )
 Markup span at (18:0,18 [6] ) (Accepts:Any) - Parent: Tag block at (18:0,18 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.diag.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.diag.txt
new file mode 100644
index 0000000000..67536937c3
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!--' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '?xml' because it contains a '?' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '[' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!DOCTYPE' because it contains a '!' character.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.stree.txt
index 70ff974ca4..8aa9f08484 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers4.stree.txt
@@ -1,26 +1,30 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<?xml ] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:4
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.QuestionMark;[?];
-        HtmlTokenType.Text;[xml];
-        HtmlTokenType.WhiteSpace;[ ];
-    Expression block - Gen<Expr> - 4 - (11:0,11)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (11:0,11) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (12:0,12) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-    Markup span - Gen<Markup> - [ ?>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.QuestionMark;[?];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (18:0,18)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..24)::24 - [<foo><?xml @foo ?></foo>]
+    MarkupBlock - [0..24)::24
+        MarkupTagBlock - [0..5)::5 - [<foo>]
+            MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+        MarkupTextLiteral - [5..11)::6 - [<?xml ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            QuestionMark;[?];
+            Text;[xml];
+            Whitespace;[ ];
+        CSharpCodeBlock - [11..15)::4
+            CSharpImplicitExpression - [11..15)::4
+                CSharpTransition - [11..12)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [12..15)::3
+                    CSharpCodeBlock - [12..15)::3
+                        CSharpExpressionLiteral - [12..15)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+        MarkupTextLiteral - [15..18)::3 - [ ?>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            QuestionMark;[?];
+            CloseAngle;[>];
+        MarkupTagBlock - [18..24)::6 - [</foo>]
+            MarkupTextLiteral - [18..24)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.cspans.txt
index 9c35a9a7ba..a6fb41162b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
 Markup span at (5:0,5 [10] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
 Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Expression block at (15:0,15 [4] )
-Code span at (16:0,16 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (15:0,15 [4] )
+Code span at (16:0,16 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (15:0,15 [4] )
 Markup span at (19:0,19 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )
 Markup span at (21:0,21 [6] ) (Accepts:Any) - Parent: Tag block at (21:0,21 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.diag.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.diag.txt
new file mode 100644
index 0000000000..67536937c3
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!--' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '?xml' because it contains a '?' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '[' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!DOCTYPE' because it contains a '!' character.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.stree.txt
index c1c7227367..bb000ad7fc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers5.stree.txt
@@ -1,25 +1,29 @@
-Markup block - Gen<None> - 27 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<!DOCTYPE ] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:4
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Bang;[!];
-        HtmlTokenType.Text;[DOCTYPE];
-        HtmlTokenType.WhiteSpace;[ ];
-    Expression block - Gen<Expr> - 4 - (15:0,15)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (16:0,16) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-    Markup span - Gen<Markup> - [ >] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:2
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (21:0,21)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..27)::27 - [<foo><!DOCTYPE @foo ></foo>]
+    MarkupBlock - [0..27)::27
+        MarkupTagBlock - [0..5)::5 - [<foo>]
+            MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+        MarkupTextLiteral - [5..15)::10 - [<!DOCTYPE ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Bang;[!];
+            Text;[DOCTYPE];
+            Whitespace;[ ];
+        CSharpCodeBlock - [15..19)::4
+            CSharpImplicitExpression - [15..19)::4
+                CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [16..19)::3
+                    CSharpCodeBlock - [16..19)::3
+                        CSharpExpressionLiteral - [16..19)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+        MarkupTextLiteral - [19..21)::2 - [ >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            CloseAngle;[>];
+        MarkupTagBlock - [21..27)::6 - [</foo>]
+            MarkupTextLiteral - [21..27)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.diag.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.diag.txt
new file mode 100644
index 0000000000..67536937c3
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!--' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '?xml' because it contains a '?' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '[' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!DOCTYPE' because it contains a '!' character.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.stree.txt
index db02a12d1e..f2dffdde66 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers6.stree.txt
@@ -1,24 +1,25 @@
-Markup block - Gen<None> - 36 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<!DOCTYPE hello="world" >] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:11
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Bang;[!];
-        HtmlTokenType.Text;[DOCTYPE];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[hello];
-        HtmlTokenType.Equals;[=];
-        HtmlTokenType.DoubleQuote;["];
-        HtmlTokenType.Text;[world];
-        HtmlTokenType.DoubleQuote;["];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (30:0,30)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..36)::36 - [<foo><!DOCTYPE hello="world" ></foo>]
+    MarkupBlock - [0..36)::36
+        MarkupTagBlock - [0..5)::5 - [<foo>]
+            MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+        MarkupTextLiteral - [5..30)::25 - [<!DOCTYPE hello="world" >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Bang;[!];
+            Text;[DOCTYPE];
+            Whitespace;[ ];
+            Text;[hello];
+            Equals;[=];
+            DoubleQuote;["];
+            Text;[world];
+            DoubleQuote;["];
+            Whitespace;[ ];
+            CloseAngle;[>];
+        MarkupTagBlock - [30..36)::6 - [</foo>]
+            MarkupTextLiteral - [30..36)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.diag.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.diag.txt
new file mode 100644
index 0000000000..67536937c3
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!--' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '?xml' because it contains a '?' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '[' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!DOCTYPE' because it contains a '!' character.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.stree.txt
index 9191c0df85..23a73af555 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers7.stree.txt
@@ -1,26 +1,27 @@
-Markup block - Gen<None> - 36 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<![CDATA[ Hello World ]]>] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:13
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Bang;[!];
-        HtmlTokenType.LeftBracket;[[];
-        HtmlTokenType.Text;[CDATA];
-        HtmlTokenType.LeftBracket;[[];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[Hello];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[World];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.RightBracket;[]];
-        HtmlTokenType.RightBracket;[]];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (30:0,30)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..36)::36 - [<foo><![CDATA[ Hello World ]]></foo>]
+    MarkupBlock - [0..36)::36
+        MarkupTagBlock - [0..5)::5 - [<foo>]
+            MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+        MarkupTextLiteral - [5..30)::25 - [<![CDATA[ Hello World ]]>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Bang;[!];
+            LeftBracket;[[];
+            Text;[CDATA];
+            LeftBracket;[[];
+            Whitespace;[ ];
+            Text;[Hello];
+            Whitespace;[ ];
+            Text;[World];
+            Whitespace;[ ];
+            RightBracket;[]];
+            RightBracket;[]];
+            CloseAngle;[>];
+        MarkupTagBlock - [30..36)::6 - [</foo>]
+            MarkupTextLiteral - [30..36)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.cspans.txt
index de40fe63e9..4024585ede 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.cspans.txt
@@ -1,6 +1,6 @@
 Markup span at (0:0,0 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [5] )
 Markup span at (5:0,5 [10] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
 Transition span at (15:0,15 [1] ) (Accepts:None) - Parent: Expression block at (15:0,15 [4] )
-Code span at (16:0,16 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (15:0,15 [4] )
+Code span at (16:0,16 [3] ) (Accepts:NonWhitespace) - Parent: Expression block at (15:0,15 [4] )
 Markup span at (19:0,19 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [29] )
 Markup span at (23:0,23 [6] ) (Accepts:Any) - Parent: Tag block at (23:0,23 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.diag.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.diag.txt
new file mode 100644
index 0000000000..67536937c3
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.diag.txt
@@ -0,0 +1,5 @@
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!--' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '?xml' because it contains a '?' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '!' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '![CDATA[' because it contains a '[' character.
+(0,0): Error RZ3008: Tag helpers cannot target tag name '!DOCTYPE' because it contains a '!' character.
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.stree.txt
index 269d727534..bc149d4674 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteSpecialTagTagHelpers8.stree.txt
@@ -1,29 +1,33 @@
-Markup block - Gen<None> - 29 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<foo>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<![CDATA[ ] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:6
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Bang;[!];
-        HtmlTokenType.LeftBracket;[[];
-        HtmlTokenType.Text;[CDATA];
-        HtmlTokenType.LeftBracket;[[];
-        HtmlTokenType.WhiteSpace;[ ];
-    Expression block - Gen<Expr> - 4 - (15:0,15)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (16:0,16) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-    Markup span - Gen<Markup> - [ ]]>] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:4
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.RightBracket;[]];
-        HtmlTokenType.RightBracket;[]];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (23:0,23)
-        Markup span - Gen<Markup> - [</foo>] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[foo];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..29)::29 - [<foo><![CDATA[ @foo ]]></foo>]
+    MarkupBlock - [0..29)::29
+        MarkupTagBlock - [0..5)::5 - [<foo>]
+            MarkupTextLiteral - [0..5)::5 - [<foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[foo];
+                CloseAngle;[>];
+        MarkupTextLiteral - [5..15)::10 - [<![CDATA[ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Bang;[!];
+            LeftBracket;[[];
+            Text;[CDATA];
+            LeftBracket;[[];
+            Whitespace;[ ];
+        CSharpCodeBlock - [15..19)::4
+            CSharpImplicitExpression - [15..19)::4
+                CSharpTransition - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [16..19)::3
+                    CSharpCodeBlock - [16..19)::3
+                        CSharpExpressionLiteral - [16..19)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[foo];
+        MarkupTextLiteral - [19..23)::4 - [ ]]>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            RightBracket;[]];
+            RightBracket;[]];
+            CloseAngle;[>];
+        MarkupTagBlock - [23..29)::6 - [</foo>]
+            MarkupTextLiteral - [23..29)::6 - [</foo>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[foo];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers1.stree.txt
index 71ab735856..a0890322ff 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers1.stree.txt
@@ -1,7 +1,18 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Tag block - Gen<TagHelper> - 24 - (0:0,0) - text - texttaghelper
-        StartTagAndEndTag - <text> ... </text>
-        Markup span - Gen<Markup> - [Hello World] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:3
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
+RazorDocument - [0..24)::24 - [<text>Hello World</text>]
+    MarkupBlock - [0..24)::24
+        MarkupTagHelperElement - [0..24)::24 - text[StartTagAndEndTag] - texttaghelper
+            MarkupTagHelperStartTag - [0..6)::6
+                MarkupTextLiteral - [0..6)::6 - [<text>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[text];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [6..17)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+            MarkupTagHelperEndTag - [17..24)::7
+                MarkupTextLiteral - [17..24)::7 - [</text>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[text];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers2.stree.txt
index b125dddc58..fcfb244b78 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers2.stree.txt
@@ -1,30 +1,34 @@
-Markup block - Gen<None> - 27 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 27 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 24 - (2:0,2)
-            Tag block - Gen<None> - 6 - (2:0,2)
-                Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [Hello World] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:3
-                HtmlTokenType.Text;[Hello];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[World];
-            Tag block - Gen<None> - 7 - (19:0,19)
-                Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (26:0,26) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..27)::27 - [@{<text>Hello World</text>}]
+    MarkupBlock - [0..27)::27
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..27)::27
+            CSharpStatement - [0..27)::27
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..27)::26
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..26)::24
+                        MarkupBlock - [2..26)::24
+                            MarkupTagBlock - [2..8)::6 - [<text>]
+                                MarkupTransition - [2..8)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTextLiteral - [8..19)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                Text;[Hello];
+                                Whitespace;[ ];
+                                Text;[World];
+                            MarkupTagBlock - [19..26)::7 - [</text>]
+                                MarkupTransition - [19..26)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [26..26)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers3.stree.txt
index f01c569947..7287056321 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers3.stree.txt
@@ -1,32 +1,46 @@
-Markup block - Gen<None> - 34 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 34 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 31 - (2:0,2)
-            Tag block - Gen<None> - 6 - (2:0,2)
-                Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<TagHelper> - 18 - (8:0,8) - p - ptaghelper
-                StartTagAndEndTag - <p> ... </p>
-                Markup span - Gen<Markup> - [Hello World] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:3
-                    HtmlTokenType.Text;[Hello];
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[World];
-            Tag block - Gen<None> - 7 - (26:0,26)
-                Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (26:0,26) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (33:0,33) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..34)::34 - [@{<text><p>Hello World</p></text>}]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        MarkupBlock - [2..33)::31
+                            MarkupTagBlock - [2..8)::6 - [<text>]
+                                MarkupTransition - [2..8)::6 - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                            MarkupTagHelperElement - [8..26)::18 - p[StartTagAndEndTag] - ptaghelper
+                                MarkupTagHelperStartTag - [8..11)::3
+                                    MarkupTextLiteral - [8..11)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                MarkupTextLiteral - [11..22)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[Hello];
+                                    Whitespace;[ ];
+                                    Text;[World];
+                                MarkupTagHelperEndTag - [22..26)::4
+                                    MarkupTextLiteral - [22..26)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                            MarkupTagBlock - [26..33)::7 - [</text>]
+                                MarkupTransition - [26..33)::7 - Gen<None> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[text];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers4.stree.txt
index 2b67825722..2376ffa088 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotRewriteTextTagTransitionTagHelpers4.stree.txt
@@ -1,23 +1,47 @@
-Markup block - Gen<None> - 34 - (0:0,0)
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-        HtmlTokenType.Unknown;[];
-    Statement block - Gen<None> - 34 - (0:0,0)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 31 - (2:0,2)
-            Tag block - Gen<TagHelper> - 31 - (2:0,2) - p - ptaghelper
-                StartTagAndEndTag - <p> ... </p>
-                Tag block - Gen<TagHelper> - 24 - (5:0,5) - text - texttaghelper
-                    StartTagAndEndTag - <text> ... </text>
-                    Markup span - Gen<Markup> - [Hello World] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:3
-                        HtmlTokenType.Text;[Hello];
-                        HtmlTokenType.WhiteSpace;[ ];
-                        HtmlTokenType.Text;[World];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (33:0,33) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..34)::34 - [@{<p><text>Hello World</text></p>}]
+    MarkupBlock - [0..34)::34
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..34)::34
+            CSharpStatement - [0..34)::34
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..34)::33
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..33)::31
+                        MarkupBlock - [2..33)::31
+                            MarkupTagHelperElement - [2..33)::31 - p[StartTagAndEndTag] - ptaghelper
+                                MarkupTagHelperStartTag - [2..5)::3
+                                    MarkupTextLiteral - [2..5)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                                MarkupTagHelperElement - [5..29)::24 - text[StartTagAndEndTag] - texttaghelper
+                                    MarkupTagHelperStartTag - [5..11)::6
+                                        MarkupTextLiteral - [5..11)::6 - [<text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            Text;[text];
+                                            CloseAngle;[>];
+                                    MarkupTextLiteral - [11..22)::11 - [Hello World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                        Text;[Hello];
+                                        Whitespace;[ ];
+                                        Text;[World];
+                                    MarkupTagHelperEndTag - [22..29)::7
+                                        MarkupTextLiteral - [22..29)::7 - [</text>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                            OpenAngle;[<];
+                                            ForwardSlash;[/];
+                                            Text;[text];
+                                            CloseAngle;[>];
+                                MarkupTagHelperEndTag - [29..33)::4
+                                    MarkupTextLiteral - [29..33)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                        OpenAngle;[<];
+                                        ForwardSlash;[/];
+                                        Text;[p];
+                                        CloseAngle;[>];
+                        CSharpStatementLiteral - [33..33)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [33..34)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [34..34)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags1.stree.txt
index becce51273..4fbcbc27ed 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags1.stree.txt
@@ -1,23 +1,25 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<None> - 13 - (0:0,0)
-        Markup span - Gen<Markup> - [<script] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[script];
-        Markup block - Gen<None> - 5 - (7:0,7)
-            Markup span - Gen<Markup> - [ type] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:2
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[type];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<input />] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:5
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Text;[input];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.ForwardSlash;[/];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 9 - (22:0,22)
-        Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..31)::31 - [<script type><input /></script>]
+    MarkupBlock - [0..31)::31
+        MarkupTagBlock - [0..13)::13 - [<script type>]
+            MarkupTextLiteral - [0..7)::7 - [<script] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+            MarkupMinimizedAttributeBlock - [7..12)::5 - [ type]
+                MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [8..12)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[type];
+            MarkupTextLiteral - [12..13)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+        MarkupTextLiteral - [13..22)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[input];
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
+        MarkupTagBlock - [22..31)::9 - [</script>]
+            MarkupTextLiteral - [22..31)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2.stree.txt
index 26aa3d7db7..eeb165528a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags2.stree.txt
@@ -1,31 +1,36 @@
-Markup block - Gen<None> - 44 - (0:0,0)
-    Tag block - Gen<None> - 26 - (0:0,0)
-        Markup span - Gen<Markup> - [<script] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[script];
-        Markup block - Gen<Attr:types, types='@(7:0,7),'@(24:0,24)> - 18 - (7:0,7)
-            Markup span - Gen<None> - [ types='] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[types];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(15:0,15)> - [text/html] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3
-                HtmlTokenType.Text;[text];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[html];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<input />] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:5
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Text;[input];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.ForwardSlash;[/];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 9 - (35:0,35)
-        Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..44)::44 - [<script types='text/html'><input /></script>]
+    MarkupBlock - [0..44)::44
+        MarkupTagBlock - [0..26)::26 - [<script types='text/html'>]
+            MarkupTextLiteral - [0..7)::7 - [<script] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+            MarkupAttributeBlock - [7..25)::18 - [ types='text/html']
+                MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [8..13)::5 - [types] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[types];
+                Equals;[=];
+                MarkupTextLiteral - [14..15)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [15..24)::9
+                    MarkupLiteralAttributeValue - [15..24)::9 - [text/html]
+                        MarkupTextLiteral - [15..24)::9 - [text/html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[text];
+                            ForwardSlash;[/];
+                            Text;[html];
+                MarkupTextLiteral - [24..25)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupTextLiteral - [25..26)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+        MarkupTextLiteral - [26..35)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[input];
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
+        MarkupTagBlock - [35..44)::9 - [</script>]
+            MarkupTextLiteral - [35..44)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3.stree.txt
index 08918fbe33..a064475566 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags3.stree.txt
@@ -1,34 +1,41 @@
-Markup block - Gen<None> - 51 - (0:0,0)
-    Tag block - Gen<None> - 33 - (0:0,0)
-        Markup span - Gen<Markup> - [<script] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[script];
-        Markup block - Gen<Attr:type, type='@(7:0,7),'@(31:0,31)> - 25 - (7:0,7)
-            Markup span - Gen<None> - [ type='] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[type];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(14:0,14)> - [text/html] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:3
-                HtmlTokenType.Text;[text];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[html];
-            Markup span - Gen<LitAttr: @(23:0,23)> - [ invalid] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:2
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[invalid];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (32:0,32) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<input />] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:5
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Text;[input];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.ForwardSlash;[/];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 9 - (42:0,42)
-        Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (42:0,42) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..51)::51 - [<script type='text/html invalid'><input /></script>]
+    MarkupBlock - [0..51)::51
+        MarkupTagBlock - [0..33)::33 - [<script type='text/html invalid'>]
+            MarkupTextLiteral - [0..7)::7 - [<script] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+            MarkupAttributeBlock - [7..32)::25 - [ type='text/html invalid']
+                MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [8..12)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[type];
+                Equals;[=];
+                MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [14..31)::17
+                    MarkupLiteralAttributeValue - [14..23)::9 - [text/html]
+                        MarkupTextLiteral - [14..23)::9 - [text/html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[text];
+                            ForwardSlash;[/];
+                            Text;[html];
+                    MarkupLiteralAttributeValue - [23..31)::8 - [ invalid]
+                        MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [24..31)::7 - [invalid] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[invalid];
+                MarkupTextLiteral - [31..32)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupTextLiteral - [32..33)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+        MarkupTextLiteral - [33..42)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[input];
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
+        MarkupTagBlock - [42..51)::9 - [</script>]
+            MarkupTextLiteral - [42..51)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4.stree.txt
index 6fe2064616..50e28a2af1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesNotUnderstandTagHelpersInInvalidHtmlTypedScriptTags4.stree.txt
@@ -1,43 +1,52 @@
-Markup block - Gen<None> - 60 - (0:0,0)
-    Tag block - Gen<None> - 42 - (0:0,0)
-        Markup span - Gen<Markup> - [<script] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[script];
-        Markup block - Gen<Attr:type, type='@(7:0,7),'@(23:0,23)> - 17 - (7:0,7)
-            Markup span - Gen<None> - [ type='] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[type];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(14:0,14)> - [text/ng-*] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:3
-                HtmlTokenType.Text;[text];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[ng-*];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:type, type='@(24:0,24),'@(40:0,40)> - 17 - (24:0,24)
-            Markup span - Gen<None> - [ type='] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[type];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(31:0,31)> - [text/html] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:3
-                HtmlTokenType.Text;[text];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[html];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [<input />] - SpanEditHandler;Accepts:Any - (42:0,42) - Tokens:5
-        HtmlTokenType.OpenAngle;[<];
-        HtmlTokenType.Text;[input];
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.ForwardSlash;[/];
-        HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 9 - (51:0,51)
-        Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (51:0,51) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..60)::60 - [<script type='text/ng-*' type='text/html'><input /></script>]
+    MarkupBlock - [0..60)::60
+        MarkupTagBlock - [0..42)::42 - [<script type='text/ng-*' type='text/html'>]
+            MarkupTextLiteral - [0..7)::7 - [<script] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+            MarkupAttributeBlock - [7..24)::17 - [ type='text/ng-*']
+                MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [8..12)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[type];
+                Equals;[=];
+                MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [14..23)::9
+                    MarkupLiteralAttributeValue - [14..23)::9 - [text/ng-*]
+                        MarkupTextLiteral - [14..23)::9 - [text/ng-*] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[text];
+                            ForwardSlash;[/];
+                            Text;[ng-*];
+                MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupAttributeBlock - [24..41)::17 - [ type='text/html']
+                MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [25..29)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[type];
+                Equals;[=];
+                MarkupTextLiteral - [30..31)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [31..40)::9
+                    MarkupLiteralAttributeValue - [31..40)::9 - [text/html]
+                        MarkupTextLiteral - [31..40)::9 - [text/html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[text];
+                            ForwardSlash;[/];
+                            Text;[html];
+                MarkupTextLiteral - [40..41)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupTextLiteral - [41..42)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+        MarkupTextLiteral - [42..51)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            OpenAngle;[<];
+            Text;[input];
+            Whitespace;[ ];
+            ForwardSlash;[/];
+            CloseAngle;[>];
+        MarkupTagBlock - [51..60)::9 - [</script>]
+            MarkupTextLiteral - [51..60)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.cspans.txt
index 1223450113..9c63d02543 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.cspans.txt
@@ -1,3 +1,3 @@
 Markup span at (3:0,3 [4] ) (Accepts:None) - Parent: HtmlComment block at (3:0,3 [12] )
-Markup span at (7:0,7 [5] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (3:0,3 [12] )
+Markup span at (7:0,7 [5] ) (Accepts:Whitespace) - Parent: HtmlComment block at (3:0,3 [12] )
 Markup span at (12:0,12 [3] ) (Accepts:None) - Parent: HtmlComment block at (3:0,3 [12] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.stree.txt
index 8ceae2c03a..5aaa74ba02 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/DoesntAllowSimpleHtmlCommentsAsChildrenWhenFeatureFlagIsOff.stree.txt
@@ -1,13 +1,24 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Tag block - Gen<TagHelper> - 19 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        HtmlComment block - Gen<None> - 12 - (3:0,3)
-            Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Bang;[!];
-                HtmlTokenType.DoubleHyphen;[--];
-            Markup span - Gen<Markup> - [Hello] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-                HtmlTokenType.Text;[Hello];
-            Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:2
-                HtmlTokenType.DoubleHyphen;[--];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..19)::19 - [<p><!--Hello--></p>]
+    MarkupBlock - [0..19)::19
+        MarkupTagHelperElement - [0..19)::19 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupCommentBlock - [3..15)::12
+                MarkupTextLiteral - [3..7)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Bang;[!];
+                    DoubleHyphen;[--];
+                MarkupTextLiteral - [7..12)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                    Text;[Hello];
+                MarkupTextLiteral - [12..15)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    DoubleHyphen;[--];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [15..19)::4
+                MarkupTextLiteral - [15..19)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.cspans.txt
index e9a5ad8e7b..fe9f0e011c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.cspans.txt
@@ -1,7 +1,7 @@
 Markup span at (3:0,3 [4] ) (Accepts:None) - Parent: HtmlComment block at (3:0,3 [12] )
-Markup span at (7:0,7 [5] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (3:0,3 [12] )
+Markup span at (7:0,7 [5] ) (Accepts:Whitespace) - Parent: HtmlComment block at (3:0,3 [12] )
 Markup span at (12:0,12 [3] ) (Accepts:None) - Parent: HtmlComment block at (3:0,3 [12] )
 Markup span at (15:0,15 [4] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [35] )
 Markup span at (19:0,19 [4] ) (Accepts:None) - Parent: HtmlComment block at (19:0,19 [12] )
-Markup span at (23:0,23 [5] ) (Accepts:WhiteSpace) - Parent: HtmlComment block at (19:0,19 [12] )
+Markup span at (23:0,23 [5] ) (Accepts:Whitespace) - Parent: HtmlComment block at (19:0,19 [12] )
 Markup span at (28:0,28 [3] ) (Accepts:None) - Parent: HtmlComment block at (19:0,19 [12] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.stree.txt
index c309a92c61..783308c6ae 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/FailsForContentWithCommentsAsChildren.stree.txt
@@ -1,25 +1,36 @@
-Markup block - Gen<None> - 35 - (0:0,0)
-    Tag block - Gen<TagHelper> - 35 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        HtmlComment block - Gen<None> - 12 - (3:0,3)
-            Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Bang;[!];
-                HtmlTokenType.DoubleHyphen;[--];
-            Markup span - Gen<Markup> - [Hello] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1
-                HtmlTokenType.Text;[Hello];
-            Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:2
-                HtmlTokenType.DoubleHyphen;[--];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [asdf] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-            HtmlTokenType.Text;[asdf];
-        HtmlComment block - Gen<None> - 12 - (19:0,19)
-            Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Bang;[!];
-                HtmlTokenType.DoubleHyphen;[--];
-            Markup span - Gen<Markup> - [World] - SpanEditHandler;Accepts:WhiteSpace - (23:0,23) - Tokens:1
-                HtmlTokenType.Text;[World];
-            Markup span - Gen<Markup> - [-->] - SpanEditHandler;Accepts:None - (28:0,28) - Tokens:2
-                HtmlTokenType.DoubleHyphen;[--];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..35)::35 - [<p><!--Hello-->asdf<!--World--></p>]
+    MarkupBlock - [0..35)::35
+        MarkupTagHelperElement - [0..35)::35 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupCommentBlock - [3..15)::12
+                MarkupTextLiteral - [3..7)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Bang;[!];
+                    DoubleHyphen;[--];
+                MarkupTextLiteral - [7..12)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                    Text;[Hello];
+                MarkupTextLiteral - [12..15)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    DoubleHyphen;[--];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [15..19)::4 - [asdf] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[asdf];
+            MarkupCommentBlock - [19..31)::12
+                MarkupTextLiteral - [19..23)::4 - [<!--] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    OpenAngle;[<];
+                    Bang;[!];
+                    DoubleHyphen;[--];
+                MarkupTextLiteral - [23..28)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Whitespace
+                    Text;[World];
+                MarkupTextLiteral - [28..31)::3 - [-->] - Gen<Markup> - SpanEditHandler;Accepts:None
+                    DoubleHyphen;[--];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [31..35)::4
+                MarkupTextLiteral - [31..35)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesMalformedNestedNonTagHelperTags_Correctly.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesMalformedNestedNonTagHelperTags_Correctly.stree.txt
index f5cfaf9032..8c0e0bf6a9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesMalformedNestedNonTagHelperTags_Correctly.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/HandlesMalformedNestedNonTagHelperTags_Correctly.stree.txt
@@ -1,24 +1,28 @@
-Markup block - Gen<None> - 14 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<div>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-    Statement block - Gen<None> - 9 - (5:0,5)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:1
-            CSharpTokenType.LeftBrace;[{];
-        Markup block - Gen<None> - 6 - (7:0,7)
-            Tag block - Gen<None> - 6 - (7:0,7)
-                Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:None - (7:0,7) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[div];
-                    HtmlTokenType.CloseAngle;[>];
-        Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-            CSharpTokenType.Unknown;[];
-        MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
-            CSharpTokenType.RightBrace;[}];
-    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-        HtmlTokenType.Unknown;[];
+RazorDocument - [0..14)::14 - [<div>@{</div>}]
+    MarkupBlock - [0..14)::14
+        MarkupTagBlock - [0..5)::5 - [<div>]
+            MarkupTextLiteral - [0..5)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+        CSharpCodeBlock - [5..14)::9
+            CSharpStatement - [5..14)::9
+                CSharpTransition - [5..6)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [6..14)::8
+                    RazorMetaCode - [6..7)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [7..13)::6
+                        MarkupBlock - [7..13)::6
+                            MarkupTagBlock - [7..13)::6 - [</div>]
+                                MarkupTextLiteral - [7..13)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[div];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [13..13)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [14..14)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.stree.txt
index 2674aa214d..dc6a45ec30 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/InvalidStructure_UnderstandsTHPrefixAndAllowedChildrenAndRequireParent.stree.txt
@@ -1,9 +1,20 @@
-Markup block - Gen<None> - 25 - (0:0,0)
-    Tag block - Gen<TagHelper> - 25 - (0:0,0) - th:p - PTagHelper
-        StartTagAndEndTag - <th:p> ... </th:p>
-        Tag block - Gen<None> - 12 - (6:0,6)
-            Markup span - Gen<Markup> - [</th:strong>] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[th:strong];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..25)::25 - [<th:p></th:strong></th:p>]
+    MarkupBlock - [0..25)::25
+        MarkupTagHelperElement - [0..25)::25 - th:p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..6)::6
+                MarkupTextLiteral - [0..6)::6 - [<th:p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[th:p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [6..18)::12 - [</th:strong>]
+                MarkupTextLiteral - [6..18)::12 - [</th:strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[th:strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [18..25)::7
+                MarkupTextLiteral - [18..25)::7 - [</th:p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[th:p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt
index f637c4bdf2..e54b169ecd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt
@@ -1,17 +1,40 @@
-Markup block - Gen<None> - 26 - (0:0,0)
-    Tag block - Gen<TagHelper> - 26 - (0:0,0) - p - pTagHelper
-        StartTagAndEndTag - <p class="btn"> ... </p>
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        Tag block - Gen<None> - 3 - (15:0,15)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 4 - (18:0,18)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..26)::26 - [<p class="btn"><p></p></p>]
+    MarkupBlock - [0..26)::26
+        MarkupTagHelperElement - [0..26)::26 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [14..15)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagBlock - [15..18)::3 - [<p>]
+                MarkupTextLiteral - [15..18)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [18..22)::4 - [</p>]
+                MarkupTextLiteral - [18..22)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [22..26)::4
+                MarkupTextLiteral - [22..26)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt
index 14cd402596..738d2bf692 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt
@@ -1,44 +1,89 @@
-Markup block - Gen<None> - 113 - (0:0,0)
-    Tag block - Gen<TagHelper> - 113 - (0:0,0) - strong - catchAllTagHelper
-        StartTagAndEndTag - <strong catchAll="hi"> ... </strong>
-        catchAll - DoubleQuotes
-            Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
-                HtmlTokenType.Text;[hi];
-        Tag block - Gen<None> - 8 - (22:0,22)
-            Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 8 - (30:0,30)
-            Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<TagHelper> - 48 - (38:0,38) - strong - catchAllTagHelper
-            StartTagAndEndTag - <strong catchAll="hi"> ... </strong>
-            catchAll - DoubleQuotes
-                Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (56:0,56) - Tokens:1
-                    HtmlTokenType.Text;[hi];
-            Tag block - Gen<None> - 8 - (60:0,60)
-                Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (60:0,60) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[strong];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 9 - (68:0,68)
-                Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (68:0,68) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[strong];
-                    HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 9 - (86:0,86)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (86:0,86) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 9 - (95:0,95)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (95:0,95) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..113)::113 - [<strong catchAll="hi"><strong><strong><strong catchAll="hi"><strong></strong></strong></strong></strong></strong>]
+    MarkupBlock - [0..113)::113
+        MarkupTagHelperElement - [0..113)::113 - strong[StartTagAndEndTag] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..22)::22
+                MarkupTextLiteral - [0..7)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                MarkupTagHelperAttribute - [7..21)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..20)::2
+                        MarkupLiteralAttributeValue - [18..20)::2 - [hi]
+                            MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [21..22)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagBlock - [22..30)::8 - [<strong>]
+                MarkupTextLiteral - [22..30)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagBlock - [30..38)::8 - [<strong>]
+                MarkupTextLiteral - [30..38)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [38..86)::48 - strong[StartTagAndEndTag] - catchAllTagHelper
+                MarkupTagHelperStartTag - [38..60)::22
+                    MarkupTextLiteral - [38..45)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                    MarkupTagHelperAttribute - [45..59)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                        MarkupTextLiteral - [45..46)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [46..54)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[catchAll];
+                        Equals;[=];
+                        MarkupTextLiteral - [55..56)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [56..58)::2
+                            MarkupLiteralAttributeValue - [56..58)::2 - [hi]
+                                MarkupTextLiteral - [56..58)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[hi];
+                        MarkupTextLiteral - [58..59)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    MarkupTextLiteral - [59..60)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        CloseAngle;[>];
+                MarkupTagBlock - [60..68)::8 - [<strong>]
+                    MarkupTextLiteral - [60..68)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagBlock - [68..77)::9 - [</strong>]
+                    MarkupTextLiteral - [68..77)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [77..86)::9
+                    MarkupTextLiteral - [77..86)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTagBlock - [86..95)::9 - [</strong>]
+                MarkupTextLiteral - [86..95)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagBlock - [95..104)::9 - [</strong>]
+                MarkupTextLiteral - [95..104)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [104..113)::9
+                MarkupTextLiteral - [104..113)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt
index 213ba8e67a..a6bd0c5f0a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt
@@ -1,17 +1,40 @@
-Markup block - Gen<None> - 48 - (0:0,0)
-    Tag block - Gen<TagHelper> - 48 - (0:0,0) - strong - catchAllTagHelper
-        StartTagAndEndTag - <strong catchAll="hi"> ... </strong>
-        catchAll - DoubleQuotes
-            Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
-                HtmlTokenType.Text;[hi];
-        Tag block - Gen<None> - 8 - (22:0,22)
-            Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 9 - (30:0,30)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..48)::48 - [<strong catchAll="hi"><strong></strong></strong>]
+    MarkupBlock - [0..48)::48
+        MarkupTagHelperElement - [0..48)::48 - strong[StartTagAndEndTag] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..22)::22
+                MarkupTextLiteral - [0..7)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                MarkupTagHelperAttribute - [7..21)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..20)::2
+                        MarkupLiteralAttributeValue - [18..20)::2 - [hi]
+                            MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [21..22)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagBlock - [22..30)::8 - [<strong>]
+                MarkupTextLiteral - [22..30)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagBlock - [30..39)::9 - [</strong>]
+                MarkupTextLiteral - [30..39)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [39..48)::9
+                MarkupTextLiteral - [39..48)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt
index 411d03d813..65212d9fe6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt
@@ -1,28 +1,51 @@
-Markup block - Gen<None> - 43 - (0:0,0)
-    Tag block - Gen<TagHelper> - 43 - (0:0,0) - p - pTagHelper
-        StartTagAndEndTag - <p class="btn"> ... </p>
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        Tag block - Gen<None> - 8 - (15:0,15)
-            Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 3 - (23:0,23)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 4 - (26:0,26)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 9 - (30:0,30)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..43)::43 - [<p class="btn"><strong><p></p></strong></p>]
+    MarkupBlock - [0..43)::43
+        MarkupTagHelperElement - [0..43)::43 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [14..15)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagBlock - [15..23)::8 - [<strong>]
+                MarkupTextLiteral - [15..23)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagBlock - [23..26)::3 - [<p>]
+                MarkupTextLiteral - [23..26)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [26..30)::4 - [</p>]
+                MarkupTextLiteral - [26..30)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [30..39)::9 - [</strong>]
+                MarkupTextLiteral - [30..39)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [39..43)::4
+                MarkupTextLiteral - [39..43)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt
index 5a246f3b0c..7dab44ec9c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt
@@ -1,28 +1,51 @@
-Markup block - Gen<None> - 55 - (0:0,0)
-    Tag block - Gen<TagHelper> - 55 - (0:0,0) - strong - catchAllTagHelper
-        StartTagAndEndTag - <strong catchAll="hi"> ... </strong>
-        catchAll - DoubleQuotes
-            Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
-                HtmlTokenType.Text;[hi];
-        Tag block - Gen<None> - 3 - (22:0,22)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 8 - (25:0,25)
-            Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 9 - (33:0,33)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 4 - (42:0,42)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (42:0,42) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..55)::55 - [<strong catchAll="hi"><p><strong></strong></p></strong>]
+    MarkupBlock - [0..55)::55
+        MarkupTagHelperElement - [0..55)::55 - strong[StartTagAndEndTag] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..22)::22
+                MarkupTextLiteral - [0..7)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                MarkupTagHelperAttribute - [7..21)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..20)::2
+                        MarkupLiteralAttributeValue - [18..20)::2 - [hi]
+                            MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [21..22)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagBlock - [22..25)::3 - [<p>]
+                MarkupTextLiteral - [22..25)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [25..33)::8 - [<strong>]
+                MarkupTextLiteral - [25..33)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagBlock - [33..42)::9 - [</strong>]
+                MarkupTextLiteral - [33..42)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagBlock - [42..46)::4 - [</p>]
+                MarkupTextLiteral - [42..46)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [46..55)::9
+                MarkupTextLiteral - [46..55)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt
index a3d42265a4..b9ccf75205 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt
@@ -1,22 +1,67 @@
-Markup block - Gen<None> - 57 - (0:0,0)
-    Tag block - Gen<TagHelper> - 57 - (0:0,0) - p - pTagHelper
-        StartTagAndEndTag - <p class="btn"> ... </p>
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        Tag block - Gen<TagHelper> - 38 - (15:0,15) - strong - catchAllTagHelper
-            StartTagAndEndTag - <strong catchAll="hi"> ... </strong>
-            catchAll - DoubleQuotes
-                Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1
-                    HtmlTokenType.Text;[hi];
-            Tag block - Gen<None> - 3 - (37:0,37)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (37:0,37) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 4 - (40:0,40)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..57)::57 - [<p class="btn"><strong catchAll="hi"><p></p></strong></p>]
+    MarkupBlock - [0..57)::57
+        MarkupTagHelperElement - [0..57)::57 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [14..15)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [15..53)::38 - strong[StartTagAndEndTag] - catchAllTagHelper
+                MarkupTagHelperStartTag - [15..37)::22
+                    MarkupTextLiteral - [15..22)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                    MarkupTagHelperAttribute - [22..36)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                        MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [23..31)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[catchAll];
+                        Equals;[=];
+                        MarkupTextLiteral - [32..33)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [33..35)::2
+                            MarkupLiteralAttributeValue - [33..35)::2 - [hi]
+                                MarkupTextLiteral - [33..35)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[hi];
+                        MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    MarkupTextLiteral - [36..37)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        CloseAngle;[>];
+                MarkupTagBlock - [37..40)::3 - [<p>]
+                    MarkupTextLiteral - [37..40)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTagBlock - [40..44)::4 - [</p>]
+                    MarkupTextLiteral - [40..44)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [44..53)::9
+                    MarkupTextLiteral - [44..53)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [53..57)::4
+                MarkupTextLiteral - [53..57)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt
index 7692de9ad3..b0a00277a5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt
@@ -1,22 +1,67 @@
-Markup block - Gen<None> - 67 - (0:0,0)
-    Tag block - Gen<TagHelper> - 67 - (0:0,0) - strong - catchAllTagHelper
-        StartTagAndEndTag - <strong catchAll="hi"> ... </strong>
-        catchAll - DoubleQuotes
-            Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
-                HtmlTokenType.Text;[hi];
-        Tag block - Gen<TagHelper> - 36 - (22:0,22) - p - pTagHelper
-            StartTagAndEndTag - <p class="btn"> ... </p>
-            class - DoubleQuotes
-                Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (32:0,32) - Tokens:1
-                    HtmlTokenType.Text;[btn];
-            Tag block - Gen<None> - 8 - (37:0,37)
-                Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (37:0,37) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[strong];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 9 - (45:0,45)
-                Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (45:0,45) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[strong];
-                    HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..67)::67 - [<strong catchAll="hi"><p class="btn"><strong></strong></p></strong>]
+    MarkupBlock - [0..67)::67
+        MarkupTagHelperElement - [0..67)::67 - strong[StartTagAndEndTag] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..22)::22
+                MarkupTextLiteral - [0..7)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                MarkupTagHelperAttribute - [7..21)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..20)::2
+                        MarkupLiteralAttributeValue - [18..20)::2 - [hi]
+                            MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [21..22)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [22..58)::36 - p[StartTagAndEndTag] - pTagHelper
+                MarkupTagHelperStartTag - [22..37)::15
+                    MarkupTextLiteral - [22..24)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                    MarkupTagHelperAttribute - [24..36)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                        MarkupTextLiteral - [24..25)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [25..30)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[class];
+                        Equals;[=];
+                        MarkupTextLiteral - [31..32)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [32..35)::3
+                            MarkupLiteralAttributeValue - [32..35)::3 - [btn]
+                                MarkupTextLiteral - [32..35)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[btn];
+                        MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    MarkupTextLiteral - [36..37)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        CloseAngle;[>];
+                MarkupTagBlock - [37..45)::8 - [<strong>]
+                    MarkupTextLiteral - [37..45)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagBlock - [45..54)::9 - [</strong>]
+                    MarkupTextLiteral - [45..54)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [54..58)::4
+                    MarkupTextLiteral - [54..58)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [58..67)::9
+                MarkupTextLiteral - [58..67)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt
index bcec7e2626..2488a556b3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt
@@ -1,22 +1,67 @@
-Markup block - Gen<None> - 45 - (0:0,0)
-    Tag block - Gen<TagHelper> - 45 - (0:0,0) - p - pTagHelper
-        StartTagAndEndTag - <p class="btn"> ... </p>
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        Tag block - Gen<TagHelper> - 26 - (15:0,15) - p - pTagHelper
-            StartTagAndEndTag - <p class="btn"> ... </p>
-            class - DoubleQuotes
-                Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
-                    HtmlTokenType.Text;[btn];
-            Tag block - Gen<None> - 3 - (30:0,30)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 4 - (33:0,33)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..45)::45 - [<p class="btn"><p class="btn"><p></p></p></p>]
+    MarkupBlock - [0..45)::45
+        MarkupTagHelperElement - [0..45)::45 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [14..15)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [15..41)::26 - p[StartTagAndEndTag] - pTagHelper
+                MarkupTagHelperStartTag - [15..30)::15
+                    MarkupTextLiteral - [15..17)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                    MarkupTagHelperAttribute - [17..29)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                        MarkupTextLiteral - [17..18)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [18..23)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[class];
+                        Equals;[=];
+                        MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [25..28)::3
+                            MarkupLiteralAttributeValue - [25..28)::3 - [btn]
+                                MarkupTextLiteral - [25..28)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[btn];
+                        MarkupTextLiteral - [28..29)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    MarkupTextLiteral - [29..30)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        CloseAngle;[>];
+                MarkupTagBlock - [30..33)::3 - [<p>]
+                    MarkupTextLiteral - [30..33)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTagBlock - [33..37)::4 - [</p>]
+                    MarkupTextLiteral - [33..37)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [37..41)::4
+                    MarkupTextLiteral - [37..41)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [41..45)::4
+                MarkupTextLiteral - [41..45)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt
index 353b990f23..581ce34688 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt
@@ -1,22 +1,67 @@
-Markup block - Gen<None> - 79 - (0:0,0)
-    Tag block - Gen<TagHelper> - 79 - (0:0,0) - strong - catchAllTagHelper
-        StartTagAndEndTag - <strong catchAll="hi"> ... </strong>
-        catchAll - DoubleQuotes
-            Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
-                HtmlTokenType.Text;[hi];
-        Tag block - Gen<TagHelper> - 48 - (22:0,22) - strong - catchAllTagHelper
-            StartTagAndEndTag - <strong catchAll="hi"> ... </strong>
-            catchAll - DoubleQuotes
-                Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:1
-                    HtmlTokenType.Text;[hi];
-            Tag block - Gen<None> - 8 - (44:0,44)
-                Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (44:0,44) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[strong];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 9 - (52:0,52)
-                Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (52:0,52) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[strong];
-                    HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..79)::79 - [<strong catchAll="hi"><strong catchAll="hi"><strong></strong></strong></strong>]
+    MarkupBlock - [0..79)::79
+        MarkupTagHelperElement - [0..79)::79 - strong[StartTagAndEndTag] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..22)::22
+                MarkupTextLiteral - [0..7)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                MarkupTagHelperAttribute - [7..21)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..20)::2
+                        MarkupLiteralAttributeValue - [18..20)::2 - [hi]
+                            MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [21..22)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [22..70)::48 - strong[StartTagAndEndTag] - catchAllTagHelper
+                MarkupTagHelperStartTag - [22..44)::22
+                    MarkupTextLiteral - [22..29)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                    MarkupTagHelperAttribute - [29..43)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                        MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [30..38)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[catchAll];
+                        Equals;[=];
+                        MarkupTextLiteral - [39..40)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [40..42)::2
+                            MarkupLiteralAttributeValue - [40..42)::2 - [hi]
+                                MarkupTextLiteral - [40..42)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[hi];
+                        MarkupTextLiteral - [42..43)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    MarkupTextLiteral - [43..44)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        CloseAngle;[>];
+                MarkupTagBlock - [44..52)::8 - [<strong>]
+                    MarkupTextLiteral - [44..52)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagBlock - [52..61)::9 - [</strong>]
+                    MarkupTextLiteral - [52..61)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [61..70)::9
+                    MarkupTextLiteral - [61..70)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [70..79)::9
+                MarkupTextLiteral - [70..79)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt
index b354fce961..7a7ed95c39 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NestedRequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt
@@ -1,44 +1,89 @@
-Markup block - Gen<None> - 59 - (0:0,0)
-    Tag block - Gen<TagHelper> - 59 - (0:0,0) - p - pTagHelper
-        StartTagAndEndTag - <p class="btn"> ... </p>
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        Tag block - Gen<None> - 3 - (15:0,15)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 3 - (18:0,18)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<TagHelper> - 26 - (21:0,21) - p - pTagHelper
-            StartTagAndEndTag - <p class="btn"> ... </p>
-            class - DoubleQuotes
-                Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
-                    HtmlTokenType.Text;[btn];
-            Tag block - Gen<None> - 3 - (36:0,36)
-                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 4 - (39:0,39)
-                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[p];
-                    HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 4 - (47:0,47)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 4 - (51:0,51)
-            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (51:0,51) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..59)::59 - [<p class="btn"><p><p><p class="btn"><p></p></p></p></p></p>]
+    MarkupBlock - [0..59)::59
+        MarkupTagHelperElement - [0..59)::59 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [14..15)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagBlock - [15..18)::3 - [<p>]
+                MarkupTextLiteral - [15..18)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [18..21)::3 - [<p>]
+                MarkupTextLiteral - [18..21)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [21..47)::26 - p[StartTagAndEndTag] - pTagHelper
+                MarkupTagHelperStartTag - [21..36)::15
+                    MarkupTextLiteral - [21..23)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                    MarkupTagHelperAttribute - [23..35)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                        MarkupTextLiteral - [23..24)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Whitespace;[ ];
+                        MarkupTextLiteral - [24..29)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[class];
+                        Equals;[=];
+                        MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                        MarkupTagHelperAttributeValue - [31..34)::3
+                            MarkupLiteralAttributeValue - [31..34)::3 - [btn]
+                                MarkupTextLiteral - [31..34)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[btn];
+                        MarkupTextLiteral - [34..35)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                            DoubleQuote;["];
+                    MarkupTextLiteral - [35..36)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        CloseAngle;[>];
+                MarkupTagBlock - [36..39)::3 - [<p>]
+                    MarkupTextLiteral - [36..39)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTagBlock - [39..43)::4 - [</p>]
+                    MarkupTextLiteral - [39..43)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [43..47)::4
+                    MarkupTextLiteral - [43..47)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+            MarkupTagBlock - [47..51)::4 - [</p>]
+                MarkupTextLiteral - [47..51)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [51..55)::4 - [</p>]
+                MarkupTextLiteral - [51..55)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [55..59)::4
+                MarkupTextLiteral - [55..59)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren.stree.txt
index 35f3c5a2ed..fb55ceeabd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/NonTagHelperChild_UnderstandsTagHelperPrefixAndAllowedChildren.stree.txt
@@ -1,14 +1,25 @@
-Markup block - Gen<None> - 30 - (0:0,0)
-    Tag block - Gen<TagHelper> - 30 - (0:0,0) - th:p - PTagHelper
-        StartTagAndEndTag - <th:p> ... </th:p>
-        Tag block - Gen<None> - 8 - (6:0,6)
-            Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 9 - (14:0,14)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..30)::30 - [<th:p><strong></strong></th:p>]
+    MarkupBlock - [0..30)::30
+        MarkupTagHelperElement - [0..30)::30 - th:p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..6)::6
+                MarkupTextLiteral - [0..6)::6 - [<th:p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[th:p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [6..14)::8 - [<strong>]
+                MarkupTextLiteral - [6..14)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagBlock - [14..23)::9 - [</strong>]
+                MarkupTextLiteral - [14..23)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [23..30)::7
+                MarkupTextLiteral - [23..30)::7 - [</th:p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[th:p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.stree.txt
index cd6a07bb28..2b838f60ea 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RecoversWhenRequiredAttributeMismatchAndRestrictedChildren.stree.txt
@@ -1,15 +1,31 @@
-Markup block - Gen<None> - 43 - (0:0,0)
-    Tag block - Gen<TagHelper> - 43 - (0:0,0) - strong - StrongTagHelper
-        StartTagAndEndTag - <strong required> ... </strong>
-        required - Minimized
-        Tag block - Gen<None> - 8 - (17:0,17)
-            Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 9 - (25:0,25)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..43)::43 - [<strong required><strong></strong></strong>]
+    MarkupBlock - [0..43)::43
+        MarkupTagHelperElement - [0..43)::43 - strong[StartTagAndEndTag] - StrongTagHelper
+            MarkupTagHelperStartTag - [0..17)::17
+                MarkupTextLiteral - [0..7)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                MarkupMinimizedTagHelperAttribute - [7..16)::9 - required - Minimized - Unbound - [ required]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [required] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[required];
+                MarkupTextLiteral - [16..17)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagBlock - [17..25)::8 - [<strong>]
+                MarkupTextLiteral - [17..25)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagBlock - [25..34)::9 - [</strong>]
+                MarkupTextLiteral - [25..34)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [34..43)::9
+                MarkupTextLiteral - [34..43)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly1.stree.txt
index 398cf7cb83..eab1ac90d6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly1.stree.txt
@@ -1,5 +1,6 @@
-Markup block - Gen<None> - 2 - (0:0,0)
-    Tag block - Gen<None> - 2 - (0:0,0)
-        Markup span - Gen<Markup> - [<p] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
+RazorDocument - [0..2)::2 - [<p]
+    MarkupBlock - [0..2)::2
+        MarkupTagBlock - [0..2)::2 - [<p]
+            MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.stree.txt
index 6e5cb1d5ff..798f824dac 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly10.stree.txt
@@ -1,9 +1,42 @@
-Markup block - Gen<None> - 35 - (0:0,0)
-    Tag block - Gen<TagHelper> - 35 - (0:0,0) - p - pTagHelper
-        StartTagAndEndTag - <p notRequired="hi" class="btn"  ... </p
-        notRequired - DoubleQuotes
-            Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                HtmlTokenType.Text;[hi];
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..35)::35 - [<p notRequired="hi" class="btn" </p]
+    MarkupBlock - [0..35)::35
+        MarkupTagHelperElement - [0..35)::35 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..32)::32
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..19)::17 - notRequired - DoubleQuotes - Unbound - [ notRequired="hi"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[notRequired];
+                    Equals;[=];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [16..18)::2
+                        MarkupLiteralAttributeValue - [16..18)::2 - [hi]
+                            MarkupTextLiteral - [16..18)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [19..31)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [20..25)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [27..30)::3
+                        MarkupLiteralAttributeValue - [27..30)::3 - [btn]
+                            MarkupTextLiteral - [27..30)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+            MarkupTagHelperEndTag - [32..35)::3
+                MarkupTextLiteral - [32..35)::3 - [</p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.stree.txt
index 08f791be3a..503cfd3596 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly2.stree.txt
@@ -1,6 +1,21 @@
-Markup block - Gen<None> - 14 - (0:0,0)
-    Tag block - Gen<TagHelper> - 14 - (0:0,0) - p - pTagHelper
-        StartTagAndEndTag - <p class="btn"
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..14)::14 - [<p class="btn"]
+    MarkupBlock - [0..14)::14
+        MarkupTagHelperElement - [0..14)::14 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..14)::14
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.stree.txt
index db83c37ed3..fe9f393e93 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly3.stree.txt
@@ -1,9 +1,35 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<TagHelper> - 31 - (0:0,0) - p - pTagHelper
-        StartTagAndEndTag - <p notRequired="hi" class="btn"
-        notRequired - DoubleQuotes
-            Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                HtmlTokenType.Text;[hi];
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..31)::31 - [<p notRequired="hi" class="btn"]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..31)::31
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..19)::17 - notRequired - DoubleQuotes - Unbound - [ notRequired="hi"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[notRequired];
+                    Equals;[=];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [16..18)::2
+                        MarkupLiteralAttributeValue - [16..18)::2 - [hi]
+                            MarkupTextLiteral - [16..18)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [19..31)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [20..25)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [27..30)::3
+                        MarkupLiteralAttributeValue - [27..30)::3 - [btn]
+                            MarkupTextLiteral - [27..30)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly4.stree.txt
index a2212a4de2..c5ba658722 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly4.stree.txt
@@ -1,11 +1,12 @@
-Markup block - Gen<None> - 6 - (0:0,0)
-    Tag block - Gen<None> - 3 - (0:0,0)
-        Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 3 - (3:0,3)
-        Markup span - Gen<Markup> - [</p] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
+RazorDocument - [0..6)::6 - [<p></p]
+    MarkupBlock - [0..6)::6
+        MarkupTagBlock - [0..3)::3 - [<p>]
+            MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTagBlock - [3..6)::3 - [</p]
+            MarkupTextLiteral - [3..6)::3 - [</p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.stree.txt
index f569c6f08f..79471e2440 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly5.stree.txt
@@ -1,6 +1,28 @@
-Markup block - Gen<None> - 18 - (0:0,0)
-    Tag block - Gen<TagHelper> - 18 - (0:0,0) - p - pTagHelper
-        StartTagAndEndTag - <p class="btn"> ... </p
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..18)::18 - [<p class="btn"></p]
+    MarkupBlock - [0..18)::18
+        MarkupTagHelperElement - [0..18)::18 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [14..15)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [15..18)::3
+                MarkupTextLiteral - [15..18)::3 - [</p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.stree.txt
index 3292c9f3b4..f462c67c7b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly6.stree.txt
@@ -1,9 +1,42 @@
-Markup block - Gen<None> - 35 - (0:0,0)
-    Tag block - Gen<TagHelper> - 35 - (0:0,0) - p - pTagHelper
-        StartTagAndEndTag - <p notRequired="hi" class="btn"> ... </p
-        notRequired - DoubleQuotes
-            Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                HtmlTokenType.Text;[hi];
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..35)::35 - [<p notRequired="hi" class="btn"></p]
+    MarkupBlock - [0..35)::35
+        MarkupTagHelperElement - [0..35)::35 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..32)::32
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..19)::17 - notRequired - DoubleQuotes - Unbound - [ notRequired="hi"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[notRequired];
+                    Equals;[=];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [16..18)::2
+                        MarkupLiteralAttributeValue - [16..18)::2 - [hi]
+                            MarkupTextLiteral - [16..18)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [19..31)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [20..25)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [27..30)::3
+                        MarkupLiteralAttributeValue - [27..30)::3 - [btn]
+                            MarkupTextLiteral - [27..30)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [31..32)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [32..35)::3
+                MarkupTextLiteral - [32..35)::3 - [</p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.stree.txt
index 25c1b1b422..31df019683 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly7.stree.txt
@@ -1,11 +1,28 @@
-Markup block - Gen<None> - 18 - (0:0,0)
-    Tag block - Gen<TagHelper> - 18 - (0:0,0) - p - pTagHelper
-        StartTagAndEndTag - <p class="btn" 
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        Tag block - Gen<None> - 3 - (15:0,15)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..18)::18 - [<p class="btn" <p>]
+    MarkupBlock - [0..18)::18
+        MarkupTagHelperElement - [0..18)::18 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+            MarkupTagBlock - [15..18)::3 - [<p>]
+                MarkupTextLiteral - [15..18)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.stree.txt
index 465630c643..b52a99bf86 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly8.stree.txt
@@ -1,14 +1,42 @@
-Markup block - Gen<None> - 35 - (0:0,0)
-    Tag block - Gen<TagHelper> - 35 - (0:0,0) - p - pTagHelper
-        StartTagAndEndTag - <p notRequired="hi" class="btn" 
-        notRequired - DoubleQuotes
-            Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                HtmlTokenType.Text;[hi];
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        Tag block - Gen<None> - 3 - (32:0,32)
-            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (32:0,32) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[p];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..35)::35 - [<p notRequired="hi" class="btn" <p>]
+    MarkupBlock - [0..35)::35
+        MarkupTagHelperElement - [0..35)::35 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..32)::32
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..19)::17 - notRequired - DoubleQuotes - Unbound - [ notRequired="hi"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[notRequired];
+                    Equals;[=];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [16..18)::2
+                        MarkupLiteralAttributeValue - [16..18)::2 - [hi]
+                            MarkupTextLiteral - [16..18)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [18..19)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [19..31)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [20..25)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [26..27)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [27..30)::3
+                        MarkupLiteralAttributeValue - [27..30)::3 - [btn]
+                            MarkupTextLiteral - [27..30)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [30..31)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [31..32)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+            MarkupTagBlock - [32..35)::3 - [<p>]
+                MarkupTextLiteral - [32..35)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.stree.txt
index 99dc387acf..9656211311 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateMalformedTagHelperBlocksCorrectly9.stree.txt
@@ -1,6 +1,28 @@
-Markup block - Gen<None> - 18 - (0:0,0)
-    Tag block - Gen<TagHelper> - 18 - (0:0,0) - p - pTagHelper
-        StartTagAndEndTag - <p class="btn"  ... </p
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..18)::18 - [<p class="btn" </p]
+    MarkupBlock - [0..18)::18
+        MarkupTagHelperElement - [0..18)::18 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+            MarkupTagHelperEndTag - [15..18)::3
+                MarkupTextLiteral - [15..18)::3 - [</p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt
index 6e0529764e..113a5935e0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly1.stree.txt
@@ -1,8 +1,9 @@
-Markup block - Gen<None> - 5 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<p />] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:5
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..5)::5 - [<p />]
+    MarkupBlock - [0..5)::5
+        MarkupTagBlock - [0..5)::5 - [<p />]
+            MarkupTextLiteral - [0..5)::5 - [<p />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt
index 02695391c6..f32b50574a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly10.stree.txt
@@ -1,6 +1,25 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Tag block - Gen<TagHelper> - 24 - (0:0,0) - strong - catchAllTagHelper
-        SelfClosing - <strong catchAll="hi" />
-        catchAll - DoubleQuotes
-            Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
-                HtmlTokenType.Text;[hi];
+RazorDocument - [0..24)::24 - [<strong catchAll="hi" />]
+    MarkupBlock - [0..24)::24
+        MarkupTagHelperElement - [0..24)::24 - strong[SelfClosing] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..24)::24
+                MarkupTextLiteral - [0..7)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                MarkupTagHelperAttribute - [7..21)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..20)::2
+                        MarkupLiteralAttributeValue - [18..20)::2 - [hi]
+                            MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [21..24)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.cspans.txt
index 73b39ae825..b5022db073 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (18:0,18 [1] ) (Accepts:None) - Parent: Expression block at (18:0,18 [13] )
-Code span at (19:0,19 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (18:0,18 [13] )
+Code span at (19:0,19 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (18:0,18 [13] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.stree.txt
index dcdb0afa1b..37b1184828 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly11.stree.txt
@@ -1,13 +1,34 @@
-Markup block - Gen<None> - 35 - (0:0,0)
-    Tag block - Gen<TagHelper> - 35 - (0:0,0) - strong - catchAllTagHelper
-        SelfClosing - <strong catchAll="@DateTime.Now" />
-        catchAll - DoubleQuotes
-            Markup block - Gen<None> - 13 - (18:0,18)
-                Markup block - Gen<DynAttr:@(18:0,18)> - 13 - (18:0,18)
-                    Expression block - Gen<Expr> - 13 - (18:0,18)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (19:0,19) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
+RazorDocument - [0..35)::35 - [<strong catchAll="@DateTime.Now" />]
+    MarkupBlock - [0..35)::35
+        MarkupTagHelperElement - [0..35)::35 - strong[SelfClosing] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..35)::35
+                MarkupTextLiteral - [0..7)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                MarkupTagHelperAttribute - [7..32)::25 - catchAll - DoubleQuotes - Unbound - [ catchAll="@DateTime.Now"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..31)::13
+                        MarkupDynamicAttributeValue - [18..31)::13 - [@DateTime.Now]
+                            GenericBlock - [18..31)::13
+                                CSharpCodeBlock - [18..31)::13
+                                    CSharpImplicitExpression - [18..31)::13
+                                        CSharpTransition - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [19..31)::12
+                                            CSharpCodeBlock - [19..31)::12
+                                                CSharpExpressionLiteral - [19..31)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [31..32)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [32..35)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.stree.txt
index e4144deee1..8f5dcd54c3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly12.stree.txt
@@ -1,12 +1,35 @@
-Markup block - Gen<None> - 47 - (0:0,0)
-    Tag block - Gen<TagHelper> - 47 - (0:0,0) - strong - catchAllTagHelper
-        StartTagAndEndTag - <strong catchAll="hi"> ... </strong>
-        catchAll - DoubleQuotes
-            Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
-                HtmlTokenType.Text;[hi];
-        Markup span - Gen<Markup> - [words and spaces] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:5
-            HtmlTokenType.Text;[words];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[and];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[spaces];
+RazorDocument - [0..47)::47 - [<strong catchAll="hi">words and spaces</strong>]
+    MarkupBlock - [0..47)::47
+        MarkupTagHelperElement - [0..47)::47 - strong[StartTagAndEndTag] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..22)::22
+                MarkupTextLiteral - [0..7)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                MarkupTagHelperAttribute - [7..21)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..20)::2
+                        MarkupLiteralAttributeValue - [18..20)::2 - [hi]
+                            MarkupTextLiteral - [18..20)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [21..22)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [22..38)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [38..47)::9
+                MarkupTextLiteral - [38..47)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.cspans.txt
index 7d4016d0c4..65ac8fc060 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.cspans.txt
@@ -1,3 +1,3 @@
 Transition span at (18:0,18 [1] ) (Accepts:None) - Parent: Expression block at (18:0,18 [13] )
-Code span at (19:0,19 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (18:0,18 [13] )
+Code span at (19:0,19 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (18:0,18 [13] )
 Markup span at (33:0,33 [16] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [58] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.stree.txt
index 611bd33126..ecbcdd1d8f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly13.stree.txt
@@ -1,19 +1,44 @@
-Markup block - Gen<None> - 58 - (0:0,0)
-    Tag block - Gen<TagHelper> - 58 - (0:0,0) - strong - catchAllTagHelper
-        StartTagAndEndTag - <strong catchAll="@DateTime.Now"> ... </strong>
-        catchAll - DoubleQuotes
-            Markup block - Gen<None> - 13 - (18:0,18)
-                Markup block - Gen<DynAttr:@(18:0,18)> - 13 - (18:0,18)
-                    Expression block - Gen<Expr> - 13 - (18:0,18)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (19:0,19) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        Markup span - Gen<Markup> - [words and spaces] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:5
-            HtmlTokenType.Text;[words];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[and];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[spaces];
+RazorDocument - [0..58)::58 - [<strong catchAll="@DateTime.Now">words and spaces</strong>]
+    MarkupBlock - [0..58)::58
+        MarkupTagHelperElement - [0..58)::58 - strong[StartTagAndEndTag] - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..33)::33
+                MarkupTextLiteral - [0..7)::7 - [<strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                MarkupTagHelperAttribute - [7..32)::25 - catchAll - DoubleQuotes - Unbound - [ catchAll="@DateTime.Now"]
+                    MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [8..16)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [18..31)::13
+                        MarkupDynamicAttributeValue - [18..31)::13 - [@DateTime.Now]
+                            GenericBlock - [18..31)::13
+                                CSharpCodeBlock - [18..31)::13
+                                    CSharpImplicitExpression - [18..31)::13
+                                        CSharpTransition - [18..19)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [19..31)::12
+                                            CSharpCodeBlock - [19..31)::12
+                                                CSharpExpressionLiteral - [19..31)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [31..32)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [32..33)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [33..49)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [49..58)::9
+                MarkupTextLiteral - [49..58)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14.stree.txt
index 7715fc1bed..8d64367f85 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly14.stree.txt
@@ -1,19 +1,24 @@
-Markup block - Gen<None> - 19 - (0:0,0)
-    Tag block - Gen<None> - 19 - (0:0,0)
-        Markup span - Gen<Markup> - [<div] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[div];
-        Markup block - Gen<Attr:class, class="@(4:0,4),"@(15:0,15)> - 12 - (4:0,4)
-            Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[class];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<LitAttr:@(12:0,12)> - [btn] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                HtmlTokenType.Text;[btn];
-            Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-                HtmlTokenType.DoubleQuote;["];
-        Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:3
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..19)::19 - [<div class="btn" />]
+    MarkupBlock - [0..19)::19
+        MarkupTagBlock - [0..19)::19 - [<div class="btn" />]
+            MarkupTextLiteral - [0..4)::4 - [<div] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+            MarkupAttributeBlock - [4..16)::12 - [ class="btn"]
+                MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [5..10)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[class];
+                Equals;[=];
+                MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+                GenericBlock - [12..15)::3
+                    MarkupLiteralAttributeValue - [12..15)::3 - [btn]
+                        MarkupTextLiteral - [12..15)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[btn];
+                MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+            MarkupTextLiteral - [16..19)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15.stree.txt
index bbde51b698..0c736f6869 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly15.stree.txt
@@ -1,23 +1,28 @@
-Markup block - Gen<None> - 23 - (0:0,0)
-    Tag block - Gen<None> - 17 - (0:0,0)
-        Markup span - Gen<Markup> - [<div] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[div];
-        Markup block - Gen<Attr:class, class="@(4:0,4),"@(15:0,15)> - 12 - (4:0,4)
-            Markup span - Gen<None> - [ class="] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[class];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.DoubleQuote;["];
-            Markup span - Gen<LitAttr:@(12:0,12)> - [btn] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                HtmlTokenType.Text;[btn];
-            Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-                HtmlTokenType.DoubleQuote;["];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (17:0,17)
-        Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..23)::23 - [<div class="btn"></div>]
+    MarkupBlock - [0..23)::23
+        MarkupTagBlock - [0..17)::17 - [<div class="btn">]
+            MarkupTextLiteral - [0..4)::4 - [<div] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+            MarkupAttributeBlock - [4..16)::12 - [ class="btn"]
+                MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [5..10)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[class];
+                Equals;[=];
+                MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+                GenericBlock - [12..15)::3
+                    MarkupLiteralAttributeValue - [12..15)::3 - [btn]
+                        MarkupTextLiteral - [12..15)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[btn];
+                MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                    DoubleQuote;["];
+            MarkupTextLiteral - [16..17)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+        MarkupTagBlock - [17..23)::6 - [</div>]
+            MarkupTextLiteral - [17..23)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.stree.txt
index c575b30a9b..371ac6d994 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly16.stree.txt
@@ -1,9 +1,39 @@
-Markup block - Gen<None> - 33 - (0:0,0)
-    Tag block - Gen<TagHelper> - 33 - (0:0,0) - p - pTagHelper
-        SelfClosing - <p notRequired="a" class="btn" />
-        notRequired - DoubleQuotes
-            Markup span - Gen<Markup> - [a] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                HtmlTokenType.Text;[a];
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..33)::33 - [<p notRequired="a" class="btn" />]
+    MarkupBlock - [0..33)::33
+        MarkupTagHelperElement - [0..33)::33 - p[SelfClosing] - pTagHelper
+            MarkupTagHelperStartTag - [0..33)::33
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..18)::16 - notRequired - DoubleQuotes - Unbound - [ notRequired="a"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[notRequired];
+                    Equals;[=];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [16..17)::1
+                        MarkupLiteralAttributeValue - [16..17)::1 - [a]
+                            MarkupTextLiteral - [16..17)::1 - [a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[a];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [18..30)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [19..24)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [26..29)::3
+                        MarkupLiteralAttributeValue - [26..29)::3 - [btn]
+                            MarkupTextLiteral - [26..29)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [29..30)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [30..33)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.cspans.txt
index 79417f375f..494b62f7a4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.cspans.txt
@@ -1,3 +1,3 @@
 Transition span at (16:0,16 [1] ) (Accepts:None) - Parent: Expression block at (16:0,16 [13] )
-Code span at (17:0,17 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (16:0,16 [13] )
+Code span at (17:0,17 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (16:0,16 [13] )
 Markup span at (38:0,38 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [45] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.stree.txt
index 685beef602..b157fddec9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly17.stree.txt
@@ -1,16 +1,48 @@
-Markup block - Gen<None> - 45 - (0:0,0)
-    Tag block - Gen<TagHelper> - 45 - (0:0,0) - p - pTagHelper
-        SelfClosing - <p notRequired="@DateTime.Now" class="btn" />
-        notRequired - DoubleQuotes
-            Markup block - Gen<None> - 13 - (16:0,16)
-                Markup block - Gen<DynAttr:@(16:0,16)> - 13 - (16:0,16)
-                    Expression block - Gen<Expr> - 13 - (16:0,16)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (17:0,17) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (38:0,38) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..45)::45 - [<p notRequired="@DateTime.Now" class="btn" />]
+    MarkupBlock - [0..45)::45
+        MarkupTagHelperElement - [0..45)::45 - p[SelfClosing] - pTagHelper
+            MarkupTagHelperStartTag - [0..45)::45
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..30)::28 - notRequired - DoubleQuotes - Unbound - [ notRequired="@DateTime.Now"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[notRequired];
+                    Equals;[=];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [16..29)::13
+                        MarkupDynamicAttributeValue - [16..29)::13 - [@DateTime.Now]
+                            GenericBlock - [16..29)::13
+                                CSharpCodeBlock - [16..29)::13
+                                    CSharpImplicitExpression - [16..29)::13
+                                        CSharpTransition - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [17..29)::12
+                                            CSharpCodeBlock - [17..29)::12
+                                                CSharpExpressionLiteral - [17..29)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [29..30)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [30..42)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [30..31)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [31..36)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [37..38)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [38..41)::3
+                        MarkupLiteralAttributeValue - [38..41)::3 - [btn]
+                            MarkupTextLiteral - [38..41)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [41..42)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [42..45)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.stree.txt
index b8f52275ec..1e173c05b5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly18.stree.txt
@@ -1,15 +1,49 @@
-Markup block - Gen<None> - 51 - (0:0,0)
-    Tag block - Gen<TagHelper> - 51 - (0:0,0) - p - pTagHelper
-        StartTagAndEndTag - <p notRequired="a" class="btn"> ... </p>
-        notRequired - DoubleQuotes
-            Markup span - Gen<Markup> - [a] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1
-                HtmlTokenType.Text;[a];
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        Markup span - Gen<Markup> - [words and spaces] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:5
-            HtmlTokenType.Text;[words];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[and];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[spaces];
+RazorDocument - [0..51)::51 - [<p notRequired="a" class="btn">words and spaces</p>]
+    MarkupBlock - [0..51)::51
+        MarkupTagHelperElement - [0..51)::51 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..31)::31
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..18)::16 - notRequired - DoubleQuotes - Unbound - [ notRequired="a"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..14)::11 - [notRequired] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[notRequired];
+                    Equals;[=];
+                    MarkupTextLiteral - [15..16)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [16..17)::1
+                        MarkupLiteralAttributeValue - [16..17)::1 - [a]
+                            MarkupTextLiteral - [16..17)::1 - [a] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[a];
+                    MarkupTextLiteral - [17..18)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [18..30)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [19..24)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [26..29)::3
+                        MarkupLiteralAttributeValue - [26..29)::3 - [btn]
+                            MarkupTextLiteral - [26..29)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [29..30)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [30..31)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [31..47)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [47..51)::4
+                MarkupTextLiteral - [47..51)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.cspans.txt
index b46c82a311..2930101dc1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.cspans.txt
@@ -1 +1,2 @@
+Markup span at (12:0,12 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [28] )
 Markup span at (21:0,21 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [28] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.stree.txt
index b4d9606be3..a7e3689955 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly19.stree.txt
@@ -1,8 +1,37 @@
-Markup block - Gen<None> - 28 - (0:0,0)
-    Tag block - Gen<TagHelper> - 28 - (0:0,0) - div - divTagHelper
-        SelfClosing - <div style="" class="btn" />
-        style - DoubleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..28)::28 - [<div style="" class="btn" />]
+    MarkupBlock - [0..28)::28
+        MarkupTagHelperElement - [0..28)::28 - div[SelfClosing] - divTagHelper
+            MarkupTagHelperStartTag - [0..28)::28
+                MarkupTextLiteral - [0..4)::4 - [<div] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                MarkupTagHelperAttribute - [4..13)::9 - style - DoubleQuotes - Unbound - [ style=""]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        MarkupTextLiteral - [12..12)::0 - []
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [21..24)::3
+                        MarkupLiteralAttributeValue - [21..24)::3 - [btn]
+                            MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [25..28)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt
index e0be1c4ce1..8a2d870d97 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly2.stree.txt
@@ -1,12 +1,13 @@
-Markup block - Gen<None> - 7 - (0:0,0)
-    Tag block - Gen<None> - 3 - (0:0,0)
-        Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 4 - (3:0,3)
-        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[p];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..7)::7 - [<p></p>]
+    MarkupBlock - [0..7)::7
+        MarkupTagBlock - [0..3)::3 - [<p>]
+            MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[p];
+                CloseAngle;[>];
+        MarkupTagBlock - [3..7)::4 - [</p>]
+            MarkupTextLiteral - [3..7)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[p];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.cspans.txt
index d760d36187..1ff5028dc0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.cspans.txt
@@ -1,3 +1,3 @@
 Transition span at (12:0,12 [1] ) (Accepts:None) - Parent: Expression block at (12:0,12 [13] )
-Code span at (13:0,13 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (12:0,12 [13] )
+Code span at (13:0,13 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (12:0,12 [13] )
 Markup span at (34:0,34 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [41] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.stree.txt
index f42b8ef1f7..cfebeb7fc4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly20.stree.txt
@@ -1,16 +1,48 @@
-Markup block - Gen<None> - 41 - (0:0,0)
-    Tag block - Gen<TagHelper> - 41 - (0:0,0) - div - divTagHelper
-        SelfClosing - <div style="@DateTime.Now" class="btn" />
-        style - DoubleQuotes
-            Markup block - Gen<None> - 13 - (12:0,12)
-                Markup block - Gen<DynAttr:@(12:0,12)> - 13 - (12:0,12)
-                    Expression block - Gen<Expr> - 13 - (12:0,12)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (13:0,13) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..41)::41 - [<div style="@DateTime.Now" class="btn" />]
+    MarkupBlock - [0..41)::41
+        MarkupTagHelperElement - [0..41)::41 - div[SelfClosing] - divTagHelper
+            MarkupTagHelperStartTag - [0..41)::41
+                MarkupTextLiteral - [0..4)::4 - [<div] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                MarkupTagHelperAttribute - [4..26)::22 - style - DoubleQuotes - Unbound - [ style="@DateTime.Now"]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..25)::13
+                        MarkupDynamicAttributeValue - [12..25)::13 - [@DateTime.Now]
+                            GenericBlock - [12..25)::13
+                                CSharpCodeBlock - [12..25)::13
+                                    CSharpImplicitExpression - [12..25)::13
+                                        CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [13..25)::12
+                                            CSharpCodeBlock - [13..25)::12
+                                                CSharpExpressionLiteral - [13..25)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [26..38)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [27..32)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [34..37)::3
+                        MarkupLiteralAttributeValue - [34..37)::3 - [btn]
+                            MarkupTextLiteral - [34..37)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [37..38)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [38..41)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.cspans.txt
index 517442ebe9..17da676f68 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.cspans.txt
@@ -1,2 +1,3 @@
+Markup span at (12:0,12 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [48] )
 Markup span at (21:0,21 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [48] )
 Markup span at (26:0,26 [16] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [48] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.stree.txt
index ae7da8d3bf..e35bb2239a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly21.stree.txt
@@ -1,14 +1,47 @@
-Markup block - Gen<None> - 48 - (0:0,0)
-    Tag block - Gen<TagHelper> - 48 - (0:0,0) - div - divTagHelper
-        StartTagAndEndTag - <div style="" class="btn"> ... </div>
-        style - DoubleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        Markup span - Gen<Markup> - [words and spaces] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:5
-            HtmlTokenType.Text;[words];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[and];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[spaces];
+RazorDocument - [0..48)::48 - [<div style="" class="btn">words and spaces</div>]
+    MarkupBlock - [0..48)::48
+        MarkupTagHelperElement - [0..48)::48 - div[StartTagAndEndTag] - divTagHelper
+            MarkupTagHelperStartTag - [0..26)::26
+                MarkupTextLiteral - [0..4)::4 - [<div] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                MarkupTagHelperAttribute - [4..13)::9 - style - DoubleQuotes - Unbound - [ style=""]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        MarkupTextLiteral - [12..12)::0 - []
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [21..24)::3
+                        MarkupLiteralAttributeValue - [21..24)::3 - [btn]
+                            MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [25..26)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [26..42)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [42..48)::6
+                MarkupTextLiteral - [42..48)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.cspans.txt
index 471e898d06..b5ef904e18 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.cspans.txt
@@ -1,5 +1,5 @@
 Transition span at (12:0,12 [1] ) (Accepts:None) - Parent: Expression block at (12:0,12 [13] )
-Code span at (13:0,13 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (12:0,12 [13] )
+Code span at (13:0,13 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (12:0,12 [13] )
 Transition span at (34:0,34 [1] ) (Accepts:None) - Parent: Expression block at (34:0,34 [13] )
-Code span at (35:0,35 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (34:0,34 [13] )
+Code span at (35:0,35 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (34:0,34 [13] )
 Markup span at (49:0,49 [16] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [71] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.stree.txt
index ff1ac587a8..7e0cf0854e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly22.stree.txt
@@ -1,29 +1,67 @@
-Markup block - Gen<None> - 71 - (0:0,0)
-    Tag block - Gen<TagHelper> - 71 - (0:0,0) - div - divTagHelper
-        StartTagAndEndTag - <div style="@DateTime.Now" class="@DateTime.Now"> ... </div>
-        style - DoubleQuotes
-            Markup block - Gen<None> - 13 - (12:0,12)
-                Markup block - Gen<DynAttr:@(12:0,12)> - 13 - (12:0,12)
-                    Expression block - Gen<Expr> - 13 - (12:0,12)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (13:0,13) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        class - DoubleQuotes
-            Markup block - Gen<None> - 13 - (34:0,34)
-                Markup block - Gen<DynAttr:@(34:0,34)> - 13 - (34:0,34)
-                    Expression block - Gen<Expr> - 13 - (34:0,34)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (34:0,34) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (35:0,35) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        Markup span - Gen<Markup> - [words and spaces] - SpanEditHandler;Accepts:Any - (49:0,49) - Tokens:5
-            HtmlTokenType.Text;[words];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[and];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[spaces];
+RazorDocument - [0..71)::71 - [<div style="@DateTime.Now" class="@DateTime.Now">words and spaces</div>]
+    MarkupBlock - [0..71)::71
+        MarkupTagHelperElement - [0..71)::71 - div[StartTagAndEndTag] - divTagHelper
+            MarkupTagHelperStartTag - [0..49)::49
+                MarkupTextLiteral - [0..4)::4 - [<div] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                MarkupTagHelperAttribute - [4..26)::22 - style - DoubleQuotes - Unbound - [ style="@DateTime.Now"]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..25)::13
+                        MarkupDynamicAttributeValue - [12..25)::13 - [@DateTime.Now]
+                            GenericBlock - [12..25)::13
+                                CSharpCodeBlock - [12..25)::13
+                                    CSharpImplicitExpression - [12..25)::13
+                                        CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [13..25)::12
+                                            CSharpCodeBlock - [13..25)::12
+                                                CSharpExpressionLiteral - [13..25)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [26..48)::22 - class - DoubleQuotes - Unbound - [ class="@DateTime.Now"]
+                    MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [27..32)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [34..47)::13
+                        MarkupDynamicAttributeValue - [34..47)::13 - [@DateTime.Now]
+                            GenericBlock - [34..47)::13
+                                CSharpCodeBlock - [34..47)::13
+                                    CSharpImplicitExpression - [34..47)::13
+                                        CSharpTransition - [34..35)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [35..47)::12
+                                            CSharpCodeBlock - [35..47)::12
+                                                CSharpExpressionLiteral - [35..47)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [47..48)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [48..49)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [49..65)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [65..71)::6
+                MarkupTextLiteral - [65..71)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.cspans.txt
index 120408cb77..a788e1773e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.cspans.txt
@@ -1,3 +1,4 @@
+Markup span at (12:0,12 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [63] )
 Markup span at (21:0,21 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [63] )
 Markup span at (26:0,26 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [63] )
 Markup span at (31:0,31 [8] ) (Accepts:Any) - Parent: Tag block at (31:0,31 [8] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.stree.txt
index a3497aefd1..84478fe389 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly23.stree.txt
@@ -1,25 +1,58 @@
-Markup block - Gen<None> - 63 - (0:0,0)
-    Tag block - Gen<TagHelper> - 63 - (0:0,0) - div - divTagHelper
-        StartTagAndEndTag - <div style="" class="btn"> ... </div>
-        style - DoubleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        Markup span - Gen<Markup> - [words] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:1
-            HtmlTokenType.Text;[words];
-        Tag block - Gen<None> - 8 - (31:0,31)
-            Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [and] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:1
-            HtmlTokenType.Text;[and];
-        Tag block - Gen<None> - 9 - (42:0,42)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (42:0,42) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [spaces] - SpanEditHandler;Accepts:Any - (51:0,51) - Tokens:1
-            HtmlTokenType.Text;[spaces];
+RazorDocument - [0..63)::63 - [<div style="" class="btn">words<strong>and</strong>spaces</div>]
+    MarkupBlock - [0..63)::63
+        MarkupTagHelperElement - [0..63)::63 - div[StartTagAndEndTag] - divTagHelper
+            MarkupTagHelperStartTag - [0..26)::26
+                MarkupTextLiteral - [0..4)::4 - [<div] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                MarkupTagHelperAttribute - [4..13)::9 - style - DoubleQuotes - Unbound - [ style=""]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        MarkupTextLiteral - [12..12)::0 - []
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [21..24)::3
+                        MarkupLiteralAttributeValue - [21..24)::3 - [btn]
+                            MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [25..26)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [26..31)::5 - [words] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+            MarkupTagBlock - [31..39)::8 - [<strong>]
+                MarkupTextLiteral - [31..39)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [39..42)::3 - [and] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[and];
+            MarkupTagBlock - [42..51)::9 - [</strong>]
+                MarkupTextLiteral - [42..51)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [51..57)::6 - [spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[spaces];
+            MarkupTagHelperEndTag - [57..63)::6
+                MarkupTextLiteral - [57..63)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.stree.txt
index c477a3e0fc..0e31631ea0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly24.stree.txt
@@ -1,9 +1,39 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<TagHelper> - 31 - (0:0,0) - p - pTagHelper - catchAllTagHelper
-        SelfClosing - <p class="btn" catchAll="hi" />
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        catchAll - DoubleQuotes
-            Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
-                HtmlTokenType.Text;[hi];
+RazorDocument - [0..31)::31 - [<p class="btn" catchAll="hi" />]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - p[SelfClosing] - pTagHelper - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..31)::31
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [14..28)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..23)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [25..27)::2
+                        MarkupLiteralAttributeValue - [25..27)::2 - [hi]
+                            MarkupTextLiteral - [25..27)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [27..28)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [28..31)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.stree.txt
index afe5f75025..fb72d50098 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly25.stree.txt
@@ -1,15 +1,49 @@
-Markup block - Gen<None> - 49 - (0:0,0)
-    Tag block - Gen<TagHelper> - 49 - (0:0,0) - p - pTagHelper - catchAllTagHelper
-        StartTagAndEndTag - <p class="btn" catchAll="hi"> ... </p>
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        catchAll - DoubleQuotes
-            Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
-                HtmlTokenType.Text;[hi];
-        Markup span - Gen<Markup> - [words and spaces] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:5
-            HtmlTokenType.Text;[words];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[and];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[spaces];
+RazorDocument - [0..49)::49 - [<p class="btn" catchAll="hi">words and spaces</p>]
+    MarkupBlock - [0..49)::49
+        MarkupTagHelperElement - [0..49)::49 - p[StartTagAndEndTag] - pTagHelper - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..29)::29
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [14..28)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [14..15)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [15..23)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [25..27)::2
+                        MarkupLiteralAttributeValue - [25..27)::2 - [hi]
+                            MarkupTextLiteral - [25..27)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [27..28)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [28..29)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [29..45)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [45..49)::4
+                MarkupTextLiteral - [45..49)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.cspans.txt
index cbc3400719..4a50e7e4a8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.cspans.txt
@@ -1,2 +1,3 @@
+Markup span at (12:0,12 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [42] )
 Markup span at (21:0,21 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [42] )
 Markup span at (36:0,36 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [42] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.stree.txt
index 551463a089..ac47257b99 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly26.stree.txt
@@ -1,11 +1,51 @@
-Markup block - Gen<None> - 42 - (0:0,0)
-    Tag block - Gen<TagHelper> - 42 - (0:0,0) - div - divTagHelper - catchAllTagHelper
-        SelfClosing - <div style="" class="btn" catchAll="hi" />
-        style - DoubleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        catchAll - DoubleQuotes
-            Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:1
-                HtmlTokenType.Text;[hi];
+RazorDocument - [0..42)::42 - [<div style="" class="btn" catchAll="hi" />]
+    MarkupBlock - [0..42)::42
+        MarkupTagHelperElement - [0..42)::42 - div[SelfClosing] - divTagHelper - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..42)::42
+                MarkupTextLiteral - [0..4)::4 - [<div] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                MarkupTagHelperAttribute - [4..13)::9 - style - DoubleQuotes - Unbound - [ style=""]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        MarkupTextLiteral - [12..12)::0 - []
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [21..24)::3
+                        MarkupLiteralAttributeValue - [21..24)::3 - [btn]
+                            MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [25..39)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..34)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [36..38)::2
+                        MarkupLiteralAttributeValue - [36..38)::2 - [hi]
+                            MarkupTextLiteral - [36..38)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [38..39)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [39..42)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.cspans.txt
index 046bac01d7..49b2350a05 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.cspans.txt
@@ -1,3 +1,4 @@
+Markup span at (12:0,12 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [63] )
 Markup span at (21:0,21 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [63] )
 Markup span at (36:0,36 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [63] )
 Markup span at (41:0,41 [16] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [63] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.stree.txt
index d26626a437..320b3d5ca0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly27.stree.txt
@@ -1,17 +1,62 @@
-Markup block - Gen<None> - 63 - (0:0,0)
-    Tag block - Gen<TagHelper> - 63 - (0:0,0) - div - divTagHelper - catchAllTagHelper
-        StartTagAndEndTag - <div style="" class="btn" catchAll="hi" > ... </div>
-        style - DoubleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        catchAll - DoubleQuotes
-            Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:1
-                HtmlTokenType.Text;[hi];
-        Markup span - Gen<Markup> - [words and spaces] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:5
-            HtmlTokenType.Text;[words];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[and];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[spaces];
+RazorDocument - [0..63)::63 - [<div style="" class="btn" catchAll="hi" >words and spaces</div>]
+    MarkupBlock - [0..63)::63
+        MarkupTagHelperElement - [0..63)::63 - div[StartTagAndEndTag] - divTagHelper - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..41)::41
+                MarkupTextLiteral - [0..4)::4 - [<div] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                MarkupTagHelperAttribute - [4..13)::9 - style - DoubleQuotes - Unbound - [ style=""]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        MarkupTextLiteral - [12..12)::0 - []
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [21..24)::3
+                        MarkupLiteralAttributeValue - [21..24)::3 - [btn]
+                            MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [25..39)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..34)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [36..38)::2
+                        MarkupLiteralAttributeValue - [36..38)::2 - [hi]
+                            MarkupTextLiteral - [36..38)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [38..39)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [39..41)::2 - [ >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [41..57)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [57..63)::6
+                MarkupTextLiteral - [57..63)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.cspans.txt
index 9197a8cdf3..b76fbd29f0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.cspans.txt
@@ -1,3 +1,4 @@
+Markup span at (12:0,12 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [65] )
 Markup span at (21:0,21 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [65] )
 Markup span at (36:0,36 [1] ) (Accepts:None) - Parent: Markup block at (36:0,36 [2] )
 Markup span at (37:0,37 [1] ) (Accepts:None) - Parent: Markup block at (36:0,36 [2] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.stree.txt
index 14faf216a7..f95363ee2e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly28.stree.txt
@@ -1,23 +1,67 @@
-Markup block - Gen<None> - 65 - (0:0,0)
-    Tag block - Gen<TagHelper> - 65 - (0:0,0) - div - divTagHelper - catchAllTagHelper
-        StartTagAndEndTag - <div style="" class="btn" catchAll="@@hi" > ... </div>
-        style - DoubleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        catchAll - DoubleQuotes
-            Markup block - Gen<None> - 4 - (36:0,36)
-                Markup block - Gen<None> - 2 - (36:0,36)
-                    Markup span - Gen<Markup> - [@] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                    Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (37:0,37) - Tokens:1
-                        HtmlTokenType.Transition;[@];
-                Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (38:0,38) - Tokens:1
-                    HtmlTokenType.Text;[hi];
-        Markup span - Gen<Markup> - [words and spaces] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:5
-            HtmlTokenType.Text;[words];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[and];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[spaces];
+RazorDocument - [0..65)::65 - [<div style="" class="btn" catchAll="@@hi" >words and spaces</div>]
+    MarkupBlock - [0..65)::65
+        MarkupTagHelperElement - [0..65)::65 - div[StartTagAndEndTag] - divTagHelper - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..43)::43
+                MarkupTextLiteral - [0..4)::4 - [<div] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                MarkupTagHelperAttribute - [4..13)::9 - style - DoubleQuotes - Unbound - [ style=""]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        MarkupTextLiteral - [12..12)::0 - []
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [21..24)::3
+                        MarkupLiteralAttributeValue - [21..24)::3 - [btn]
+                            MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [25..41)::16 - catchAll - DoubleQuotes - Unbound - [ catchAll="@@hi"]
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..34)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [36..40)::4
+                        MarkupBlock - [36..38)::2
+                            MarkupTextLiteral - [36..37)::1 - [@] - Gen<LitAttr:@(36:0,36)> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                            MarkupEphemeralTextLiteral - [37..38)::1 - [@] - Gen<None> - SpanEditHandler;Accepts:None
+                                Transition;[@];
+                        MarkupLiteralAttributeValue - [38..40)::2 - [hi]
+                            MarkupTextLiteral - [38..40)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [40..41)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [41..43)::2 - [ >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [43..59)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [59..65)::6
+                MarkupTextLiteral - [59..65)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.cspans.txt
index 844a2db526..e1f21dcb28 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.cspans.txt
@@ -1,7 +1,7 @@
 Transition span at (12:0,12 [1] ) (Accepts:None) - Parent: Expression block at (12:0,12 [13] )
-Code span at (13:0,13 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (12:0,12 [13] )
+Code span at (13:0,13 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (12:0,12 [13] )
 Transition span at (34:0,34 [1] ) (Accepts:None) - Parent: Expression block at (34:0,34 [13] )
-Code span at (35:0,35 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (34:0,34 [13] )
+Code span at (35:0,35 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (34:0,34 [13] )
 Transition span at (59:0,59 [1] ) (Accepts:None) - Parent: Expression block at (59:0,59 [13] )
-Code span at (60:0,60 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (59:0,59 [13] )
+Code span at (60:0,60 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (59:0,59 [13] )
 Markup span at (75:0,75 [16] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [97] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.stree.txt
index 0ae6065f5e..3fc4b0d728 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly29.stree.txt
@@ -1,39 +1,91 @@
-Markup block - Gen<None> - 97 - (0:0,0)
-    Tag block - Gen<TagHelper> - 97 - (0:0,0) - div - divTagHelper - catchAllTagHelper
-        StartTagAndEndTag - <div style="@DateTime.Now" class="@DateTime.Now" catchAll="@DateTime.Now" > ... </div>
-        style - DoubleQuotes
-            Markup block - Gen<None> - 13 - (12:0,12)
-                Markup block - Gen<DynAttr:@(12:0,12)> - 13 - (12:0,12)
-                    Expression block - Gen<Expr> - 13 - (12:0,12)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (13:0,13) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        class - DoubleQuotes
-            Markup block - Gen<None> - 13 - (34:0,34)
-                Markup block - Gen<DynAttr:@(34:0,34)> - 13 - (34:0,34)
-                    Expression block - Gen<Expr> - 13 - (34:0,34)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (34:0,34) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (35:0,35) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        catchAll - DoubleQuotes
-            Markup block - Gen<None> - 13 - (59:0,59)
-                Markup block - Gen<DynAttr:@(59:0,59)> - 13 - (59:0,59)
-                    Expression block - Gen<Expr> - 13 - (59:0,59)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (59:0,59) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (60:0,60) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        Markup span - Gen<Markup> - [words and spaces] - SpanEditHandler;Accepts:Any - (75:0,75) - Tokens:5
-            HtmlTokenType.Text;[words];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[and];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[spaces];
+RazorDocument - [0..97)::97 - [<div style="@DateTime.Now" class="@DateTime.Now" catchAll="@DateTime.Now" >words and spaces</div>]
+    MarkupBlock - [0..97)::97
+        MarkupTagHelperElement - [0..97)::97 - div[StartTagAndEndTag] - divTagHelper - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..75)::75
+                MarkupTextLiteral - [0..4)::4 - [<div] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                MarkupTagHelperAttribute - [4..26)::22 - style - DoubleQuotes - Unbound - [ style="@DateTime.Now"]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..25)::13
+                        MarkupDynamicAttributeValue - [12..25)::13 - [@DateTime.Now]
+                            GenericBlock - [12..25)::13
+                                CSharpCodeBlock - [12..25)::13
+                                    CSharpImplicitExpression - [12..25)::13
+                                        CSharpTransition - [12..13)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [13..25)::12
+                                            CSharpCodeBlock - [13..25)::12
+                                                CSharpExpressionLiteral - [13..25)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [25..26)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [26..48)::22 - class - DoubleQuotes - Unbound - [ class="@DateTime.Now"]
+                    MarkupTextLiteral - [26..27)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [27..32)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [33..34)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [34..47)::13
+                        MarkupDynamicAttributeValue - [34..47)::13 - [@DateTime.Now]
+                            GenericBlock - [34..47)::13
+                                CSharpCodeBlock - [34..47)::13
+                                    CSharpImplicitExpression - [34..47)::13
+                                        CSharpTransition - [34..35)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [35..47)::12
+                                            CSharpCodeBlock - [35..47)::12
+                                                CSharpExpressionLiteral - [35..47)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [47..48)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [48..73)::25 - catchAll - DoubleQuotes - Unbound - [ catchAll="@DateTime.Now"]
+                    MarkupTextLiteral - [48..49)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [49..57)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [58..59)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [59..72)::13
+                        MarkupDynamicAttributeValue - [59..72)::13 - [@DateTime.Now]
+                            GenericBlock - [59..72)::13
+                                CSharpCodeBlock - [59..72)::13
+                                    CSharpImplicitExpression - [59..72)::13
+                                        CSharpTransition - [59..60)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [60..72)::12
+                                            CSharpCodeBlock - [60..72)::12
+                                                CSharpExpressionLiteral - [60..72)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [72..73)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [73..75)::2 - [ >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [75..91)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [91..97)::6
+                MarkupTextLiteral - [91..97)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt
index d9c812fb24..5e2f2113a5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly3.stree.txt
@@ -1,8 +1,9 @@
-Markup block - Gen<None> - 7 - (0:0,0)
-    Tag block - Gen<None> - 7 - (0:0,0)
-        Markup span - Gen<Markup> - [<div />] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:5
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..7)::7 - [<div />]
+    MarkupBlock - [0..7)::7
+        MarkupTagBlock - [0..7)::7 - [<div />]
+            MarkupTextLiteral - [0..7)::7 - [<div />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.cspans.txt
index 787c31a999..9fec06bb52 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.cspans.txt
@@ -1,3 +1,4 @@
+Markup span at (12:0,12 [0] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [78] )
 Markup span at (21:0,21 [3] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [78] )
 Markup span at (36:0,36 [2] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [78] )
 Markup span at (41:0,41 [5] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [78] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.stree.txt
index 91eadbe144..a9866a52e8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly30.stree.txt
@@ -1,28 +1,73 @@
-Markup block - Gen<None> - 78 - (0:0,0)
-    Tag block - Gen<TagHelper> - 78 - (0:0,0) - div - divTagHelper - catchAllTagHelper
-        StartTagAndEndTag - <div style="" class="btn" catchAll="hi" > ... </div>
-        style - DoubleQuotes
-            Markup block - Gen<None> - 0 - (0:0,0)
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        catchAll - DoubleQuotes
-            Markup span - Gen<Markup> - [hi] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:1
-                HtmlTokenType.Text;[hi];
-        Markup span - Gen<Markup> - [words] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:1
-            HtmlTokenType.Text;[words];
-        Tag block - Gen<None> - 8 - (46:0,46)
-            Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [and] - SpanEditHandler;Accepts:Any - (54:0,54) - Tokens:1
-            HtmlTokenType.Text;[and];
-        Tag block - Gen<None> - 9 - (57:0,57)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (57:0,57) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [spaces] - SpanEditHandler;Accepts:Any - (66:0,66) - Tokens:1
-            HtmlTokenType.Text;[spaces];
+RazorDocument - [0..78)::78 - [<div style="" class="btn" catchAll="hi" >words<strong>and</strong>spaces</div>]
+    MarkupBlock - [0..78)::78
+        MarkupTagHelperElement - [0..78)::78 - div[StartTagAndEndTag] - divTagHelper - catchAllTagHelper
+            MarkupTagHelperStartTag - [0..41)::41
+                MarkupTextLiteral - [0..4)::4 - [<div] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[div];
+                MarkupTagHelperAttribute - [4..13)::9 - style - DoubleQuotes - Unbound - [ style=""]
+                    MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [5..10)::5 - [style] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[style];
+                    Equals;[=];
+                    MarkupTextLiteral - [11..12)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [12..12)::0
+                        MarkupTextLiteral - [12..12)::0 - []
+                    MarkupTextLiteral - [12..13)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [13..25)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [13..14)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [14..19)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [20..21)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [21..24)::3
+                        MarkupLiteralAttributeValue - [21..24)::3 - [btn]
+                            MarkupTextLiteral - [21..24)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [24..25)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTagHelperAttribute - [25..39)::14 - catchAll - DoubleQuotes - Unbound - [ catchAll="hi"]
+                    MarkupTextLiteral - [25..26)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [26..34)::8 - [catchAll] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[catchAll];
+                    Equals;[=];
+                    MarkupTextLiteral - [35..36)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [36..38)::2
+                        MarkupLiteralAttributeValue - [36..38)::2 - [hi]
+                            MarkupTextLiteral - [36..38)::2 - [hi] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[hi];
+                    MarkupTextLiteral - [38..39)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [39..41)::2 - [ >] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [41..46)::5 - [words] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+            MarkupTagBlock - [46..54)::8 - [<strong>]
+                MarkupTextLiteral - [46..54)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [54..57)::3 - [and] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[and];
+            MarkupTagBlock - [57..66)::9 - [</strong>]
+                MarkupTextLiteral - [57..66)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [66..72)::6 - [spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[spaces];
+            MarkupTagHelperEndTag - [72..78)::6
+                MarkupTextLiteral - [72..78)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[div];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt
index 3da4752ebb..ba660e300c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly4.stree.txt
@@ -1,12 +1,13 @@
-Markup block - Gen<None> - 11 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<div>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 6 - (5:0,5)
-        Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..11)::11 - [<div></div>]
+    MarkupBlock - [0..11)::11
+        MarkupTagBlock - [0..5)::5 - [<div>]
+            MarkupTextLiteral - [0..5)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTagBlock - [5..11)::6 - [</div>]
+            MarkupTextLiteral - [5..11)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt
index 55d802d6e0..a30484ca56 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly5.stree.txt
@@ -1,6 +1,25 @@
-Markup block - Gen<None> - 17 - (0:0,0)
-    Tag block - Gen<TagHelper> - 17 - (0:0,0) - p - pTagHelper
-        SelfClosing - <p class="btn" />
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[btn];
+RazorDocument - [0..17)::17 - [<p class="btn" />]
+    MarkupBlock - [0..17)::17
+        MarkupTagHelperElement - [0..17)::17 - p[SelfClosing] - pTagHelper
+            MarkupTagHelperStartTag - [0..17)::17
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [14..17)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.cspans.txt
index 02ce364552..0dd5fb1015 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.cspans.txt
@@ -1,2 +1,2 @@
 Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [13] )
-Code span at (11:0,11 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (10:0,10 [13] )
+Code span at (11:0,11 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [13] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt
index 23ebeef492..1aed039c43 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly6.stree.txt
@@ -1,13 +1,34 @@
-Markup block - Gen<None> - 27 - (0:0,0)
-    Tag block - Gen<TagHelper> - 27 - (0:0,0) - p - pTagHelper
-        SelfClosing - <p class="@DateTime.Now" />
-        class - DoubleQuotes
-            Markup block - Gen<None> - 13 - (10:0,10)
-                Markup block - Gen<DynAttr:@(10:0,10)> - 13 - (10:0,10)
-                    Expression block - Gen<Expr> - 13 - (10:0,10)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (11:0,11) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
+RazorDocument - [0..27)::27 - [<p class="@DateTime.Now" />]
+    MarkupBlock - [0..27)::27
+        MarkupTagHelperElement - [0..27)::27 - p[SelfClosing] - pTagHelper
+            MarkupTagHelperStartTag - [0..27)::27
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..24)::22 - class - DoubleQuotes - Unbound - [ class="@DateTime.Now"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..23)::13
+                        MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
+                            GenericBlock - [10..23)::13
+                                CSharpCodeBlock - [10..23)::13
+                                    CSharpImplicitExpression - [10..23)::13
+                                        CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [11..23)::12
+                                            CSharpCodeBlock - [11..23)::12
+                                                CSharpExpressionLiteral - [11..23)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [24..27)::3 - [ />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt
index bc8211a69b..ca02246abd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly7.stree.txt
@@ -1,12 +1,35 @@
-Markup block - Gen<None> - 35 - (0:0,0)
-    Tag block - Gen<TagHelper> - 35 - (0:0,0) - p - pTagHelper
-        StartTagAndEndTag - <p class="btn"> ... </p>
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        Markup span - Gen<Markup> - [words and spaces] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:5
-            HtmlTokenType.Text;[words];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[and];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[spaces];
+RazorDocument - [0..35)::35 - [<p class="btn">words and spaces</p>]
+    MarkupBlock - [0..35)::35
+        MarkupTagHelperElement - [0..35)::35 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [14..15)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [15..31)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [31..35)::4
+                MarkupTextLiteral - [31..35)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.cspans.txt
index 1eb6dd262b..57aac25125 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.cspans.txt
@@ -1,3 +1,3 @@
 Transition span at (10:0,10 [1] ) (Accepts:None) - Parent: Expression block at (10:0,10 [13] )
-Code span at (11:0,11 [12] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (10:0,10 [13] )
+Code span at (11:0,11 [12] ) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [13] )
 Markup span at (25:0,25 [16] ) (Accepts:Any) - Parent: Tag block at (0:0,0 [45] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt
index 88b241fa8d..9f13f60e7d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly8.stree.txt
@@ -1,19 +1,44 @@
-Markup block - Gen<None> - 45 - (0:0,0)
-    Tag block - Gen<TagHelper> - 45 - (0:0,0) - p - pTagHelper
-        StartTagAndEndTag - <p class="@DateTime.Now"> ... </p>
-        class - DoubleQuotes
-            Markup block - Gen<None> - 13 - (10:0,10)
-                Markup block - Gen<DynAttr:@(10:0,10)> - 13 - (10:0,10)
-                    Expression block - Gen<Expr> - 13 - (10:0,10)
-                        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1
-                            CSharpTokenType.Transition;[@];
-                        Code span - Gen<Expr> - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (11:0,11) - Tokens:3
-                            CSharpTokenType.Identifier;[DateTime];
-                            CSharpTokenType.Dot;[.];
-                            CSharpTokenType.Identifier;[Now];
-        Markup span - Gen<Markup> - [words and spaces] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:5
-            HtmlTokenType.Text;[words];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[and];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[spaces];
+RazorDocument - [0..45)::45 - [<p class="@DateTime.Now">words and spaces</p>]
+    MarkupBlock - [0..45)::45
+        MarkupTagHelperElement - [0..45)::45 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..25)::25
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..24)::22 - class - DoubleQuotes - Unbound - [ class="@DateTime.Now"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..23)::13
+                        MarkupDynamicAttributeValue - [10..23)::13 - [@DateTime.Now]
+                            GenericBlock - [10..23)::13
+                                CSharpCodeBlock - [10..23)::13
+                                    CSharpImplicitExpression - [10..23)::13
+                                        CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                            Transition;[@];
+                                        CSharpImplicitExpressionBody - [11..23)::12
+                                            CSharpCodeBlock - [11..23)::12
+                                                CSharpExpressionLiteral - [11..23)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                                                    Identifier;[DateTime];
+                                                    Dot;[.];
+                                                    Identifier;[Now];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [24..25)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [25..41)::16 - [words and spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+                Whitespace;[ ];
+                Text;[and];
+                Whitespace;[ ];
+                Text;[spaces];
+            MarkupTagHelperEndTag - [41..45)::4
+                MarkupTextLiteral - [41..45)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt
index 012c1cafd0..18da3d2113 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RequiredAttributeDescriptorsCreateTagHelperBlocksCorrectly9.stree.txt
@@ -1,23 +1,46 @@
-Markup block - Gen<None> - 50 - (0:0,0)
-    Tag block - Gen<TagHelper> - 50 - (0:0,0) - p - pTagHelper
-        StartTagAndEndTag - <p class="btn"> ... </p>
-        class - DoubleQuotes
-            Markup span - Gen<Markup> - [btn] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1
-                HtmlTokenType.Text;[btn];
-        Markup span - Gen<Markup> - [words] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-            HtmlTokenType.Text;[words];
-        Tag block - Gen<None> - 8 - (20:0,20)
-            Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [and] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:1
-            HtmlTokenType.Text;[and];
-        Tag block - Gen<None> - 9 - (31:0,31)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [spaces] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:1
-            HtmlTokenType.Text;[spaces];
+RazorDocument - [0..50)::50 - [<p class="btn">words<strong>and</strong>spaces</p>]
+    MarkupBlock - [0..50)::50
+        MarkupTagHelperElement - [0..50)::50 - p[StartTagAndEndTag] - pTagHelper
+            MarkupTagHelperStartTag - [0..15)::15
+                MarkupTextLiteral - [0..2)::2 - [<p] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                MarkupTagHelperAttribute - [2..14)::12 - class - DoubleQuotes - Unbound - [ class="btn"]
+                    MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [3..8)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[class];
+                    Equals;[=];
+                    MarkupTextLiteral - [9..10)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                    MarkupTagHelperAttributeValue - [10..13)::3
+                        MarkupLiteralAttributeValue - [10..13)::3 - [btn]
+                            MarkupTextLiteral - [10..13)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [13..14)::1 - ["] - Gen<None> - SpanEditHandler;Accepts:Any
+                        DoubleQuote;["];
+                MarkupTextLiteral - [14..15)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [15..20)::5 - [words] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[words];
+            MarkupTagBlock - [20..28)::8 - [<strong>]
+                MarkupTextLiteral - [20..28)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [28..31)::3 - [and] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[and];
+            MarkupTagBlock - [31..40)::9 - [</strong>]
+                MarkupTextLiteral - [31..40)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [40..46)::6 - [spaces] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[spaces];
+            MarkupTagHelperEndTag - [46..50)::4
+                MarkupTextLiteral - [46..50)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks1.stree.txt
index 7eba221fee..c636cb3ea8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks1.stree.txt
@@ -1,5 +1,26 @@
-Markup block - Gen<None> - 18 - (0:0,0)
-    Tag block - Gen<TagHelper> - 18 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<TagHelper> - 11 - (3:0,3) - div - divtaghelper
-            StartTagAndEndTag - <div> ... </div>
+RazorDocument - [0..18)::18 - [<p><div></div></p>]
+    MarkupBlock - [0..18)::18
+        MarkupTagHelperElement - [0..18)::18 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..14)::11 - div[StartTagAndEndTag] - divtaghelper
+                MarkupTagHelperStartTag - [3..8)::5
+                    MarkupTextLiteral - [3..8)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[div];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [8..14)::6
+                    MarkupTextLiteral - [8..14)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[div];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [14..18)::4
+                MarkupTextLiteral - [14..18)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks2.stree.txt
index a584ab11d6..ec545b9d15 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks2.stree.txt
@@ -1,10 +1,31 @@
-Markup block - Gen<None> - 30 - (0:0,0)
-    Tag block - Gen<TagHelper> - 30 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [Hello World ] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:4
-            HtmlTokenType.Text;[Hello];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[World];
-            HtmlTokenType.WhiteSpace;[ ];
-        Tag block - Gen<TagHelper> - 11 - (15:0,15) - div - divtaghelper
-            StartTagAndEndTag - <div> ... </div>
+RazorDocument - [0..30)::30 - [<p>Hello World <div></div></p>]
+    MarkupBlock - [0..30)::30
+        MarkupTagHelperElement - [0..30)::30 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [3..15)::12 - [Hello World ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+                Whitespace;[ ];
+                Text;[World];
+                Whitespace;[ ];
+            MarkupTagHelperElement - [15..26)::11 - div[StartTagAndEndTag] - divtaghelper
+                MarkupTagHelperStartTag - [15..20)::5
+                    MarkupTextLiteral - [15..20)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[div];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [20..26)::6
+                    MarkupTextLiteral - [20..26)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[div];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [26..30)::4
+                MarkupTextLiteral - [26..30)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks3.stree.txt
index 95f7c3c249..d07da514b8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks3.stree.txt
@@ -1,17 +1,58 @@
-Markup block - Gen<None> - 43 - (0:0,0)
-    Tag block - Gen<TagHelper> - 19 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [Hel] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
-            HtmlTokenType.Text;[Hel];
-        Tag block - Gen<TagHelper> - 9 - (6:0,6) - p - ptaghelper
-            StartTagAndEndTag - <p> ... </p>
-            Markup span - Gen<Markup> - [lo] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
-                HtmlTokenType.Text;[lo];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<TagHelper> - 23 - (20:0,20) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<TagHelper> - 16 - (23:0,23) - div - divtaghelper
-            StartTagAndEndTag - <div> ... </div>
-            Markup span - Gen<Markup> - [World] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:1
-                HtmlTokenType.Text;[World];
+RazorDocument - [0..43)::43 - [<p>Hel<p>lo</p></p> <p><div>World</div></p>]
+    MarkupBlock - [0..43)::43
+        MarkupTagHelperElement - [0..19)::19 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [3..6)::3 - [Hel] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hel];
+            MarkupTagHelperElement - [6..15)::9 - p[StartTagAndEndTag] - ptaghelper
+                MarkupTagHelperStartTag - [6..9)::3
+                    MarkupTextLiteral - [6..9)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [9..11)::2 - [lo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[lo];
+                MarkupTagHelperEndTag - [11..15)::4
+                    MarkupTextLiteral - [11..15)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [15..19)::4
+                MarkupTextLiteral - [15..19)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [19..20)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [20..43)::23 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [20..23)::3
+                MarkupTextLiteral - [20..23)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [23..39)::16 - div[StartTagAndEndTag] - divtaghelper
+                MarkupTagHelperStartTag - [23..28)::5
+                    MarkupTextLiteral - [23..28)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[div];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [28..33)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[World];
+                MarkupTagHelperEndTag - [33..39)::6
+                    MarkupTextLiteral - [33..39)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[div];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [39..43)::4
+                MarkupTextLiteral - [39..43)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks4.stree.txt
index ae4e2a0c86..4a0b88b6b7 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/RewritesNestedTagHelperTagBlocks4.stree.txt
@@ -1,35 +1,56 @@
-Markup block - Gen<None> - 55 - (0:0,0)
-    Tag block - Gen<TagHelper> - 29 - (0:0,0) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [Hel] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
-            HtmlTokenType.Text;[Hel];
-        Tag block - Gen<None> - 8 - (6:0,6)
-            Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [lo] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
-            HtmlTokenType.Text;[lo];
-        Tag block - Gen<None> - 9 - (16:0,16)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
-    Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:1
-        HtmlTokenType.WhiteSpace;[ ];
-    Tag block - Gen<TagHelper> - 25 - (30:0,30) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 6 - (33:0,33)
-            Markup span - Gen<Markup> - [<span>] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[span];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [World] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:1
-            HtmlTokenType.Text;[World];
-        Tag block - Gen<None> - 7 - (44:0,44)
-            Markup span - Gen<Markup> - [</span>] - SpanEditHandler;Accepts:Any - (44:0,44) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[span];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..55)::55 - [<p>Hel<strong>lo</strong></p> <p><span>World</span></p>]
+    MarkupBlock - [0..55)::55
+        MarkupTagHelperElement - [0..29)::29 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [3..6)::3 - [Hel] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hel];
+            MarkupTagBlock - [6..14)::8 - [<strong>]
+                MarkupTextLiteral - [6..14)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [14..16)::2 - [lo] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[lo];
+            MarkupTagBlock - [16..25)::9 - [</strong>]
+                MarkupTextLiteral - [16..25)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [25..29)::4
+                MarkupTextLiteral - [25..29)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTextLiteral - [29..30)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+        MarkupTagHelperElement - [30..55)::25 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [30..33)::3
+                MarkupTextLiteral - [30..33)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [33..39)::6 - [<span>]
+                MarkupTextLiteral - [33..39)::6 - [<span>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[span];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [39..44)::5 - [World] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[World];
+            MarkupTagBlock - [44..51)::7 - [</span>]
+                MarkupTextLiteral - [44..51)::7 - [</span>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[span];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [51..55)::4
+                MarkupTextLiteral - [51..55)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren1.stree.txt
index e29f5606fd..8bb9014098 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren1.stree.txt
@@ -1,5 +1,22 @@
-Markup block - Gen<None> - 13 - (0:0,0)
-    Tag block - Gen<TagHelper> - 13 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<TagHelper> - 6 - (3:0,3) - br - BRTagHelper
-            SelfClosing - <br />
+RazorDocument - [0..13)::13 - [<p><br /></p>]
+    MarkupBlock - [0..13)::13
+        MarkupTagHelperElement - [0..13)::13 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..9)::6 - br[SelfClosing] - BRTagHelper
+                MarkupTagHelperStartTag - [3..9)::6
+                    MarkupTextLiteral - [3..9)::6 - [<br />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        Whitespace;[ ];
+                        ForwardSlash;[/];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [9..13)::4
+                MarkupTextLiteral - [9..13)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.stree.txt
index b2a07fedaf..84b878746d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren10.stree.txt
@@ -1,30 +1,61 @@
-Markup block - Gen<None> - 69 - (0:0,0)
-    Tag block - Gen<TagHelper> - 69 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<TagHelper> - 47 - (3:0,3) - strong - StrongTagHelper
-            StartTagAndEndTag - <strong> ... </strong>
-            Markup span - Gen<Markup> - [Title:] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-                HtmlTokenType.Text;[Title:];
-            Tag block - Gen<TagHelper> - 4 - (17:0,17) - br - BRTagHelper
-                StartTagOnly - <br>
-            Tag block - Gen<None> - 4 - (21:0,21)
-                Markup span - Gen<Markup> - [<em>] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[em];
-                    HtmlTokenType.CloseAngle;[>];
-            Markup span - Gen<Markup> - [A Very Cool] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:5
-                HtmlTokenType.Text;[A];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[Very];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[Cool];
-            Tag block - Gen<None> - 5 - (36:0,36)
-                Markup span - Gen<Markup> - [</em>] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[em];
-                    HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<TagHelper> - 6 - (50:0,50) - br - BRTagHelper
-            SelfClosing - <br />
-        Markup span - Gen<Markup> - [Something] - SpanEditHandler;Accepts:Any - (56:0,56) - Tokens:1
-            HtmlTokenType.Text;[Something];
+RazorDocument - [0..69)::69 - [<p><strong>Title:<br><em>A Very Cool</em></strong><br />Something</p>]
+    MarkupBlock - [0..69)::69
+        MarkupTagHelperElement - [0..69)::69 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..50)::47 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [3..11)::8
+                    MarkupTextLiteral - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [11..17)::6 - [Title:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[Title:];
+                MarkupTagHelperElement - [17..21)::4 - br[StartTagOnly] - BRTagHelper
+                    MarkupTagHelperStartTag - [17..21)::4
+                        MarkupTextLiteral - [17..21)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            Text;[br];
+                            CloseAngle;[>];
+                MarkupTagBlock - [21..25)::4 - [<em>]
+                    MarkupTextLiteral - [21..25)::4 - [<em>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[em];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [25..36)::11 - [A Very Cool] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[A];
+                    Whitespace;[ ];
+                    Text;[Very];
+                    Whitespace;[ ];
+                    Text;[Cool];
+                MarkupTagBlock - [36..41)::5 - [</em>]
+                    MarkupTextLiteral - [36..41)::5 - [</em>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[em];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [41..50)::9
+                    MarkupTextLiteral - [41..50)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTagHelperElement - [50..56)::6 - br[SelfClosing] - BRTagHelper
+                MarkupTagHelperStartTag - [50..56)::6
+                    MarkupTextLiteral - [50..56)::6 - [<br />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        Whitespace;[ ];
+                        ForwardSlash;[/];
+                        CloseAngle;[>];
+            MarkupTextLiteral - [56..65)::9 - [Something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Something];
+            MarkupTagHelperEndTag - [65..69)::4
+                MarkupTextLiteral - [65..69)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.stree.txt
index 240e049f63..68b47c8c9b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren11.stree.txt
@@ -1,39 +1,60 @@
-Markup block - Gen<None> - 69 - (0:0,0)
-    Tag block - Gen<TagHelper> - 69 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 8 - (3:0,3)
-            Markup span - Gen<Markup> - [<custom>] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[custom];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [Title:] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-            HtmlTokenType.Text;[Title:];
-        Tag block - Gen<TagHelper> - 4 - (17:0,17) - br - BRTagHelper
-            StartTagOnly - <br>
-        Tag block - Gen<None> - 4 - (21:0,21)
-            Markup span - Gen<Markup> - [<em>] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[em];
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [A Very Cool] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:5
-            HtmlTokenType.Text;[A];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[Very];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.Text;[Cool];
-        Tag block - Gen<None> - 5 - (36:0,36)
-            Markup span - Gen<Markup> - [</em>] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[em];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 9 - (41:0,41)
-            Markup span - Gen<Markup> - [</custom>] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[custom];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<TagHelper> - 6 - (50:0,50) - br - BRTagHelper
-            SelfClosing - <br />
-        Markup span - Gen<Markup> - [Something] - SpanEditHandler;Accepts:Any - (56:0,56) - Tokens:1
-            HtmlTokenType.Text;[Something];
+RazorDocument - [0..69)::69 - [<p><custom>Title:<br><em>A Very Cool</em></custom><br />Something</p>]
+    MarkupBlock - [0..69)::69
+        MarkupTagHelperElement - [0..69)::69 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [3..11)::8 - [<custom>]
+                MarkupTextLiteral - [3..11)::8 - [<custom>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[custom];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [11..17)::6 - [Title:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Title:];
+            MarkupTagHelperElement - [17..21)::4 - br[StartTagOnly] - BRTagHelper
+                MarkupTagHelperStartTag - [17..21)::4
+                    MarkupTextLiteral - [17..21)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        CloseAngle;[>];
+            MarkupTagBlock - [21..25)::4 - [<em>]
+                MarkupTextLiteral - [21..25)::4 - [<em>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[em];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [25..36)::11 - [A Very Cool] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[A];
+                Whitespace;[ ];
+                Text;[Very];
+                Whitespace;[ ];
+                Text;[Cool];
+            MarkupTagBlock - [36..41)::5 - [</em>]
+                MarkupTextLiteral - [36..41)::5 - [</em>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[em];
+                    CloseAngle;[>];
+            MarkupTagBlock - [41..50)::9 - [</custom>]
+                MarkupTextLiteral - [41..50)::9 - [</custom>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[custom];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [50..56)::6 - br[SelfClosing] - BRTagHelper
+                MarkupTagHelperStartTag - [50..56)::6
+                    MarkupTextLiteral - [50..56)::6 - [<br />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        Whitespace;[ ];
+                        ForwardSlash;[/];
+                        CloseAngle;[>];
+            MarkupTextLiteral - [56..65)::9 - [Something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Something];
+            MarkupTagHelperEndTag - [65..69)::4
+                MarkupTextLiteral - [65..69)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.stree.txt
index d4ccb414ae..8305e3b016 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren12.stree.txt
@@ -1,7 +1,18 @@
-Markup block - Gen<None> - 9 - (0:0,0)
-    Tag block - Gen<TagHelper> - 9 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 2 - (3:0,3)
-            Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
+RazorDocument - [0..9)::9 - [<p></</p>]
+    MarkupBlock - [0..9)::9
+        MarkupTagHelperElement - [0..9)::9 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [3..5)::2 - [</]
+                MarkupTextLiteral - [3..5)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+            MarkupTagHelperEndTag - [5..9)::4
+                MarkupTextLiteral - [5..9)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.stree.txt
index f20677c50e..693ab1c705 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren13.stree.txt
@@ -1,6 +1,17 @@
-Markup block - Gen<None> - 8 - (0:0,0)
-    Tag block - Gen<TagHelper> - 8 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 1 - (3:0,3)
-            Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
-                HtmlTokenType.OpenAngle;[<];
+RazorDocument - [0..8)::8 - [<p><</p>]
+    MarkupBlock - [0..8)::8
+        MarkupTagHelperElement - [0..8)::8 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [3..4)::1 - [<]
+                MarkupTextLiteral - [3..4)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+            MarkupTagHelperEndTag - [4..8)::4
+                MarkupTextLiteral - [4..8)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.stree.txt
index 4751517c44..4f584753c9 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren14.stree.txt
@@ -1,31 +1,66 @@
-Markup block - Gen<None> - 76 - (0:0,0)
-    Tag block - Gen<TagHelper> - 76 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 8 - (3:0,3)
-            Markup span - Gen<Markup> - [<custom>] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[custom];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<TagHelper> - 4 - (11:0,11) - br - BRTagHelper
-            StartTagOnly - <br>
-        Markup span - Gen<Markup> - [:] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-            HtmlTokenType.Text;[:];
-        Tag block - Gen<TagHelper> - 39 - (16:0,16) - strong - StrongTagHelper
-            StartTagAndEndTag - <strong> ... </strong>
-            Tag block - Gen<TagHelper> - 22 - (24:0,24) - strong - StrongTagHelper
-                StartTagAndEndTag - <strong> ... </strong>
-                Markup span - Gen<Markup> - [Hello] - SpanEditHandler;Accepts:Any - (32:0,32) - Tokens:1
-                    HtmlTokenType.Text;[Hello];
-        Markup span - Gen<Markup> - [:] - SpanEditHandler;Accepts:Any - (55:0,55) - Tokens:1
-            HtmlTokenType.Text;[:];
-        Tag block - Gen<None> - 7 - (56:0,56)
-            Markup span - Gen<Markup> - [<input>] - SpanEditHandler;Accepts:Any - (56:0,56) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[input];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 9 - (63:0,63)
-            Markup span - Gen<Markup> - [</custom>] - SpanEditHandler;Accepts:Any - (63:0,63) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[custom];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..76)::76 - [<p><custom><br>:<strong><strong>Hello</strong></strong>:<input></custom></p>]
+    MarkupBlock - [0..76)::76
+        MarkupTagHelperElement - [0..76)::76 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [3..11)::8 - [<custom>]
+                MarkupTextLiteral - [3..11)::8 - [<custom>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[custom];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [11..15)::4 - br[StartTagOnly] - BRTagHelper
+                MarkupTagHelperStartTag - [11..15)::4
+                    MarkupTextLiteral - [11..15)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        CloseAngle;[>];
+            MarkupTextLiteral - [15..16)::1 - [:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[:];
+            MarkupTagHelperElement - [16..55)::39 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [16..24)::8
+                    MarkupTextLiteral - [16..24)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagHelperElement - [24..46)::22 - strong[StartTagAndEndTag] - StrongTagHelper
+                    MarkupTagHelperStartTag - [24..32)::8
+                        MarkupTextLiteral - [24..32)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            Text;[strong];
+                            CloseAngle;[>];
+                    MarkupTextLiteral - [32..37)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[Hello];
+                    MarkupTagHelperEndTag - [37..46)::9
+                        MarkupTextLiteral - [37..46)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            OpenAngle;[<];
+                            ForwardSlash;[/];
+                            Text;[strong];
+                            CloseAngle;[>];
+                MarkupTagHelperEndTag - [46..55)::9
+                    MarkupTextLiteral - [46..55)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTextLiteral - [55..56)::1 - [:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[:];
+            MarkupTagBlock - [56..63)::7 - [<input>]
+                MarkupTextLiteral - [56..63)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
+            MarkupTagBlock - [63..72)::9 - [</custom>]
+                MarkupTextLiteral - [63..72)::9 - [</custom>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[custom];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [72..76)::4
+                MarkupTextLiteral - [72..76)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren2.stree.txt
index 030417ade1..400f13a494 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren2.stree.txt
@@ -1,9 +1,26 @@
-Markup block - Gen<None> - 17 - (0:0,0)
-    Tag block - Gen<TagHelper> - 17 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
-        Tag block - Gen<TagHelper> - 6 - (5:1,0) - br - BRTagHelper
-            SelfClosing - <br />
-        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (11:1,6) - Tokens:1
-            HtmlTokenType.NewLine;[LF];
+RazorDocument - [0..17)::17 - [<p>LF<br />LF</p>]
+    MarkupBlock - [0..17)::17
+        MarkupTagHelperElement - [0..17)::17 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [3..5)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupTagHelperElement - [5..11)::6 - br[SelfClosing] - BRTagHelper
+                MarkupTagHelperStartTag - [5..11)::6
+                    MarkupTextLiteral - [5..11)::6 - [<br />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        Whitespace;[ ];
+                        ForwardSlash;[/];
+                        CloseAngle;[>];
+            MarkupTextLiteral - [11..13)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                NewLine;[LF];
+            MarkupTagHelperEndTag - [13..17)::4
+                MarkupTextLiteral - [13..17)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.stree.txt
index 3f5750436c..aefe579657 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren3.stree.txt
@@ -1,5 +1,20 @@
-Markup block - Gen<None> - 11 - (0:0,0)
-    Tag block - Gen<TagHelper> - 11 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<TagHelper> - 4 - (3:0,3) - br - BRTagHelper
-            StartTagOnly - <br>
+RazorDocument - [0..11)::11 - [<p><br></p>]
+    MarkupBlock - [0..11)::11
+        MarkupTagHelperElement - [0..11)::11 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..7)::4 - br[StartTagOnly] - BRTagHelper
+                MarkupTagHelperStartTag - [3..7)::4
+                    MarkupTextLiteral - [3..7)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [7..11)::4
+                MarkupTextLiteral - [7..11)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.stree.txt
index 5c64fe7293..e8acd8e663 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren4.stree.txt
@@ -1,5 +1,16 @@
-Markup block - Gen<None> - 12 - (0:0,0)
-    Tag block - Gen<TagHelper> - 12 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [Hello] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
-            HtmlTokenType.Text;[Hello];
+RazorDocument - [0..12)::12 - [<p>Hello</p>]
+    MarkupBlock - [0..12)::12
+        MarkupTagHelperElement - [0..12)::12 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [3..8)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+            MarkupTagHelperEndTag - [8..12)::4
+                MarkupTextLiteral - [8..12)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.stree.txt
index 86ff5509d2..b89b005534 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren5.stree.txt
@@ -1,10 +1,21 @@
-Markup block - Gen<None> - 13 - (0:0,0)
-    Tag block - Gen<TagHelper> - 13 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 6 - (3:0,3)
-            Markup span - Gen<Markup> - [<hr />] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:5
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[hr];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..13)::13 - [<p><hr /></p>]
+    MarkupBlock - [0..13)::13
+        MarkupTagHelperElement - [0..13)::13 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [3..9)::6 - [<hr />]
+                MarkupTextLiteral - [3..9)::6 - [<hr />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[hr];
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [9..13)::4
+                MarkupTextLiteral - [9..13)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.stree.txt
index 44ab808bfc..55e5d05d51 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren6.stree.txt
@@ -1,7 +1,22 @@
-Markup block - Gen<None> - 16 - (0:0,0)
-    Tag block - Gen<TagHelper> - 16 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<TagHelper> - 4 - (3:0,3) - br - BRTagHelper
-            StartTagOnly - <br>
-        Markup span - Gen<Markup> - [Hello] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:1
-            HtmlTokenType.Text;[Hello];
+RazorDocument - [0..16)::16 - [<p><br>Hello</p>]
+    MarkupBlock - [0..16)::16
+        MarkupTagHelperElement - [0..16)::16 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..7)::4 - br[StartTagOnly] - BRTagHelper
+                MarkupTagHelperStartTag - [3..7)::4
+                    MarkupTextLiteral - [3..7)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        CloseAngle;[>];
+            MarkupTextLiteral - [7..12)::5 - [Hello] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Hello];
+            MarkupTagHelperEndTag - [12..16)::4
+                MarkupTextLiteral - [12..16)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.stree.txt
index 944b6b2068..449ecd9fff 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren7.stree.txt
@@ -1,11 +1,38 @@
-Markup block - Gen<None> - 45 - (0:0,0)
-    Tag block - Gen<TagHelper> - 45 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<TagHelper> - 23 - (3:0,3) - strong - StrongTagHelper
-            StartTagAndEndTag - <strong> ... </strong>
-            Markup span - Gen<Markup> - [Title:] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-                HtmlTokenType.Text;[Title:];
-        Tag block - Gen<TagHelper> - 6 - (26:0,26) - br - BRTagHelper
-            SelfClosing - <br />
-        Markup span - Gen<Markup> - [Something] - SpanEditHandler;Accepts:Any - (32:0,32) - Tokens:1
-            HtmlTokenType.Text;[Something];
+RazorDocument - [0..45)::45 - [<p><strong>Title:</strong><br />Something</p>]
+    MarkupBlock - [0..45)::45
+        MarkupTagHelperElement - [0..45)::45 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..26)::23 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [3..11)::8
+                    MarkupTextLiteral - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [11..17)::6 - [Title:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[Title:];
+                MarkupTagHelperEndTag - [17..26)::9
+                    MarkupTextLiteral - [17..26)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTagHelperElement - [26..32)::6 - br[SelfClosing] - BRTagHelper
+                MarkupTagHelperStartTag - [26..32)::6
+                    MarkupTextLiteral - [26..32)::6 - [<br />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        Whitespace;[ ];
+                        ForwardSlash;[/];
+                        CloseAngle;[>];
+            MarkupTextLiteral - [32..41)::9 - [Something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Something];
+            MarkupTagHelperEndTag - [41..45)::4
+                MarkupTextLiteral - [41..45)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.stree.txt
index 944b6b2068..449ecd9fff 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren8.stree.txt
@@ -1,11 +1,38 @@
-Markup block - Gen<None> - 45 - (0:0,0)
-    Tag block - Gen<TagHelper> - 45 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<TagHelper> - 23 - (3:0,3) - strong - StrongTagHelper
-            StartTagAndEndTag - <strong> ... </strong>
-            Markup span - Gen<Markup> - [Title:] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
-                HtmlTokenType.Text;[Title:];
-        Tag block - Gen<TagHelper> - 6 - (26:0,26) - br - BRTagHelper
-            SelfClosing - <br />
-        Markup span - Gen<Markup> - [Something] - SpanEditHandler;Accepts:Any - (32:0,32) - Tokens:1
-            HtmlTokenType.Text;[Something];
+RazorDocument - [0..45)::45 - [<p><strong>Title:</strong><br />Something</p>]
+    MarkupBlock - [0..45)::45
+        MarkupTagHelperElement - [0..45)::45 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..26)::23 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [3..11)::8
+                    MarkupTextLiteral - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [11..17)::6 - [Title:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[Title:];
+                MarkupTagHelperEndTag - [17..26)::9
+                    MarkupTextLiteral - [17..26)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTagHelperElement - [26..32)::6 - br[SelfClosing] - BRTagHelper
+                MarkupTagHelperStartTag - [26..32)::6
+                    MarkupTextLiteral - [26..32)::6 - [<br />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        Whitespace;[ ];
+                        ForwardSlash;[/];
+                        CloseAngle;[>];
+            MarkupTextLiteral - [32..41)::9 - [Something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Text;[Something];
+            MarkupTagHelperEndTag - [41..45)::4
+                MarkupTextLiteral - [41..45)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.stree.txt
index 08853feef9..d41c4ed622 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsAllowedChildren9.stree.txt
@@ -1,16 +1,43 @@
-Markup block - Gen<None> - 51 - (0:0,0)
-    Tag block - Gen<TagHelper> - 51 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Markup span - Gen<Markup> - [  ] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
-            HtmlTokenType.WhiteSpace;[  ];
-        Tag block - Gen<TagHelper> - 23 - (5:0,5) - strong - StrongTagHelper
-            StartTagAndEndTag - <strong> ... </strong>
-            Markup span - Gen<Markup> - [Title:] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
-                HtmlTokenType.Text;[Title:];
-        Markup span - Gen<Markup> - [  ] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:1
-            HtmlTokenType.WhiteSpace;[  ];
-        Tag block - Gen<TagHelper> - 6 - (30:0,30) - br - BRTagHelper
-            SelfClosing - <br />
-        Markup span - Gen<Markup> - [  Something] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:2
-            HtmlTokenType.WhiteSpace;[  ];
-            HtmlTokenType.Text;[Something];
+RazorDocument - [0..51)::51 - [<p>  <strong>Title:</strong>  <br />  Something</p>]
+    MarkupBlock - [0..51)::51
+        MarkupTagHelperElement - [0..51)::51 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTextLiteral - [3..5)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[  ];
+            MarkupTagHelperElement - [5..28)::23 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [5..13)::8
+                    MarkupTextLiteral - [5..13)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTextLiteral - [13..19)::6 - [Title:] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[Title:];
+                MarkupTagHelperEndTag - [19..28)::9
+                    MarkupTextLiteral - [19..28)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTextLiteral - [28..30)::2 - [  ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[  ];
+            MarkupTagHelperElement - [30..36)::6 - br[SelfClosing] - BRTagHelper
+                MarkupTagHelperStartTag - [30..36)::6
+                    MarkupTextLiteral - [30..36)::6 - [<br />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        Whitespace;[ ];
+                        ForwardSlash;[/];
+                        CloseAngle;[>];
+            MarkupTextLiteral - [36..47)::11 - [  Something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                Whitespace;[  ];
+                Text;[Something];
+            MarkupTagHelperEndTag - [47..51)::4
+                MarkupTextLiteral - [47..51)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent1.stree.txt
index 736bffcc48..482ce72d72 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent1.stree.txt
@@ -1,12 +1,13 @@
-Markup block - Gen<None> - 17 - (0:0,0)
-    Tag block - Gen<None> - 8 - (0:0,0)
-        Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 9 - (8:0,8)
-        Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..17)::17 - [<strong></strong>]
+    MarkupBlock - [0..17)::17
+        MarkupTagBlock - [0..8)::8 - [<strong>]
+            MarkupTextLiteral - [0..8)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                CloseAngle;[>];
+        MarkupTagBlock - [8..17)::9 - [</strong>]
+            MarkupTextLiteral - [8..17)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent2.stree.txt
index 83c4bcba88..08b6e07444 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent2.stree.txt
@@ -1,5 +1,26 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Tag block - Gen<TagHelper> - 24 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<TagHelper> - 17 - (3:0,3) - strong - StrongTagHelper
-            StartTagAndEndTag - <strong> ... </strong>
+RazorDocument - [0..24)::24 - [<p><strong></strong></p>]
+    MarkupBlock - [0..24)::24
+        MarkupTagHelperElement - [0..24)::24 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..20)::17 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [3..11)::8
+                    MarkupTextLiteral - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [11..20)::9
+                    MarkupTextLiteral - [11..20)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [20..24)::4
+                MarkupTextLiteral - [20..24)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent3.stree.txt
index 8d516f4610..0d08c51691 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent3.stree.txt
@@ -1,14 +1,25 @@
-Markup block - Gen<None> - 28 - (0:0,0)
-    Tag block - Gen<None> - 5 - (0:0,0)
-        Markup span - Gen<Markup> - [<div>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<TagHelper> - 17 - (5:0,5) - strong - StrongTagHelper
-        StartTagAndEndTag - <strong> ... </strong>
-    Tag block - Gen<None> - 6 - (22:0,22)
-        Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[div];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..28)::28 - [<div><strong></strong></div>]
+    MarkupBlock - [0..28)::28
+        MarkupTagBlock - [0..5)::5 - [<div>]
+            MarkupTextLiteral - [0..5)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTagHelperElement - [5..22)::17 - strong[StartTagAndEndTag] - StrongTagHelper
+            MarkupTagHelperStartTag - [5..13)::8
+                MarkupTextLiteral - [5..13)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [13..22)::9
+                MarkupTextLiteral - [13..22)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+        MarkupTagBlock - [22..28)::6 - [</div>]
+            MarkupTextLiteral - [22..28)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent4.stree.txt
index 909eae409d..7107cc6aa0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent4.stree.txt
@@ -1,23 +1,24 @@
-Markup block - Gen<None> - 34 - (0:0,0)
-    Tag block - Gen<None> - 8 - (0:0,0)
-        Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 8 - (8:0,8)
-        Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 9 - (16:0,16)
-        Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 9 - (25:0,25)
-        Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..34)::34 - [<strong><strong></strong></strong>]
+    MarkupBlock - [0..34)::34
+        MarkupTagBlock - [0..8)::8 - [<strong>]
+            MarkupTextLiteral - [0..8)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                CloseAngle;[>];
+        MarkupTagBlock - [8..16)::8 - [<strong>]
+            MarkupTextLiteral - [8..16)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                CloseAngle;[>];
+        MarkupTagBlock - [16..25)::9 - [</strong>]
+            MarkupTextLiteral - [16..25)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
+        MarkupTagBlock - [25..34)::9 - [</strong>]
+            MarkupTextLiteral - [25..34)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent5.stree.txt
index 52476b4870..bc8a5c19cf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedRequiredParent5.stree.txt
@@ -1,16 +1,37 @@
-Markup block - Gen<None> - 41 - (0:0,0)
-    Tag block - Gen<TagHelper> - 41 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<TagHelper> - 34 - (3:0,3) - strong - StrongTagHelper
-            StartTagAndEndTag - <strong> ... </strong>
-            Tag block - Gen<None> - 8 - (11:0,11)
-                Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[strong];
-                    HtmlTokenType.CloseAngle;[>];
-            Tag block - Gen<None> - 9 - (19:0,19)
-                Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:4
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[strong];
-                    HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..41)::41 - [<p><strong><strong></strong></strong></p>]
+    MarkupBlock - [0..41)::41
+        MarkupTagHelperElement - [0..41)::41 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..37)::34 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [3..11)::8
+                    MarkupTextLiteral - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagBlock - [11..19)::8 - [<strong>]
+                    MarkupTextLiteral - [11..19)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagBlock - [19..28)::9 - [</strong>]
+                    MarkupTextLiteral - [19..28)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [28..37)::9
+                    MarkupTextLiteral - [28..37)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [37..41)::4
+                MarkupTextLiteral - [37..41)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent1.stree.txt
index 3868c082c9..1adcc775ec 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent1.stree.txt
@@ -1,14 +1,19 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Tag block - Gen<TagHelper> - 7 - (0:0,0) - input - InputTagHelper
-        StartTagOnly - <input>
-    Tag block - Gen<None> - 8 - (7:0,7)
-        Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 9 - (15:0,15)
-        Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..24)::24 - [<input><strong></strong>]
+    MarkupBlock - [0..24)::24
+        MarkupTagHelperElement - [0..7)::7 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [0..7)::7
+                MarkupTextLiteral - [0..7)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
+        MarkupTagBlock - [7..15)::8 - [<strong>]
+            MarkupTextLiteral - [7..15)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                CloseAngle;[>];
+        MarkupTagBlock - [15..24)::9 - [</strong>]
+            MarkupTextLiteral - [15..24)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent2.stree.txt
index 280c9a6d76..481e713ac0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent2.stree.txt
@@ -1,7 +1,32 @@
-Markup block - Gen<None> - 31 - (0:0,0)
-    Tag block - Gen<TagHelper> - 31 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<TagHelper> - 7 - (3:0,3) - input - InputTagHelper
-            StartTagOnly - <input>
-        Tag block - Gen<TagHelper> - 17 - (10:0,10) - strong - StrongTagHelper
-            StartTagAndEndTag - <strong> ... </strong>
+RazorDocument - [0..31)::31 - [<p><input><strong></strong></p>]
+    MarkupBlock - [0..31)::31
+        MarkupTagHelperElement - [0..31)::31 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..10)::7 - input[StartTagOnly] - InputTagHelper
+                MarkupTagHelperStartTag - [3..10)::7
+                    MarkupTextLiteral - [3..10)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[input];
+                        CloseAngle;[>];
+            MarkupTagHelperElement - [10..27)::17 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [10..18)::8
+                    MarkupTextLiteral - [10..18)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [18..27)::9
+                    MarkupTextLiteral - [18..27)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [27..31)::4
+                MarkupTextLiteral - [27..31)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent3.stree.txt
index 11094a9a43..04a257b7b1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent3.stree.txt
@@ -1,10 +1,31 @@
-Markup block - Gen<None> - 28 - (0:0,0)
-    Tag block - Gen<TagHelper> - 28 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 4 - (3:0,3)
-            Markup span - Gen<Markup> - [<br>] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:3
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[br];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<TagHelper> - 17 - (7:0,7) - strong - StrongTagHelper
-            StartTagAndEndTag - <strong> ... </strong>
+RazorDocument - [0..28)::28 - [<p><br><strong></strong></p>]
+    MarkupBlock - [0..28)::28
+        MarkupTagHelperElement - [0..28)::28 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [3..7)::4 - [<br>]
+                MarkupTextLiteral - [3..7)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[br];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [7..24)::17 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [7..15)::8
+                    MarkupTextLiteral - [7..15)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [15..24)::9
+                    MarkupTextLiteral - [15..24)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [24..28)::4
+                MarkupTextLiteral - [24..28)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent4.stree.txt
index 4434c49c84..823a54af0b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent4.stree.txt
@@ -1,12 +1,43 @@
-Markup block - Gen<None> - 35 - (0:0,0)
-    Tag block - Gen<TagHelper> - 35 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<TagHelper> - 11 - (3:0,3) - p - PTagHelper
-            StartTagAndEndTag - <p> ... </p>
-            Tag block - Gen<None> - 4 - (6:0,6)
-                Markup span - Gen<Markup> - [<br>] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:3
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[br];
-                    HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<TagHelper> - 17 - (14:0,14) - strong - StrongTagHelper
-            StartTagAndEndTag - <strong> ... </strong>
+RazorDocument - [0..35)::35 - [<p><p><br></p><strong></strong></p>]
+    MarkupBlock - [0..35)::35
+        MarkupTagHelperElement - [0..35)::35 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..14)::11 - p[StartTagAndEndTag] - PTagHelper
+                MarkupTagHelperStartTag - [3..6)::3
+                    MarkupTextLiteral - [3..6)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTagBlock - [6..10)::4 - [<br>]
+                    MarkupTextLiteral - [6..10)::4 - [<br>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [10..14)::4
+                    MarkupTextLiteral - [10..14)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+            MarkupTagHelperElement - [14..31)::17 - strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [14..22)::8
+                    MarkupTextLiteral - [14..22)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [22..31)::9
+                    MarkupTextLiteral - [22..31)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [31..35)::4
+                MarkupTextLiteral - [31..35)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent5.stree.txt
index 3868c082c9..1adcc775ec 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent5.stree.txt
@@ -1,14 +1,19 @@
-Markup block - Gen<None> - 24 - (0:0,0)
-    Tag block - Gen<TagHelper> - 7 - (0:0,0) - input - InputTagHelper
-        StartTagOnly - <input>
-    Tag block - Gen<None> - 8 - (7:0,7)
-        Markup span - Gen<Markup> - [<strong>] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:3
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 9 - (15:0,15)
-        Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[strong];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..24)::24 - [<input><strong></strong>]
+    MarkupBlock - [0..24)::24
+        MarkupTagHelperElement - [0..7)::7 - input[StartTagOnly] - InputTagHelper
+            MarkupTagHelperStartTag - [0..7)::7
+                MarkupTextLiteral - [0..7)::7 - [<input>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    CloseAngle;[>];
+        MarkupTagBlock - [7..15)::8 - [<strong>]
+            MarkupTextLiteral - [7..15)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[strong];
+                CloseAngle;[>];
+        MarkupTagBlock - [15..24)::9 - [</strong>]
+            MarkupTextLiteral - [15..24)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[strong];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent6.stree.txt
index 377fb3c34c..286f87c908 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent6.stree.txt
@@ -1,7 +1,30 @@
-Markup block - Gen<None> - 26 - (0:0,0)
-    Tag block - Gen<TagHelper> - 26 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<TagHelper> - 9 - (3:0,3) - input - InputTagHelper
-            SelfClosing - <input />
-        Tag block - Gen<TagHelper> - 10 - (12:0,12) - strong - StrongTagHelper
-            SelfClosing - <strong />
+RazorDocument - [0..26)::26 - [<p><input /><strong /></p>]
+    MarkupBlock - [0..26)::26
+        MarkupTagHelperElement - [0..26)::26 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..12)::9 - input[SelfClosing] - InputTagHelper
+                MarkupTagHelperStartTag - [3..12)::9
+                    MarkupTextLiteral - [3..12)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[input];
+                        Whitespace;[ ];
+                        ForwardSlash;[/];
+                        CloseAngle;[>];
+            MarkupTagHelperElement - [12..22)::10 - strong[SelfClosing] - StrongTagHelper
+                MarkupTagHelperStartTag - [12..22)::10
+                    MarkupTextLiteral - [12..22)::10 - [<strong />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        Whitespace;[ ];
+                        ForwardSlash;[/];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [22..26)::4
+                MarkupTextLiteral - [22..26)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent7.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent7.stree.txt
index 73b1b66765..272441bde8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent7.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent7.stree.txt
@@ -1,12 +1,29 @@
-Markup block - Gen<None> - 23 - (0:0,0)
-    Tag block - Gen<TagHelper> - 23 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 6 - (3:0,3)
-            Markup span - Gen<Markup> - [<br />] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:5
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[br];
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<TagHelper> - 10 - (9:0,9) - strong - StrongTagHelper
-            SelfClosing - <strong />
+RazorDocument - [0..23)::23 - [<p><br /><strong /></p>]
+    MarkupBlock - [0..23)::23
+        MarkupTagHelperElement - [0..23)::23 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [3..9)::6 - [<br />]
+                MarkupTextLiteral - [3..9)::6 - [<br />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[br];
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [9..19)::10 - strong[SelfClosing] - StrongTagHelper
+                MarkupTagHelperStartTag - [9..19)::10
+                    MarkupTextLiteral - [9..19)::10 - [<strong />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        Whitespace;[ ];
+                        ForwardSlash;[/];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [19..23)::4
+                MarkupTextLiteral - [19..23)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent8.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent8.stree.txt
index 5bb450ec57..71a820bd46 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent8.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNestedVoidSelfClosingRequiredParent8.stree.txt
@@ -1,14 +1,41 @@
-Markup block - Gen<None> - 30 - (0:0,0)
-    Tag block - Gen<TagHelper> - 30 - (0:0,0) - p - PTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<TagHelper> - 13 - (3:0,3) - p - PTagHelper
-            StartTagAndEndTag - <p> ... </p>
-            Tag block - Gen<None> - 6 - (6:0,6)
-                Markup span - Gen<Markup> - [<br />] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:5
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.Text;[br];
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<TagHelper> - 10 - (16:0,16) - strong - StrongTagHelper
-            SelfClosing - <strong />
+RazorDocument - [0..30)::30 - [<p><p><br /></p><strong /></p>]
+    MarkupBlock - [0..30)::30
+        MarkupTagHelperElement - [0..30)::30 - p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..16)::13 - p[StartTagAndEndTag] - PTagHelper
+                MarkupTagHelperStartTag - [3..6)::3
+                    MarkupTextLiteral - [3..6)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[p];
+                        CloseAngle;[>];
+                MarkupTagBlock - [6..12)::6 - [<br />]
+                    MarkupTextLiteral - [6..12)::6 - [<br />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[br];
+                        Whitespace;[ ];
+                        ForwardSlash;[/];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [12..16)::4
+                    MarkupTextLiteral - [12..16)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[p];
+                        CloseAngle;[>];
+            MarkupTagHelperElement - [16..26)::10 - strong[SelfClosing] - StrongTagHelper
+                MarkupTagHelperStartTag - [16..26)::10
+                    MarkupTextLiteral - [16..26)::10 - [<strong />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        Whitespace;[ ];
+                        ForwardSlash;[/];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [26..30)::4
+                MarkupTextLiteral - [26..30)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.stree.txt
index f08d227e89..4c501a2258 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAll.stree.txt
@@ -1,7 +1,18 @@
-Markup block - Gen<None> - 9 - (0:0,0)
-    Tag block - Gen<TagHelper> - 9 - (0:0,0) - p - PTagHelper - CatchAllTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 2 - (3:0,3)
-            Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
+RazorDocument - [0..9)::9 - [<p></</p>]
+    MarkupBlock - [0..9)::9
+        MarkupTagHelperElement - [0..9)::9 - p[StartTagAndEndTag] - PTagHelper - CatchAllTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [3..5)::2 - [</]
+                MarkupTextLiteral - [3..5)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+            MarkupTagHelperEndTag - [5..9)::4
+                MarkupTextLiteral - [5..9)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.stree.txt
index edd3729faa..dc937c139a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsNullTagNameWithAllowedChildrenForCatchAllWithPrefix.stree.txt
@@ -1,7 +1,18 @@
-Markup block - Gen<None> - 15 - (0:0,0)
-    Tag block - Gen<TagHelper> - 15 - (0:0,0) - th:p - PTagHelper - CatchAllTagHelper
-        StartTagAndEndTag - <th:p> ... </th:p>
-        Tag block - Gen<None> - 2 - (6:0,6)
-            Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
+RazorDocument - [0..15)::15 - [<th:p></</th:p>]
+    MarkupBlock - [0..15)::15
+        MarkupTagHelperElement - [0..15)::15 - th:p[StartTagAndEndTag] - PTagHelper - CatchAllTagHelper
+            MarkupTagHelperStartTag - [0..6)::6
+                MarkupTextLiteral - [0..6)::6 - [<th:p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[th:p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [6..8)::2 - [</]
+                MarkupTextLiteral - [6..8)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+            MarkupTagHelperEndTag - [8..15)::7
+                MarkupTextLiteral - [8..15)::7 - [</th:p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[th:p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.stree.txt
index cb816d8adc..0d18d3c339 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags1.stree.txt
@@ -1,5 +1,14 @@
-Markup block - Gen<None> - 11 - (0:0,0)
-    Tag block - Gen<TagHelper> - 11 - (0:0,0) - p - PTagHelper - CatchALlTagHelper
-        StartTagAndEndTag - <p>
-        Tag block - Gen<TagHelper> - 8 - (3:0,3) - strong - StrongTagHelper - CatchALlTagHelper
-            StartTagAndEndTag - <strong>
+RazorDocument - [0..11)::11 - [<p><strong>]
+    MarkupBlock - [0..11)::11
+        MarkupTagHelperElement - [0..11)::11 - p[StartTagAndEndTag] - PTagHelper - CatchALlTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..11)::8 - strong[StartTagAndEndTag] - StrongTagHelper - CatchALlTagHelper
+                MarkupTagHelperStartTag - [3..11)::8
+                    MarkupTextLiteral - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.stree.txt
index c413ca3712..d461b06212 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags2.stree.txt
@@ -1,5 +1,20 @@
-Markup block - Gen<None> - 20 - (0:0,0)
-    Tag block - Gen<TagHelper> - 20 - (0:0,0) - p - PTagHelper - CatchALlTagHelper
-        StartTagAndEndTag - <p>
-        Tag block - Gen<TagHelper> - 17 - (3:0,3) - strong - StrongTagHelper - CatchALlTagHelper
-            StartTagAndEndTag - <strong> ... </strong>
+RazorDocument - [0..20)::20 - [<p><strong></strong>]
+    MarkupBlock - [0..20)::20
+        MarkupTagHelperElement - [0..20)::20 - p[StartTagAndEndTag] - PTagHelper - CatchALlTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..20)::17 - strong[StartTagAndEndTag] - StrongTagHelper - CatchALlTagHelper
+                MarkupTagHelperStartTag - [3..11)::8
+                    MarkupTextLiteral - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [11..20)::9
+                    MarkupTextLiteral - [11..20)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.stree.txt
index 2d2b302121..c052a76663 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags3.stree.txt
@@ -1,7 +1,26 @@
-Markup block - Gen<None> - 23 - (0:0,0)
-    Tag block - Gen<TagHelper> - 15 - (0:0,0) - p - PTagHelper - CatchALlTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<TagHelper> - 8 - (3:0,3) - strong - StrongTagHelper - CatchALlTagHelper
-            StartTagAndEndTag - <strong>
-    Tag block - Gen<TagHelper> - 8 - (15:0,15) - strong - StrongTagHelper - CatchALlTagHelper
-        StartTagAndEndTag - <strong>
+RazorDocument - [0..23)::23 - [<p><strong></p><strong>]
+    MarkupBlock - [0..23)::23
+        MarkupTagHelperElement - [0..15)::15 - p[StartTagAndEndTag] - PTagHelper - CatchALlTagHelper
+            MarkupTagHelperStartTag - [0..3)::3
+                MarkupTextLiteral - [0..3)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [3..11)::8 - strong[StartTagAndEndTag] - StrongTagHelper - CatchALlTagHelper
+                MarkupTagHelperStartTag - [3..11)::8
+                    MarkupTextLiteral - [3..11)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [11..15)::4
+                MarkupTextLiteral - [11..15)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTagHelperElement - [15..23)::8 - strong[StartTagAndEndTag] - StrongTagHelper - CatchALlTagHelper
+            MarkupTagHelperStartTag - [15..23)::8
+                MarkupTextLiteral - [15..23)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[strong];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.stree.txt
index 853b533714..4d3b6a2528 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags4.stree.txt
@@ -1,21 +1,41 @@
-Markup block - Gen<None> - 36 - (0:0,0)
-    Tag block - Gen<None> - 1 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-    Tag block - Gen<TagHelper> - 35 - (1:0,1) - p - PTagHelper - CatchALlTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 1 - (4:0,4)
-            Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                HtmlTokenType.OpenAngle;[<];
-        Tag block - Gen<TagHelper> - 18 - (5:0,5) - strong - StrongTagHelper - CatchALlTagHelper
-            StartTagAndEndTag - <strong> ... </strong
-            Tag block - Gen<None> - 2 - (13:0,13)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-        Tag block - Gen<None> - 9 - (23:0,23)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..36)::36 - [<<p><<strong></</strong</strong></p>]
+    MarkupBlock - [0..36)::36
+        MarkupTagBlock - [0..1)::1 - [<]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+        MarkupTagHelperElement - [1..36)::35 - p[StartTagAndEndTag] - PTagHelper - CatchALlTagHelper
+            MarkupTagHelperStartTag - [1..4)::3
+                MarkupTextLiteral - [1..4)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [4..5)::1 - [<]
+                MarkupTextLiteral - [4..5)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+            MarkupTagHelperElement - [5..23)::18 - strong[StartTagAndEndTag] - StrongTagHelper - CatchALlTagHelper
+                MarkupTagHelperStartTag - [5..13)::8
+                    MarkupTextLiteral - [5..13)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagBlock - [13..15)::2 - [</]
+                    MarkupTextLiteral - [13..15)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                MarkupTagHelperEndTag - [15..23)::8
+                    MarkupTextLiteral - [15..23)::8 - [</strong] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+            MarkupTagBlock - [23..32)::9 - [</strong>]
+                MarkupTextLiteral - [23..32)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [32..36)::4
+                MarkupTextLiteral - [32..36)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.stree.txt
index 72a329650b..9aac8c3745 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags5.stree.txt
@@ -1,21 +1,42 @@
-Markup block - Gen<None> - 37 - (0:0,0)
-    Tag block - Gen<None> - 1 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-    Tag block - Gen<TagHelper> - 36 - (1:0,1) - p - PTagHelper - CatchALlTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 1 - (4:0,4)
-            Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                HtmlTokenType.OpenAngle;[<];
-        Tag block - Gen<TagHelper> - 19 - (5:0,5) - strong - StrongTagHelper - CatchALlTagHelper
-            StartTagAndEndTag - <strong> ... </strong>
-            Tag block - Gen<None> - 2 - (13:0,13)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-        Tag block - Gen<None> - 9 - (24:0,24)
-            Markup span - Gen<Markup> - [</strong>] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[strong];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..37)::37 - [<<p><<strong></</strong></strong></p>]
+    MarkupBlock - [0..37)::37
+        MarkupTagBlock - [0..1)::1 - [<]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+        MarkupTagHelperElement - [1..37)::36 - p[StartTagAndEndTag] - PTagHelper - CatchALlTagHelper
+            MarkupTagHelperStartTag - [1..4)::3
+                MarkupTextLiteral - [1..4)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [4..5)::1 - [<]
+                MarkupTextLiteral - [4..5)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+            MarkupTagHelperElement - [5..24)::19 - strong[StartTagAndEndTag] - StrongTagHelper - CatchALlTagHelper
+                MarkupTagHelperStartTag - [5..13)::8
+                    MarkupTextLiteral - [5..13)::8 - [<strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[strong];
+                        CloseAngle;[>];
+                MarkupTagBlock - [13..15)::2 - [</]
+                    MarkupTextLiteral - [13..15)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                MarkupTagHelperEndTag - [15..24)::9
+                    MarkupTextLiteral - [15..24)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[strong];
+                        CloseAngle;[>];
+            MarkupTagBlock - [24..33)::9 - [</strong>]
+                MarkupTextLiteral - [24..33)::9 - [</strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[strong];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [33..37)::4
+                MarkupTextLiteral - [33..37)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.stree.txt
index 9924ced154..c51a711484 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsPartialRequiredParentTags6.stree.txt
@@ -1,24 +1,45 @@
-Markup block - Gen<None> - 38 - (0:0,0)
-    Tag block - Gen<None> - 1 - (0:0,0)
-        Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1
-            HtmlTokenType.OpenAngle;[<];
-    Tag block - Gen<TagHelper> - 37 - (1:0,1) - p - PTagHelper - CatchALlTagHelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 1 - (4:0,4)
-            Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1
-                HtmlTokenType.OpenAngle;[<];
-        Tag block - Gen<TagHelper> - 20 - (5:0,5) - custom - CatchALlTagHelper
-            StartTagAndEndTag - <custom> ... </custom>
-            Tag block - Gen<None> - 2 - (13:0,13)
-                Markup span - Gen<Markup> - [</] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:2
-                    HtmlTokenType.OpenAngle;[<];
-                    HtmlTokenType.ForwardSlash;[/];
-            Tag block - Gen<None> - 1 - (15:0,15)
-                Markup span - Gen<Markup> - [<] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
-                    HtmlTokenType.OpenAngle;[<];
-        Tag block - Gen<None> - 9 - (25:0,25)
-            Markup span - Gen<Markup> - [</custom>] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[custom];
-                HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..38)::38 - [<<p><<custom></<</custom></custom></p>]
+    MarkupBlock - [0..38)::38
+        MarkupTagBlock - [0..1)::1 - [<]
+            MarkupTextLiteral - [0..1)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+        MarkupTagHelperElement - [1..38)::37 - p[StartTagAndEndTag] - PTagHelper - CatchALlTagHelper
+            MarkupTagHelperStartTag - [1..4)::3
+                MarkupTextLiteral - [1..4)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [4..5)::1 - [<]
+                MarkupTextLiteral - [4..5)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+            MarkupTagHelperElement - [5..25)::20 - custom[StartTagAndEndTag] - CatchALlTagHelper
+                MarkupTagHelperStartTag - [5..13)::8
+                    MarkupTextLiteral - [5..13)::8 - [<custom>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[custom];
+                        CloseAngle;[>];
+                MarkupTagBlock - [13..15)::2 - [</]
+                    MarkupTextLiteral - [13..15)::2 - [</] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                MarkupTagBlock - [15..16)::1 - [<]
+                    MarkupTextLiteral - [15..16)::1 - [<] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                MarkupTagHelperEndTag - [16..25)::9
+                    MarkupTextLiteral - [16..25)::9 - [</custom>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[custom];
+                        CloseAngle;[>];
+            MarkupTagBlock - [25..34)::9 - [</custom>]
+                MarkupTextLiteral - [25..34)::9 - [</custom>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[custom];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [34..38)::4
+                MarkupTextLiteral - [34..38)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildren.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildren.stree.txt
index 921662bbfe..72123df7a2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildren.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildren.stree.txt
@@ -1,5 +1,26 @@
-Markup block - Gen<None> - 36 - (0:0,0)
-    Tag block - Gen<TagHelper> - 36 - (0:0,0) - th:p - PTagHelper
-        StartTagAndEndTag - <th:p> ... </th:p>
-        Tag block - Gen<TagHelper> - 23 - (6:0,6) - th:strong - StrongTagHelper
-            StartTagAndEndTag - <th:strong> ... </th:strong>
+RazorDocument - [0..36)::36 - [<th:p><th:strong></th:strong></th:p>]
+    MarkupBlock - [0..36)::36
+        MarkupTagHelperElement - [0..36)::36 - th:p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..6)::6
+                MarkupTextLiteral - [0..6)::6 - [<th:p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[th:p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [6..29)::23 - th:strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [6..17)::11
+                    MarkupTextLiteral - [6..17)::11 - [<th:strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[th:strong];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [17..29)::12
+                    MarkupTextLiteral - [17..29)::12 - [</th:strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[th:strong];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [29..36)::7
+                MarkupTextLiteral - [29..36)::7 - [</th:p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[th:p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent.stree.txt
index 921662bbfe..72123df7a2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelperPrefixAndAllowedChildrenAndRequireParent.stree.txt
@@ -1,5 +1,26 @@
-Markup block - Gen<None> - 36 - (0:0,0)
-    Tag block - Gen<TagHelper> - 36 - (0:0,0) - th:p - PTagHelper
-        StartTagAndEndTag - <th:p> ... </th:p>
-        Tag block - Gen<TagHelper> - 23 - (6:0,6) - th:strong - StrongTagHelper
-            StartTagAndEndTag - <th:strong> ... </th:strong>
+RazorDocument - [0..36)::36 - [<th:p><th:strong></th:strong></th:p>]
+    MarkupBlock - [0..36)::36
+        MarkupTagHelperElement - [0..36)::36 - th:p[StartTagAndEndTag] - PTagHelper
+            MarkupTagHelperStartTag - [0..6)::6
+                MarkupTextLiteral - [0..6)::6 - [<th:p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[th:p];
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [6..29)::23 - th:strong[StartTagAndEndTag] - StrongTagHelper
+                MarkupTagHelperStartTag - [6..17)::11
+                    MarkupTextLiteral - [6..17)::11 - [<th:strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[th:strong];
+                        CloseAngle;[>];
+                MarkupTagHelperEndTag - [17..29)::12
+                    MarkupTextLiteral - [17..29)::12 - [</th:strong>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        ForwardSlash;[/];
+                        Text;[th:strong];
+                        CloseAngle;[>];
+            MarkupTagHelperEndTag - [29..36)::7
+                MarkupTextLiteral - [29..36)::7 - [</th:p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[th:p];
+                    CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.stree.txt
index bffe4ad1e4..dbabd3d1c4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags1.stree.txt
@@ -1,27 +1,38 @@
-Markup block - Gen<None> - 43 - (0:0,0)
-    Tag block - Gen<None> - 25 - (0:0,0)
-        Markup span - Gen<Markup> - [<script] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[script];
-        Markup block - Gen<Attr:type, type='@(7:0,7),'@(23:0,23)> - 17 - (7:0,7)
-            Markup span - Gen<None> - [ type='] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[type];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(14:0,14)> - [text/html] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:3
-                HtmlTokenType.Text;[text];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[html];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<TagHelper> - 9 - (25:0,25) - input - inputtaghelper
-        SelfClosing - <input />
-    Tag block - Gen<None> - 9 - (34:0,34)
-        Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..43)::43 - [<script type='text/html'><input /></script>]
+    MarkupBlock - [0..43)::43
+        MarkupTagBlock - [0..25)::25 - [<script type='text/html'>]
+            MarkupTextLiteral - [0..7)::7 - [<script] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+            MarkupAttributeBlock - [7..24)::17 - [ type='text/html']
+                MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [8..12)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[type];
+                Equals;[=];
+                MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [14..23)::9
+                    MarkupLiteralAttributeValue - [14..23)::9 - [text/html]
+                        MarkupTextLiteral - [14..23)::9 - [text/html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[text];
+                            ForwardSlash;[/];
+                            Text;[html];
+                MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupTextLiteral - [24..25)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+        MarkupTagHelperElement - [25..34)::9 - input[SelfClosing] - inputtaghelper
+            MarkupTagHelperStartTag - [25..34)::9
+                MarkupTextLiteral - [25..34)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+        MarkupTagBlock - [34..43)::9 - [</script>]
+            MarkupTextLiteral - [34..43)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.stree.txt
index 945237dd31..f244fd4d6d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags2.stree.txt
@@ -1,47 +1,66 @@
-Markup block - Gen<None> - 76 - (0:0,0)
-    Tag block - Gen<None> - 58 - (0:0,0)
-        Markup span - Gen<Markup> - [<script] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[script];
-        Markup block - Gen<Attr:id, id='@(7:0,7),'@(21:0,21)> - 15 - (7:0,7)
-            Markup span - Gen<None> - [ id='] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[id];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(12:0,12)> - [scriptTag] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
-                HtmlTokenType.Text;[scriptTag];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:type, type='@(22:0,22),'@(38:0,38)> - 17 - (22:0,22)
-            Markup span - Gen<None> - [ type='] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[type];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(29:0,29)> - [text/html] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:3
-                HtmlTokenType.Text;[text];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[html];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (38:0,38) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup block - Gen<Attr:class, class='@(39:0,39),'@(56:0,56)> - 18 - (39:0,39)
-            Markup span - Gen<None> - [ class='] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[class];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(47:0,47)> - [something] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:1
-                HtmlTokenType.Text;[something];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (56:0,56) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (57:0,57) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<TagHelper> - 9 - (58:0,58) - input - inputtaghelper
-        SelfClosing - <input />
-    Tag block - Gen<None> - 9 - (67:0,67)
-        Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (67:0,67) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..76)::76 - [<script id='scriptTag' type='text/html' class='something'><input /></script>]
+    MarkupBlock - [0..76)::76
+        MarkupTagBlock - [0..58)::58 - [<script id='scriptTag' type='text/html' class='something'>]
+            MarkupTextLiteral - [0..7)::7 - [<script] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+            MarkupAttributeBlock - [7..22)::15 - [ id='scriptTag']
+                MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [8..10)::2 - [id] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[id];
+                Equals;[=];
+                MarkupTextLiteral - [11..12)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [12..21)::9
+                    MarkupLiteralAttributeValue - [12..21)::9 - [scriptTag]
+                        MarkupTextLiteral - [12..21)::9 - [scriptTag] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[scriptTag];
+                MarkupTextLiteral - [21..22)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupAttributeBlock - [22..39)::17 - [ type='text/html']
+                MarkupTextLiteral - [22..23)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [23..27)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[type];
+                Equals;[=];
+                MarkupTextLiteral - [28..29)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [29..38)::9
+                    MarkupLiteralAttributeValue - [29..38)::9 - [text/html]
+                        MarkupTextLiteral - [29..38)::9 - [text/html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[text];
+                            ForwardSlash;[/];
+                            Text;[html];
+                MarkupTextLiteral - [38..39)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupAttributeBlock - [39..57)::18 - [ class='something']
+                MarkupTextLiteral - [39..40)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [40..45)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[class];
+                Equals;[=];
+                MarkupTextLiteral - [46..47)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [47..56)::9
+                    MarkupLiteralAttributeValue - [47..56)::9 - [something]
+                        MarkupTextLiteral - [47..56)::9 - [something] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[something];
+                MarkupTextLiteral - [56..57)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupTextLiteral - [57..58)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+        MarkupTagHelperElement - [58..67)::9 - input[SelfClosing] - inputtaghelper
+            MarkupTagHelperStartTag - [58..67)::9
+                MarkupTextLiteral - [58..67)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[input];
+                    Whitespace;[ ];
+                    ForwardSlash;[/];
+                    CloseAngle;[>];
+        MarkupTagBlock - [67..76)::9 - [</script>]
+            MarkupTextLiteral - [67..76)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.stree.txt
index 32fbac58b1..d10c1b64dc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags3.stree.txt
@@ -1,53 +1,78 @@
-Markup block - Gen<None> - 84 - (0:0,0)
-    Tag block - Gen<None> - 25 - (0:0,0)
-        Markup span - Gen<Markup> - [<script] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[script];
-        Markup block - Gen<Attr:type, type='@(7:0,7),'@(23:0,23)> - 17 - (7:0,7)
-            Markup span - Gen<None> - [ type='] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[type];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(14:0,14)> - [text/html] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:3
-                HtmlTokenType.Text;[text];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[html];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<TagHelper> - 50 - (25:0,25) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 25 - (28:0,28)
-            Markup span - Gen<Markup> - [<script] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[script];
-            Markup block - Gen<Attr:type, type='@(35:0,35),'@(51:0,51)> - 17 - (35:0,35)
-                Markup span - Gen<None> - [ type='] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[type];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.SingleQuote;['];
-                Markup span - Gen<LitAttr:@(42:0,42)> - [text/html] - SpanEditHandler;Accepts:Any - (42:0,42) - Tokens:3
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.ForwardSlash;[/];
-                    HtmlTokenType.Text;[html];
-                Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (51:0,51) - Tokens:1
-                    HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (52:0,52) - Tokens:1
-                HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<TagHelper> - 9 - (53:0,53) - input - inputtaghelper
-            SelfClosing - <input />
-        Tag block - Gen<None> - 9 - (62:0,62)
-            Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (62:0,62) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[script];
-                HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 9 - (75:0,75)
-        Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (75:0,75) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..84)::84 - [<script type='text/html'><p><script type='text/html'><input /></script></p></script>]
+    MarkupBlock - [0..84)::84
+        MarkupTagBlock - [0..25)::25 - [<script type='text/html'>]
+            MarkupTextLiteral - [0..7)::7 - [<script] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+            MarkupAttributeBlock - [7..24)::17 - [ type='text/html']
+                MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [8..12)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[type];
+                Equals;[=];
+                MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [14..23)::9
+                    MarkupLiteralAttributeValue - [14..23)::9 - [text/html]
+                        MarkupTextLiteral - [14..23)::9 - [text/html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[text];
+                            ForwardSlash;[/];
+                            Text;[html];
+                MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupTextLiteral - [24..25)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+        MarkupTagHelperElement - [25..75)::50 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [25..28)::3
+                MarkupTextLiteral - [25..28)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [28..53)::25 - [<script type='text/html'>]
+                MarkupTextLiteral - [28..35)::7 - [<script] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[script];
+                MarkupAttributeBlock - [35..52)::17 - [ type='text/html']
+                    MarkupTextLiteral - [35..36)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [36..40)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                    Equals;[=];
+                    MarkupTextLiteral - [41..42)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [42..51)::9
+                        MarkupLiteralAttributeValue - [42..51)::9 - [text/html]
+                            MarkupTextLiteral - [42..51)::9 - [text/html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[text];
+                                ForwardSlash;[/];
+                                Text;[html];
+                    MarkupTextLiteral - [51..52)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [52..53)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTagHelperElement - [53..62)::9 - input[SelfClosing] - inputtaghelper
+                MarkupTagHelperStartTag - [53..62)::9
+                    MarkupTextLiteral - [53..62)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        OpenAngle;[<];
+                        Text;[input];
+                        Whitespace;[ ];
+                        ForwardSlash;[/];
+                        CloseAngle;[>];
+            MarkupTagBlock - [62..71)::9 - [</script>]
+                MarkupTextLiteral - [62..71)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[script];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [71..75)::4
+                MarkupTextLiteral - [71..75)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTagBlock - [75..84)::9 - [</script>]
+            MarkupTextLiteral - [75..84)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.stree.txt
index bbc186fada..42c1b2fe11 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/TagHelperParseTreeRewriterTest/UnderstandsTagHelpersInHtmlTypedScriptTags4.stree.txt
@@ -1,59 +1,80 @@
-Markup block - Gen<None> - 85 - (0:0,0)
-    Tag block - Gen<None> - 25 - (0:0,0)
-        Markup span - Gen<Markup> - [<script] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[script];
-        Markup block - Gen<Attr:type, type='@(7:0,7),'@(23:0,23)> - 17 - (7:0,7)
-            Markup span - Gen<None> - [ type='] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:4
-                HtmlTokenType.WhiteSpace;[ ];
-                HtmlTokenType.Text;[type];
-                HtmlTokenType.Equals;[=];
-                HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<LitAttr:@(14:0,14)> - [text/html] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:3
-                HtmlTokenType.Text;[text];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[html];
-            Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:1
-                HtmlTokenType.SingleQuote;['];
-        Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
-            HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<TagHelper> - 51 - (25:0,25) - p - ptaghelper
-        StartTagAndEndTag - <p> ... </p>
-        Tag block - Gen<None> - 26 - (28:0,28)
-            Markup span - Gen<Markup> - [<script] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:2
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.Text;[script];
-            Markup block - Gen<Attr:type, type='@(35:0,35),'@(52:0,52)> - 18 - (35:0,35)
-                Markup span - Gen<None> - [ type='] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:4
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[type];
-                    HtmlTokenType.Equals;[=];
-                    HtmlTokenType.SingleQuote;['];
-                Markup span - Gen<LitAttr:@(42:0,42)> - [text/] - SpanEditHandler;Accepts:Any - (42:0,42) - Tokens:2
-                    HtmlTokenType.Text;[text];
-                    HtmlTokenType.ForwardSlash;[/];
-                Markup span - Gen<LitAttr: @(47:0,47)> - [ html] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:2
-                    HtmlTokenType.WhiteSpace;[ ];
-                    HtmlTokenType.Text;[html];
-                Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (52:0,52) - Tokens:1
-                    HtmlTokenType.SingleQuote;['];
-            Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:Any - (53:0,53) - Tokens:1
-                HtmlTokenType.CloseAngle;[>];
-        Markup span - Gen<Markup> - [<input />] - SpanEditHandler;Accepts:Any - (54:0,54) - Tokens:5
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.Text;[input];
-            HtmlTokenType.WhiteSpace;[ ];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.CloseAngle;[>];
-        Tag block - Gen<None> - 9 - (63:0,63)
-            Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (63:0,63) - Tokens:4
-                HtmlTokenType.OpenAngle;[<];
-                HtmlTokenType.ForwardSlash;[/];
-                HtmlTokenType.Text;[script];
-                HtmlTokenType.CloseAngle;[>];
-    Tag block - Gen<None> - 9 - (76:0,76)
-        Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (76:0,76) - Tokens:4
-            HtmlTokenType.OpenAngle;[<];
-            HtmlTokenType.ForwardSlash;[/];
-            HtmlTokenType.Text;[script];
-            HtmlTokenType.CloseAngle;[>];
+RazorDocument - [0..85)::85 - [<script type='text/html'><p><script type='text/ html'><input /></script></p></script>]
+    MarkupBlock - [0..85)::85
+        MarkupTagBlock - [0..25)::25 - [<script type='text/html'>]
+            MarkupTextLiteral - [0..7)::7 - [<script] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[script];
+            MarkupAttributeBlock - [7..24)::17 - [ type='text/html']
+                MarkupTextLiteral - [7..8)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                MarkupTextLiteral - [8..12)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Text;[type];
+                Equals;[=];
+                MarkupTextLiteral - [13..14)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+                GenericBlock - [14..23)::9
+                    MarkupLiteralAttributeValue - [14..23)::9 - [text/html]
+                        MarkupTextLiteral - [14..23)::9 - [text/html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                            Text;[text];
+                            ForwardSlash;[/];
+                            Text;[html];
+                MarkupTextLiteral - [23..24)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                    SingleQuote;['];
+            MarkupTextLiteral - [24..25)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                CloseAngle;[>];
+        MarkupTagHelperElement - [25..76)::51 - p[StartTagAndEndTag] - ptaghelper
+            MarkupTagHelperStartTag - [25..28)::3
+                MarkupTextLiteral - [25..28)::3 - [<p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[p];
+                    CloseAngle;[>];
+            MarkupTagBlock - [28..54)::26 - [<script type='text/ html'>]
+                MarkupTextLiteral - [28..35)::7 - [<script] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    Text;[script];
+                MarkupAttributeBlock - [35..53)::18 - [ type='text/ html']
+                    MarkupTextLiteral - [35..36)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Whitespace;[ ];
+                    MarkupTextLiteral - [36..40)::4 - [type] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                        Text;[type];
+                    Equals;[=];
+                    MarkupTextLiteral - [41..42)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                    GenericBlock - [42..52)::10
+                        MarkupLiteralAttributeValue - [42..47)::5 - [text/]
+                            MarkupTextLiteral - [42..47)::5 - [text/] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[text];
+                                ForwardSlash;[/];
+                        MarkupLiteralAttributeValue - [47..52)::5 - [ html]
+                            MarkupTextLiteral - [47..48)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Whitespace;[ ];
+                            MarkupTextLiteral - [48..52)::4 - [html] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[html];
+                    MarkupTextLiteral - [52..53)::1 - ['] - Gen<None> - SpanEditHandler;Accepts:Any
+                        SingleQuote;['];
+                MarkupTextLiteral - [53..54)::1 - [>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    CloseAngle;[>];
+            MarkupTextLiteral - [54..63)::9 - [<input />] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[input];
+                Whitespace;[ ];
+                ForwardSlash;[/];
+                CloseAngle;[>];
+            MarkupTagBlock - [63..72)::9 - [</script>]
+                MarkupTextLiteral - [63..72)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[script];
+                    CloseAngle;[>];
+            MarkupTagHelperEndTag - [72..76)::4
+                MarkupTextLiteral - [72..76)::4 - [</p>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    OpenAngle;[<];
+                    ForwardSlash;[/];
+                    Text;[p];
+                    CloseAngle;[>];
+        MarkupTagBlock - [76..85)::9 - [</script>]
+            MarkupTextLiteral - [76..85)::9 - [</script>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[script];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/WhiteSpaceRewriterTest/Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block.cspans.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/WhiteSpaceRewriterTest/Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block.cspans.txt
index 1869d292d1..64df8a7ddd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/WhiteSpaceRewriterTest/Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block.cspans.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/WhiteSpaceRewriterTest/Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block.cspans.txt
@@ -1,4 +1,18 @@
-Markup span at (0:0,0 [8] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
-Transition span at (8:0,8 [1] ) (Accepts:None) - Parent: Expression block at (8:0,8 [4] )
-Code span at (9:0,9 [3] ) (Accepts:NonWhiteSpace) - Parent: Expression block at (8:0,8 [4] )
-Markup span at (12:0,12 [5] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] )
+Markup span at (0:0,0 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
+Markup span at (2:1,0 [5] ) (Accepts:Any) - Parent: Tag block at (2:1,0 [5] )
+Markup span at (7:1,5 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
+Markup span at (9:2,0 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
+Transition span at (13:2,4 [1] ) (Accepts:None) - Parent: Expression block at (13:2,4 [7] )
+Code span at (14:2,5 [6] ) (Accepts:NonWhitespace) - Parent: Expression block at (13:2,4 [7] )
+Markup span at (20:2,11 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
+Markup span at (22:3,0 [6] ) (Accepts:Any) - Parent: Tag block at (22:3,0 [6] )
+Markup span at (28:3,6 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
+Markup span at (30:4,0 [5] ) (Accepts:Any) - Parent: Tag block at (30:4,0 [5] )
+Markup span at (35:4,5 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
+Markup span at (37:5,0 [4] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
+Transition span at (41:5,4 [1] ) (Accepts:None) - Parent: Expression block at (41:5,4 [9] )
+MetaCode span at (42:5,5 [1] ) (Accepts:None) - Parent: Expression block at (41:5,4 [9] )
+Code span at (43:5,6 [6] ) (Accepts:Any) - Parent: Expression block at (41:5,4 [9] )
+MetaCode span at (49:5,12 [1] ) (Accepts:None) - Parent: Expression block at (41:5,4 [9] )
+Markup span at (50:5,13 [2] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [58] )
+Markup span at (52:6,0 [6] ) (Accepts:Any) - Parent: Tag block at (52:6,0 [6] )
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/WhiteSpaceRewriterTest/Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block.stree.txt b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/WhiteSpaceRewriterTest/Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block.stree.txt
index d94887694c..50eaa74f92 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/WhiteSpaceRewriterTest/Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block.stree.txt
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/WhiteSpaceRewriterTest/Moves_Whitespace_Preceeding_ExpressionBlock_To_Parent_Block.stree.txt
@@ -1,12 +1,60 @@
-Markup block - Gen<None> - 17 - (0:0,0)
-    Markup span - Gen<Markup> - [test    ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2
-        HtmlTokenType.Text;[test];
-        HtmlTokenType.WhiteSpace;[    ];
-    Expression block - Gen<Expr> - 4 - (8:0,8)
-        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:1
-            CSharpTokenType.Transition;[@];
-        Code span - Gen<Expr> - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (9:0,9) - Tokens:1
-            CSharpTokenType.Identifier;[foo];
-    Markup span - Gen<Markup> - [ test] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:2
-        HtmlTokenType.WhiteSpace;[ ];
-        HtmlTokenType.Text;[test];
+RazorDocument - [0..58)::58 - [LF<div>LF    @resultLF</div>LF<div>LF    @(result)LF</div>]
+    MarkupBlock - [0..58)::58
+        MarkupTextLiteral - [0..2)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTagBlock - [2..7)::5 - [<div>]
+            MarkupTextLiteral - [2..7)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [7..9)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTextLiteral - [9..13)::4 - [    ]
+            Whitespace;[    ];
+        CSharpCodeBlock - [13..20)::7
+            CSharpImplicitExpression - [13..20)::7
+                CSharpTransition - [13..14)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [14..20)::6
+                    CSharpCodeBlock - [14..20)::6
+                        CSharpExpressionLiteral - [14..20)::6 - [result] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
+                            Identifier;[result];
+        MarkupTextLiteral - [20..22)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTagBlock - [22..28)::6 - [</div>]
+            MarkupTextLiteral - [22..28)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [28..30)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTagBlock - [30..35)::5 - [<div>]
+            MarkupTextLiteral - [30..35)::5 - [<div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                Text;[div];
+                CloseAngle;[>];
+        MarkupTextLiteral - [35..37)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTextLiteral - [37..41)::4 - [    ]
+            Whitespace;[    ];
+        CSharpCodeBlock - [41..50)::9
+            CSharpExplicitExpression - [41..50)::9
+                CSharpTransition - [41..42)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpExplicitExpressionBody - [42..50)::8
+                    RazorMetaCode - [42..43)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftParenthesis;[(];
+                    CSharpCodeBlock - [43..49)::6
+                        CSharpExpressionLiteral - [43..49)::6 - [result] - Gen<Expr> - SpanEditHandler;Accepts:Any
+                            Identifier;[result];
+                    RazorMetaCode - [49..50)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightParenthesis;[)];
+        MarkupTextLiteral - [50..52)::2 - [LF] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            NewLine;[LF];
+        MarkupTagBlock - [52..58)::6 - [</div>]
+            MarkupTextLiteral - [52..58)::6 - [</div>] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                OpenAngle;[<];
+                ForwardSlash;[/];
+                Text;[div];
+                CloseAngle;[>];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
index ffd7b849bb..c42bb4ef91 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
@@ -7,29 +7,23 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-#if NET46
-using System.Runtime.Remoting;
-using System.Runtime.Remoting.Messaging;
-#else
 using System.Threading;
-#endif
+using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
-using Xunit;
-using Xunit.Sdk;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis;
+using Xunit;
+using Xunit.Sdk;
 
 namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 {
     [IntializeTestFile]
     public abstract class IntegrationTestBase
     {
-#if !NET46
         private static readonly AsyncLocal<string> _fileName = new AsyncLocal<string>();
-#endif
 
         private static readonly CSharpCompilation DefaultBaseCompilation;
 
@@ -113,22 +107,12 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
         // Used by the test framework to set the 'base' name for test files.
         public static string FileName
         {
-#if NET46
-            get
-            {
-                var handle = (ObjectHandle)CallContext.LogicalGetData("IntegrationTestBase_FileName");
-                return (string)handle.Unwrap();
-            }
-            set
-            {
-                CallContext.LogicalSetData("IntegrationTestBase_FileName", new ObjectHandle(value));
-            }
-#elif NETCOREAPP2_2
             get { return _fileName.Value; }
             set { _fileName.Value = value; }
-#endif
         }
 
+        public string FileExtension { get; set; } = ".cshtml";
+
         protected virtual void ConfigureProjectEngine(RazorProjectEngineBuilder builder)
         {
         }
@@ -190,7 +174,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 
             var suffixIndex = FileName.LastIndexOf("_");
             var normalizedFileName = suffixIndex == -1 ? FileName : FileName.Substring(0, suffixIndex);
-            var sourceFileName = Path.ChangeExtension(normalizedFileName, ".cshtml");
+            var sourceFileName = Path.ChangeExtension(normalizedFileName, FileExtension);
             var testFile = TestFile.Create(sourceFileName, GetType().GetTypeInfo().Assembly);
             if (!testFile.Exists())
             {
@@ -371,7 +355,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             IntermediateNodeVerifier.Verify(document, baseline);
         }
 
-        protected void AssertCSharpDocumentMatchesBaseline(RazorCSharpDocument document)
+        protected void AssertCSharpDocumentMatchesBaseline(RazorCSharpDocument cSharpDocument)
         {
             if (FileName == null)
             {
@@ -385,10 +369,10 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             if (GenerateBaselines)
             {
                 var baselineFullPath = Path.Combine(TestProjectRoot, baselineFileName);
-                File.WriteAllText(baselineFullPath, document.GeneratedCode);
+                File.WriteAllText(baselineFullPath, cSharpDocument.GeneratedCode);
 
                 var baselineDiagnosticsFullPath = Path.Combine(TestProjectRoot, baselineDiagnosticsFileName);
-                var lines = document.Diagnostics.Select(RazorDiagnosticSerializer.Serialize).ToArray();
+                var lines = cSharpDocument.Diagnostics.Select(RazorDiagnosticSerializer.Serialize).ToArray();
                 if (lines.Any())
                 {
                     File.WriteAllLines(baselineDiagnosticsFullPath, lines);
@@ -410,7 +394,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             var baseline = codegenFile.ReadAllText();
 
             // Normalize newlines to match those in the baseline.
-            var actual = document.GeneratedCode.Replace("\r", "").Replace("\n", "\r\n");
+            var actual = cSharpDocument.GeneratedCode.Replace("\r", "").Replace("\n", "\r\n");
             Assert.Equal(baseline, actual);
 
             var baselineDiagnostics = string.Empty;
@@ -420,11 +404,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                 baselineDiagnostics = diagnosticsFile.ReadAllText();
             }
 
-            var actualDiagnostics = string.Concat(document.Diagnostics.Select(d => RazorDiagnosticSerializer.Serialize(d) + "\r\n"));
+            var actualDiagnostics = string.Concat(cSharpDocument.Diagnostics.Select(d => RazorDiagnosticSerializer.Serialize(d) + "\r\n"));
             Assert.Equal(baselineDiagnostics, actualDiagnostics);
         }
 
-        protected void AssertSourceMappingsMatchBaseline(RazorCodeDocument document)
+        protected void AssertSourceMappingsMatchBaseline(RazorCodeDocument codeDocument)
         {
             if (FileName == null)
             {
@@ -432,11 +416,11 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
                 throw new InvalidOperationException(message);
             }
 
-            var csharpDocument = document.GetCSharpDocument();
+            var csharpDocument = codeDocument.GetCSharpDocument();
             Assert.NotNull(csharpDocument);
 
             var baselineFileName = Path.ChangeExtension(FileName, ".mappings.txt");
-            var serializedMappings = SourceMappingsSerializer.Serialize(csharpDocument, document.Source);
+            var serializedMappings = SourceMappingsSerializer.Serialize(csharpDocument, codeDocument.Source);
 
             if (GenerateBaselines)
             {
@@ -454,9 +438,112 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
             var baseline = testFile.ReadAllText();
 
             // Normalize newlines to match those in the baseline.
-            var actual = serializedMappings.Replace("\r", "").Replace("\n", "\r\n");
+            var actualBaseline = serializedMappings.Replace("\r", "").Replace("\n", "\r\n");
 
-            Assert.Equal(baseline, actual);
+            Assert.Equal(baseline, actualBaseline);
+
+            var syntaxTree = codeDocument.GetSyntaxTree();
+            var visitor = new CodeSpanVisitor();
+            visitor.Visit(syntaxTree.Root);
+
+            var charBuffer = new char[codeDocument.Source.Length];
+            codeDocument.Source.CopyTo(0, charBuffer, 0, codeDocument.Source.Length);
+            var sourceContent = new string(charBuffer);
+
+            var spans = visitor.CodeSpans;
+            for (var i = 0; i < spans.Count; i++)
+            {
+                var span = spans[i];
+                var sourceSpan = span.GetSourceSpan(codeDocument.Source);
+                if (sourceSpan == null)
+                {
+                    // Not in the main file, skip.
+                    continue;
+                }
+
+                var expectedSpan = sourceContent.Substring(sourceSpan.AbsoluteIndex, sourceSpan.Length);
+
+                // See #2593
+                if (string.IsNullOrWhiteSpace(expectedSpan))
+                {
+                    // For now we don't verify whitespace inside of a directive. We know that directives cheat
+                    // with how they bound whitespace/C#/markup to make completion work.
+                    if (span.FirstAncestorOrSelf<RazorDirectiveSyntax>() != null)
+                    {
+                        continue;
+                    }
+                }
+
+                // See #2594
+                if (string.Equals("@", expectedSpan))
+                {
+                    // For now we don't verify an escaped transition. In some cases one of the @ tokens in @@foo
+                    // will be mapped as C# but will not be present in the output buffer because it's not actually C#.
+                    continue;
+                }
+
+                var found = false;
+                for (var j = 0; j < csharpDocument.SourceMappings.Count; j++)
+                {
+                    var mapping = csharpDocument.SourceMappings[j];
+                    if (mapping.OriginalSpan == sourceSpan)
+                    {
+                        var actualSpan = csharpDocument.GeneratedCode.Substring(
+                            mapping.GeneratedSpan.AbsoluteIndex,
+                            mapping.GeneratedSpan.Length);
+
+                        if (!string.Equals(expectedSpan, actualSpan, StringComparison.Ordinal))
+                        {
+                            throw new XunitException(
+                                $"Found the span {sourceSpan} in the output mappings but it contains " +
+                                $"'{EscapeWhitespace(actualSpan)}' instead of '{EscapeWhitespace(expectedSpan)}'.");
+                        }
+
+                        found = true;
+                        break;
+                    }
+                }
+
+                if (!found)
+                {
+                    throw new XunitException(
+                        $"Could not find the span {sourceSpan} - containing '{EscapeWhitespace(expectedSpan)}' " +
+                        $"in the output.");
+                }
+            }
+        }
+
+        private class CodeSpanVisitor : SyntaxRewriter
+        {
+            public List<Syntax.SyntaxNode> CodeSpans { get; } = new List<Syntax.SyntaxNode>();
+
+            public override Syntax.SyntaxNode VisitCSharpStatementLiteral(CSharpStatementLiteralSyntax node)
+            {
+                var context = node.GetSpanContext();
+                if (context != null && context.ChunkGenerator != SpanChunkGenerator.Null)
+                {
+                    CodeSpans.Add(node);
+                }
+                return base.VisitCSharpStatementLiteral(node);
+            }
+
+            public override Syntax.SyntaxNode VisitCSharpExpressionLiteral(CSharpExpressionLiteralSyntax node)
+            {
+                var context = node.GetSpanContext();
+                if (context != null && context.ChunkGenerator != SpanChunkGenerator.Null)
+                {
+                    CodeSpans.Add(node);
+                }
+                return base.VisitCSharpExpressionLiteral(node);
+            }
+        }
+
+        private static string EscapeWhitespace(string content)
+        {
+            return content
+                .Replace("\n", "\\n")
+                .Replace("\r", "\\r")
+                .Replace("\t", "\\t");
         }
 
         private string NormalizeNewLines(string content)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/BlockFactory.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/BlockFactory.cs
deleted file mode 100644
index 2551fee917..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/BlockFactory.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// 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;
-using System.Collections.Generic;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class BlockFactory
-    {
-        private SpanFactory _factory;
-
-        public BlockFactory(SpanFactory factory)
-        {
-            _factory = factory;
-        }
-
-        public Block EscapedMarkupTagBlock(string prefix, string suffix)
-        {
-            return EscapedMarkupTagBlock(prefix, suffix, AcceptedCharactersInternal.Any);
-        }
-
-        public Block EscapedMarkupTagBlock(string prefix, string suffix, params SyntaxTreeNode[] children)
-        {
-            return EscapedMarkupTagBlock(prefix, suffix, AcceptedCharactersInternal.Any, children);
-        }
-
-        public Block EscapedMarkupTagBlock(
-            string prefix,
-            string suffix,
-            AcceptedCharactersInternal acceptedCharacters,
-            params SyntaxTreeNode[] children)
-        {
-            var newChildren = new List<SyntaxTreeNode>(
-                new SyntaxTreeNode[]
-                {
-                    _factory.Markup(prefix),
-                    _factory.BangEscape(),
-                    _factory.Markup(suffix).Accepts(acceptedCharacters)
-                });
-
-            newChildren.AddRange(children);
-
-            return new MarkupTagBlock(newChildren.ToArray());
-        }
-
-        public Block MarkupTagBlock(string content)
-        {
-            return MarkupTagBlock(content, AcceptedCharactersInternal.Any);
-        }
-
-        public Block MarkupTagBlock(string content, AcceptedCharactersInternal acceptedCharacters)
-        {
-            return new MarkupTagBlock(
-                _factory.Markup(content).Accepts(acceptedCharacters)
-            );
-        }
-
-        public HtmlCommentBlock HtmlCommentBlock(string content)
-        {
-            return HtmlCommentBlock(_factory, f => new SyntaxTreeNode[] { f.Markup(content).Accepts(AcceptedCharactersInternal.WhiteSpace) });
-        }
-
-        public static HtmlCommentBlock HtmlCommentBlock(SpanFactory factory, Func<SpanFactory, IEnumerable<SyntaxTreeNode>> nodesBuilder = null)
-        {
-            var nodes = new List<SyntaxTreeNode>();
-            nodes.Add(factory.Markup("<!--").Accepts(AcceptedCharactersInternal.None));
-            if (nodesBuilder != null)
-            {
-                nodes.AddRange(nodesBuilder(factory));
-            }
-            nodes.Add(factory.Markup("-->").Accepts(AcceptedCharactersInternal.None));
-
-            return new HtmlCommentBlock(nodes.ToArray());
-        }
-
-        public Block TagHelperBlock(
-            string tagName,
-            TagMode tagMode,
-            SourceLocation start,
-            Block startTag,
-            SyntaxTreeNode[] children,
-            Block endTag)
-        {
-            var builder = new TagHelperBlockBuilder(
-                tagName,
-                tagMode,
-                attributes: new List<TagHelperAttributeNode>(),
-                children: children)
-            {
-                Start = start,
-                SourceStartTag = startTag,
-                SourceEndTag = endTag
-            };
-
-            return builder.Build();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/BlockTypes.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/BlockTypes.cs
deleted file mode 100644
index 56deb6b460..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/BlockTypes.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-// 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.Collections.Generic;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    // The product code doesn't need this, but having subclasses for the block types makes tests much cleaner :)
-
-    internal class StatementBlock : Block
-    {
-        private const BlockKindInternal ThisBlockKind = BlockKindInternal.Statement;
-
-        public StatementBlock(IParentChunkGenerator chunkGenerator, IReadOnlyList<SyntaxTreeNode> children)
-            : base(ThisBlockKind, children, chunkGenerator)
-        {
-        }
-
-        public StatementBlock(IParentChunkGenerator chunkGenerator, params SyntaxTreeNode[] children)
-            : this(chunkGenerator, (IReadOnlyList<SyntaxTreeNode>)children)
-        {
-        }
-
-        public StatementBlock(params SyntaxTreeNode[] children)
-            : this(ParentChunkGenerator.Null, children)
-        {
-        }
-    }
-
-    internal class DirectiveBlock : Block
-    {
-        private const BlockKindInternal ThisBlockKind = BlockKindInternal.Directive;
-
-        public DirectiveBlock(IParentChunkGenerator chunkGenerator, IReadOnlyList<SyntaxTreeNode> children)
-            : base(ThisBlockKind, children, chunkGenerator)
-        {
-        }
-
-        public DirectiveBlock(IParentChunkGenerator chunkGenerator, params SyntaxTreeNode[] children)
-            : this(chunkGenerator, (IReadOnlyList<SyntaxTreeNode>)children)
-        {
-        }
-
-        public DirectiveBlock(params SyntaxTreeNode[] children)
-            : this(ParentChunkGenerator.Null, children)
-        {
-        }
-    }
-
-    internal class ExpressionBlock : Block
-    {
-        private const BlockKindInternal ThisBlockKind = BlockKindInternal.Expression;
-
-        public ExpressionBlock(IParentChunkGenerator chunkGenerator, IReadOnlyList<SyntaxTreeNode> children)
-            : base(ThisBlockKind, children, chunkGenerator)
-        {
-        }
-
-        public ExpressionBlock(IParentChunkGenerator chunkGenerator, params SyntaxTreeNode[] children)
-            : this(chunkGenerator, (IReadOnlyList<SyntaxTreeNode>)children)
-        {
-        }
-
-        public ExpressionBlock(params SyntaxTreeNode[] children)
-            : this(new ExpressionChunkGenerator(), children)
-        {
-        }
-    }
-
-    internal class MarkupTagBlock : Block
-    {
-        private const BlockKindInternal ThisBlockKind = BlockKindInternal.Tag;
-
-        public MarkupTagBlock(params SyntaxTreeNode[] children)
-            : base(ThisBlockKind, children, ParentChunkGenerator.Null)
-        {
-        }
-    }
-
-    internal class MarkupBlock : Block
-    {
-        private const BlockKindInternal ThisBlockKind = BlockKindInternal.Markup;
-
-        public MarkupBlock(
-            BlockKindInternal BlockKind,
-            IParentChunkGenerator chunkGenerator,
-            IReadOnlyList<SyntaxTreeNode> children)
-            : base(BlockKind, children, chunkGenerator)
-        {
-        }
-
-        public MarkupBlock(IParentChunkGenerator chunkGenerator, IReadOnlyList<SyntaxTreeNode> children)
-            : this(ThisBlockKind, chunkGenerator, children)
-        {
-        }
-
-        public MarkupBlock(IParentChunkGenerator chunkGenerator, params SyntaxTreeNode[] children)
-            : this(chunkGenerator, (IReadOnlyList<SyntaxTreeNode>)children)
-        {
-        }
-
-        public MarkupBlock(params SyntaxTreeNode[] children)
-            : this(ParentChunkGenerator.Null, children)
-        {
-        }
-    }
-
-    internal class MarkupTagHelperBlock : TagHelperBlock
-    {
-        public MarkupTagHelperBlock(string tagName)
-            : this(tagName, tagMode: TagMode.StartTagAndEndTag, attributes: new List<TagHelperAttributeNode>())
-        {
-        }
-
-        public MarkupTagHelperBlock(string tagName, TagMode tagMode)
-            : this(tagName, tagMode, new List<TagHelperAttributeNode>())
-        {
-        }
-
-        public MarkupTagHelperBlock(
-            string tagName,
-            IList<TagHelperAttributeNode> attributes)
-            : this(tagName, TagMode.StartTagAndEndTag, attributes, children: new SyntaxTreeNode[0])
-        {
-        }
-
-        public MarkupTagHelperBlock(
-            string tagName,
-            TagMode tagMode,
-            IList<TagHelperAttributeNode> attributes)
-            : this(tagName, tagMode, attributes, new SyntaxTreeNode[0])
-        {
-        }
-
-        public MarkupTagHelperBlock(string tagName, params SyntaxTreeNode[] children)
-            : this(
-                  tagName,
-                  TagMode.StartTagAndEndTag,
-                  attributes: new List<TagHelperAttributeNode>(),
-                  children: children)
-        {
-        }
-
-        public MarkupTagHelperBlock(string tagName, TagMode tagMode, params SyntaxTreeNode[] children)
-            : this(tagName, tagMode, new List<TagHelperAttributeNode>(), children)
-        {
-        }
-
-        public MarkupTagHelperBlock(
-            string tagName,
-            IList<TagHelperAttributeNode> attributes,
-            params SyntaxTreeNode[] children)
-            : base(new TagHelperBlockBuilder(
-                tagName,
-                TagMode.StartTagAndEndTag,
-                attributes: attributes,
-                children: children))
-        {
-        }
-
-        public MarkupTagHelperBlock(
-            string tagName,
-            TagMode tagMode,
-            IList<TagHelperAttributeNode> attributes,
-            params SyntaxTreeNode[] children)
-            : base(new TagHelperBlockBuilder(tagName, tagMode, attributes, children))
-        {
-        }
-    }
-
-    internal class TemplateBlock : Block
-    {
-        private const BlockKindInternal ThisBlockKind = BlockKindInternal.Template;
-
-        public TemplateBlock(IParentChunkGenerator chunkGenerator, IReadOnlyList<SyntaxTreeNode> children)
-            : base(ThisBlockKind, children, chunkGenerator)
-        {
-        }
-
-        public TemplateBlock(IParentChunkGenerator chunkGenerator, params SyntaxTreeNode[] children)
-            : this(chunkGenerator, (IReadOnlyList<SyntaxTreeNode>)children)
-        {
-        }
-
-        public TemplateBlock(params SyntaxTreeNode[] children)
-            : this(new TemplateBlockChunkGenerator(), children)
-        {
-        }
-
-        public TemplateBlock(IReadOnlyList<SyntaxTreeNode> children)
-            : this(new TemplateBlockChunkGenerator(), children)
-        {
-        }
-    }
-
-    internal class CommentBlock : Block
-    {
-        private const BlockKindInternal ThisBlockKind = BlockKindInternal.Comment;
-
-        public CommentBlock(IParentChunkGenerator chunkGenerator, IReadOnlyList<SyntaxTreeNode> children)
-            : base(ThisBlockKind, children, chunkGenerator)
-        {
-        }
-
-        public CommentBlock(IParentChunkGenerator chunkGenerator, params SyntaxTreeNode[] children)
-            : this(chunkGenerator, (IReadOnlyList<SyntaxTreeNode>)children)
-        {
-        }
-
-        public CommentBlock(params SyntaxTreeNode[] children)
-            : this(new RazorCommentChunkGenerator(), children)
-        {
-        }
-
-        public CommentBlock(IReadOnlyList<SyntaxTreeNode> children)
-            : this(new RazorCommentChunkGenerator(), children)
-        {
-        }
-    }
-
-    internal class HtmlCommentBlock : Block
-    {
-        private const BlockKindInternal ThisBlockKind = BlockKindInternal.HtmlComment;
-
-        public HtmlCommentBlock(params SyntaxTreeNode[] children)
-            : base(ThisBlockKind, children, ParentChunkGenerator.Null)
-        {
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanSerializer.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanSerializer.cs
index 40b557ff70..f38e4fb838 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanSerializer.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanSerializer.cs
@@ -1,18 +1,19 @@
 // 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;
 using System.IO;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal class ClassifiedSpanSerializer
     {
-        internal static string Serialize(SyntaxTreeNode node, string filePath = null)
+        internal static string Serialize(RazorSyntaxTree syntaxTree)
         {
             using (var writer = new StringWriter())
             {
-                var visitor = new ClassifiedSpanWriter(writer, filePath);
-                visitor.Visit(node);
+                var visitor = new ClassifiedSpanWriter(writer, syntaxTree);
+                visitor.Visit();
 
                 return writer.ToString();
             }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanVerifier.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanVerifier.cs
index c70a57337f..4894d4cf72 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanVerifier.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanVerifier.cs
@@ -1,6 +1,7 @@
 // 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;
 using System.IO;
 using System.Text;
 using Xunit;
@@ -10,12 +11,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal class ClassifiedSpanVerifier
     {
-        internal static void Verify(SyntaxTreeNode node, string filePath, string[] baseline)
+        internal static void Verify(RazorSyntaxTree syntaxTree, string[] baseline)
         {
             using (var writer = new StringWriter())
             {
-                var walker = new Walker(writer, filePath, baseline);
-                walker.Visit(node);
+                var walker = new Walker(writer, syntaxTree, baseline);
+                walker.Visit();
                 walker.AssertReachedEndOfBaseline();
             }
         }
@@ -27,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             private int _index;
 
-            public Walker(StringWriter writer, string filePath, string[] baseline) : base(writer, filePath)
+            public Walker(StringWriter writer, RazorSyntaxTree syntaxTree, string[] baseline) : base(writer, syntaxTree)
             {
                 _writer = writer;
                 _baseline = baseline;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanWriter.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanWriter.cs
index fc6258a7da..ceaf79d935 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanWriter.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ClassifiedSpan/ClassifiedSpanWriter.cs
@@ -1,31 +1,24 @@
 // 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;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal class ClassifiedSpanWriter
     {
-        private readonly string _filePath;
+        private readonly RazorSyntaxTree _syntaxTree;
         private readonly TextWriter _writer;
 
-        public ClassifiedSpanWriter(TextWriter writer, string filePath)
+        public ClassifiedSpanWriter(TextWriter writer, RazorSyntaxTree syntaxTree)
         {
             _writer = writer;
-            _filePath = filePath;
+            _syntaxTree = syntaxTree;
         }
 
-        public virtual void Visit(SyntaxTreeNode node)
+        public virtual void Visit()
         {
-            if (!(node is Block block))
-            {
-                return;
-            }
-            var classifiedSpans = GetClassifiedSpans(block, _filePath);
+            var classifiedSpans = _syntaxTree.GetClassifiedSpans();
             foreach (var span in classifiedSpans)
             {
                 VisitClassifiedSpan(span);
@@ -59,54 +52,5 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             _writer.Write(value);
         }
-
-        internal static IReadOnlyList<ClassifiedSpanInternal> GetClassifiedSpans(Block root, string filePath)
-        {
-            // We don't care about the options and diagnostic here.
-            var syntaxTree = RazorSyntaxTree.Create(
-                root,
-                TestRazorSourceDocument.Create(filePath: filePath),
-                Array.Empty<RazorDiagnostic>(),
-                RazorParserOptions.CreateDefault());
-
-            return syntaxTree.GetClassifiedSpans();
-        }
-
-        private static List<Span> Flatten(SyntaxTreeNode root)
-        {
-            var result = new List<Span>();
-            AppendFlattenedSpans(root, result);
-            return result;
-
-            void AppendFlattenedSpans(SyntaxTreeNode node, List<Span> foundSpans)
-            {
-                if (node is Span spanNode)
-                {
-                    foundSpans.Add(spanNode);
-                }
-                else
-                {
-                    if (node is TagHelperBlock tagHelperNode)
-                    {
-                        // These aren't in document order, sort them first and then dig in
-                        var attributeNodes = tagHelperNode.Attributes.Select(kvp => kvp.Value).Where(att => att != null).ToList();
-                        attributeNodes.Sort((x, y) => x.Start.AbsoluteIndex.CompareTo(y.Start.AbsoluteIndex));
-
-                        foreach (var attribute in attributeNodes)
-                        {
-                            AppendFlattenedSpans(attribute, foundSpans);
-                        }
-                    }
-
-                    if (node is Block blockNode)
-                    {
-                        foreach (var child in blockNode.Children)
-                        {
-                            AppendFlattenedSpans(child, foundSpans);
-                        }
-                    }
-                }
-            }
-        }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ErrorCollector.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ErrorCollector.cs
deleted file mode 100644
index 13da12b61a..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ErrorCollector.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// 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;
-using System.Text;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    public class ErrorCollector
-    {
-        private StringBuilder _message = new StringBuilder();
-        private int _indent = 0;
-
-        public bool Success { get; private set; }
-
-        public string Message
-        {
-            get { return _message.ToString(); }
-        }
-
-        public ErrorCollector()
-        {
-            Success = true;
-        }
-
-        public void AddError(string msg, params object[] args)
-        {
-            Append("F", msg, args);
-            Success = false;
-        }
-
-        public void AddMessage(string msg, params object[] args)
-        {
-            Append("P", msg, args);
-        }
-
-        public IDisposable Indent()
-        {
-            _indent++;
-            return new DisposableAction(Unindent);
-        }
-
-        public void Unindent()
-        {
-            _indent--;
-        }
-
-        private void Append(string prefix, string msg, object[] args)
-        {
-            _message.Append(prefix);
-            _message.Append(":");
-            _message.Append(new String('\t', _indent));
-            _message.AppendFormat(msg, args);
-            _message.AppendLine();
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
index ff140b8489..1e88100c46 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/ParserTestBase.cs
@@ -8,12 +8,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-#if NET46
-using System.Runtime.Remoting;
-using System.Runtime.Remoting.Messaging;
-#else
 using System.Threading;
-#endif
 using System.Text;
 using Xunit;
 using Xunit.Sdk;
@@ -24,15 +19,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
     [IntializeTestFile]
     public abstract class ParserTestBase
     {
-#if !NET46
         private static readonly AsyncLocal<string> _fileName = new AsyncLocal<string>();
         private static readonly AsyncLocal<bool> _isTheory = new AsyncLocal<bool>();
-#endif
 
         internal ParserTestBase()
         {
-            Factory = CreateSpanFactory();
-            BlockFactory = CreateBlockFactory();
             TestProjectRoot = TestProject.GetProjectDirectory(GetType());
         }
 
@@ -42,10 +33,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         /// </summary>
         protected bool FixupSpans { get; set; }
 
-        internal SpanFactory Factory { get; private set; }
-
-        internal BlockFactory BlockFactory { get; private set; }
-
 #if GENERATE_BASELINES
         protected bool GenerateBaselines { get; set; } = true;
 #else
@@ -57,47 +44,23 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         // Used by the test framework to set the 'base' name for test files.
         public static string FileName
         {
-#if NET46
-            get
-            {
-                var handle = (ObjectHandle)CallContext.LogicalGetData("ParserTestBase_FileName");
-                return (string)handle.Unwrap();
-            }
-            set
-            {
-                CallContext.LogicalSetData("ParserTestBase_FileName", new ObjectHandle(value));
-            }
-#elif NETCOREAPP2_2
             get { return _fileName.Value; }
             set { _fileName.Value = value; }
-#endif
         }
 
         public static bool IsTheory
         {
-#if NET46
-            get
-            {
-                var handle = (ObjectHandle)CallContext.LogicalGetData("ParserTestBase_IsTheory");
-                return (bool)handle.Unwrap();
-            }
-            set
-            {
-                CallContext.LogicalSetData("ParserTestBase_IsTheory", new ObjectHandle(value));
-            }
-#elif NETCOREAPP2_2
             get { return _isTheory.Value; }
             set { _isTheory.Value = value; }
-#endif
         }
 
-        internal void AssertSyntaxTreeNodeMatchesBaseline(RazorSyntaxTree syntaxTree)
-        {
-            AssertSyntaxTreeNodeMatchesBaseline(syntaxTree.Root, syntaxTree.Source.FilePath, syntaxTree.Diagnostics.ToArray());
-        }
+        protected int BaselineTestCount { get; set; }
 
-        internal void AssertSyntaxTreeNodeMatchesBaseline(Block root, string filePath, params RazorDiagnostic[] diagnostics)
+        internal virtual void AssertSyntaxTreeNodeMatchesBaseline(RazorSyntaxTree syntaxTree)
         {
+            var root = syntaxTree.Root;
+            var diagnostics = syntaxTree.Diagnostics;
+            var filePath = syntaxTree.Source.FilePath;
             if (FileName == null)
             {
                 var message = $"{nameof(AssertSyntaxTreeNodeMatchesBaseline)} should only be called from a parser test ({nameof(FileName)} is null).";
@@ -110,16 +73,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 throw new InvalidOperationException(message);
             }
 
-            var baselineFileName = Path.ChangeExtension(FileName, ".stree.txt");
-            var baselineDiagnosticsFileName = Path.ChangeExtension(FileName, ".diag.txt");
-            var baselineClassifiedSpansFileName = Path.ChangeExtension(FileName, ".cspans.txt");
-            var baselineTagHelperSpansFileName = Path.ChangeExtension(FileName, ".tspans.txt");
+            var fileName = BaselineTestCount > 0 ? FileName + $"_{BaselineTestCount}" : FileName;
+            var baselineFileName = Path.ChangeExtension(fileName, ".stree.txt");
+            var baselineDiagnosticsFileName = Path.ChangeExtension(fileName, ".diag.txt");
+            var baselineClassifiedSpansFileName = Path.ChangeExtension(fileName, ".cspans.txt");
+            var baselineTagHelperSpansFileName = Path.ChangeExtension(fileName, ".tspans.txt");
+            BaselineTestCount++;
 
             if (GenerateBaselines)
             {
                 // Write syntax tree baseline
                 var baselineFullPath = Path.Combine(TestProjectRoot, baselineFileName);
-                File.WriteAllText(baselineFullPath, SyntaxTreeNodeSerializer.Serialize(root));
+                File.WriteAllText(baselineFullPath, SyntaxNodeSerializer.Serialize(root));
 
                 // Write diagnostics baseline
                 var baselineDiagnosticsFullPath = Path.Combine(TestProjectRoot, baselineDiagnosticsFileName);
@@ -135,11 +100,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
                 // Write classified spans baseline
                 var classifiedSpansBaselineFullPath = Path.Combine(TestProjectRoot, baselineClassifiedSpansFileName);
-                File.WriteAllText(classifiedSpansBaselineFullPath, ClassifiedSpanSerializer.Serialize(root, filePath));
+                File.WriteAllText(classifiedSpansBaselineFullPath, ClassifiedSpanSerializer.Serialize(syntaxTree));
 
                 // Write tag helper spans baseline
                 var tagHelperSpansBaselineFullPath = Path.Combine(TestProjectRoot, baselineTagHelperSpansFileName);
-                var serializedTagHelperSpans = TagHelperSpanSerializer.Serialize(root, filePath);
+                var serializedTagHelperSpans = TagHelperSpanSerializer.Serialize(syntaxTree);
                 if (!string.IsNullOrEmpty(serializedTagHelperSpans))
                 {
                     File.WriteAllText(tagHelperSpansBaselineFullPath, serializedTagHelperSpans);
@@ -160,7 +125,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
 
             var baseline = stFile.ReadAllText().Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
-            SyntaxTreeNodeVerifier.Verify(root, baseline);
+            SyntaxNodeVerifier.Verify(root, baseline);
 
             // Verify diagnostics
             var baselineDiagnostics = string.Empty;
@@ -179,6 +144,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             {
                 throw new XunitException($"The resource {baselineClassifiedSpansFileName} was not found.");
             }
+            else
+            {
+                var classifiedSpanBaseline = new string[0];
+                classifiedSpanBaseline = classifiedSpanFile.ReadAllText().Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
+                ClassifiedSpanVerifier.Verify(syntaxTree, classifiedSpanBaseline);
+            }
 
             // Verify tag helper spans
             var tagHelperSpanFile = TestFile.Create(baselineTagHelperSpansFileName, GetType().GetTypeInfo().Assembly);
@@ -186,12 +157,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             if (tagHelperSpanFile.Exists())
             {
                 tagHelperSpanBaseline = tagHelperSpanFile.ReadAllText().Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
+                TagHelperSpanVerifier.Verify(syntaxTree, tagHelperSpanBaseline);
             }
-
-            TagHelperSpanVerifier.Verify(root, filePath, tagHelperSpanBaseline);
         }
 
-        private static string SerializeDiagnostic(RazorDiagnostic diagnostic)
+        protected static string SerializeDiagnostic(RazorDiagnostic diagnostic)
         {
             var content = RazorDiagnosticSerializer.Serialize(diagnostic);
             var normalized = NormalizeNewLines(content);
@@ -214,16 +184,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             AssertSyntaxTreeNodeMatchesBaseline(syntaxTree);
         }
 
-        internal virtual void BaselineTest(Block root, string filePath = null, bool verifySyntaxTree = true, params RazorDiagnostic[] diagnostics)
-        {
-            if (verifySyntaxTree)
-            {
-                SyntaxTreeVerifier.Verify(root);
-            }
-
-            AssertSyntaxTreeNodeMatchesBaseline(root, filePath, diagnostics);
-        }
-
         internal RazorSyntaxTree ParseBlock(string document, bool designTime)
         {
             return ParseBlock(RazorLanguageVersion.Latest, document, designTime);
@@ -241,28 +201,28 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         internal abstract RazorSyntaxTree ParseBlock(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime);
 
-        internal RazorSyntaxTree ParseDocument(string document, bool designTime = false)
+        internal RazorSyntaxTree ParseDocument(string document, bool designTime = false, RazorParserFeatureFlags featureFlags = null)
         {
-            return ParseDocument(RazorLanguageVersion.Latest, document, designTime);
+            return ParseDocument(RazorLanguageVersion.Latest, document, designTime, featureFlags);
         }
 
-        internal RazorSyntaxTree ParseDocument(RazorLanguageVersion version, string document, bool designTime = false)
+        internal RazorSyntaxTree ParseDocument(RazorLanguageVersion version, string document, bool designTime = false, RazorParserFeatureFlags featureFlags = null)
         {
-            return ParseDocument(version, document, null, designTime);
+            return ParseDocument(version, document, null, designTime, featureFlags);
         }
 
-        internal RazorSyntaxTree ParseDocument(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime = false)
+        internal RazorSyntaxTree ParseDocument(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime = false, RazorParserFeatureFlags featureFlags = null)
         {
-            return ParseDocument(RazorLanguageVersion.Latest, document, directives, designTime);
+            return ParseDocument(RazorLanguageVersion.Latest, document, directives, designTime, featureFlags);
         }
 
-        internal virtual RazorSyntaxTree ParseDocument(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime = false)
+        internal virtual RazorSyntaxTree ParseDocument(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime = false, RazorParserFeatureFlags featureFlags = null)
         {
             directives = directives ?? Array.Empty<DirectiveDescriptor>();
 
-            var source = TestRazorSourceDocument.Create(document, filePath: null, normalizeNewLines: true);
+            var source = TestRazorSourceDocument.Create(document, filePath: null, relativePath: null, normalizeNewLines: true);
 
-            var options = CreateParserOptions(version, directives, designTime);
+            var options = CreateParserOptions(version, directives, designTime, featureFlags);
             var context = new ParserContext(source, options);
 
             var codeParser = new CSharpCodeParser(directives, context);
@@ -271,9 +231,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             codeParser.HtmlParser = markupParser;
             markupParser.CodeParser = codeParser;
 
-            markupParser.ParseDocument();
+            var root = markupParser.ParseDocument().CreateRed();
 
-            var root = context.Builder.Build();
             var diagnostics = context.ErrorSink.Errors;
 
             var codeDocument = RazorCodeDocument.Create(source);
@@ -291,22 +250,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             directives = directives ?? Array.Empty<DirectiveDescriptor>();
 
-            var source = TestRazorSourceDocument.Create(document, filePath: null, normalizeNewLines: true);
+            var source = TestRazorSourceDocument.Create(document, filePath: null, relativePath: null, normalizeNewLines: true);
+
             var options = CreateParserOptions(version, directives, designTime);
             var context = new ParserContext(source, options);
 
-            var parser = new HtmlMarkupParser(context);
-            parser.CodeParser = new CSharpCodeParser(directives, context)
-            {
-                HtmlParser = parser,
-            };
+            var codeParser = new CSharpCodeParser(directives, context);
+            var markupParser = new HtmlMarkupParser(context);
 
-            parser.ParseBlock();
+            codeParser.HtmlParser = markupParser;
+            markupParser.CodeParser = codeParser;
+
+            var root = markupParser.ParseBlock().CreateRed();
 
-            var root = context.Builder.Build();
             var diagnostics = context.ErrorSink.Errors;
 
-            return RazorSyntaxTree.Create(root, source, diagnostics, options);
+            var syntaxTree = RazorSyntaxTree.Create(root, source, diagnostics, options);
+
+            return syntaxTree;
         }
 
         internal RazorSyntaxTree ParseCodeBlock(string document, bool designTime = false)
@@ -322,41 +283,31 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             directives = directives ?? Array.Empty<DirectiveDescriptor>();
 
-            var source = TestRazorSourceDocument.Create(document, filePath: null, normalizeNewLines: true);
+            var source = TestRazorSourceDocument.Create(document, filePath: null, relativePath: null, normalizeNewLines: true);
+
             var options = CreateParserOptions(version, directives, designTime);
             var context = new ParserContext(source, options);
 
-            var parser = new CSharpCodeParser(directives, context);
-            parser.HtmlParser = new HtmlMarkupParser(context)
-            {
-                CodeParser = parser,
-            };
+            var codeParser = new CSharpCodeParser(directives, context);
+            var markupParser = new HtmlMarkupParser(context);
 
-            parser.ParseBlock();
+            codeParser.HtmlParser = markupParser;
+            markupParser.CodeParser = codeParser;
+
+            var root = codeParser.ParseBlock().CreateRed();
 
-            var root = context.Builder.Build();
             var diagnostics = context.ErrorSink.Errors;
 
-            return RazorSyntaxTree.Create(root, source, diagnostics, options);
-        }
+            var syntaxTree = RazorSyntaxTree.Create(root, source, diagnostics, options);
 
-        internal SpanFactory CreateSpanFactory()
-        {
-            return new SpanFactory();
+            return syntaxTree;
         }
 
-        internal abstract BlockFactory CreateBlockFactory();
-
         internal virtual void ParseBlockTest(string document)
         {
             ParseBlockTest(document, null, false, new RazorDiagnostic[0]);
         }
 
-        internal virtual void ParseBlockTest(string document, bool designTime)
-        {
-            ParseBlockTest(document, null, designTime, new RazorDiagnostic[0]);
-        }
-
         internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives)
         {
             ParseBlockTest(document, directives, null);
@@ -374,55 +325,25 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
         internal virtual void ParseBlockTest(RazorLanguageVersion version, string document)
         {
-            ParseBlockTest(version, document, expectedRoot: null);
+            ParseBlockTest(version, document, false, null);
         }
 
-        internal virtual void ParseBlockTest(RazorLanguageVersion version, string document, Block expectedRoot)
+        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives, params RazorDiagnostic[] expectedErrors)
         {
-            ParseBlockTest(version, document, expectedRoot, false, null);
+            ParseBlockTest(document, directives, false, expectedErrors);
         }
 
-        internal virtual void ParseBlockTest(string document, Block expectedRoot)
+        internal virtual void ParseBlockTest(RazorLanguageVersion version, string document, bool designTime, params RazorDiagnostic[] expectedErrors)
         {
-            ParseBlockTest(document, expectedRoot, false, null);
+            ParseBlockTest(version, document, null, designTime, expectedErrors);
         }
 
-        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives, Block expectedRoot)
+        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime, params RazorDiagnostic[] expectedErrors)
         {
-            ParseBlockTest(document, directives, expectedRoot, false, null);
+            ParseBlockTest(RazorLanguageVersion.Latest, document, directives, designTime, expectedErrors);
         }
 
-        internal virtual void ParseBlockTest(string document, Block expectedRoot, bool designTime)
-        {
-            ParseBlockTest(document, expectedRoot, designTime, null);
-        }
-
-        internal virtual void ParseBlockTest(string document, Block expectedRoot, params RazorDiagnostic[] expectedErrors)
-        {
-            ParseBlockTest(document, expectedRoot, false, expectedErrors);
-        }
-
-        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives, Block expectedRoot, params RazorDiagnostic[] expectedErrors)
-        {
-            ParseBlockTest(document, directives, expectedRoot, false, expectedErrors);
-        }
-
-        internal virtual void ParseBlockTest(string document, Block expected, bool designTime, params RazorDiagnostic[] expectedErrors)
-        {
-            ParseBlockTest(document, null, expected, designTime, expectedErrors);
-        }
-
-        internal virtual void ParseBlockTest(RazorLanguageVersion version, string document, Block expected, bool designTime, params RazorDiagnostic[] expectedErrors)
-        {
-            ParseBlockTest(version, document, null, expected, designTime, expectedErrors);
-        }
-
-        internal virtual void ParseBlockTest(string document, IEnumerable<DirectiveDescriptor> directives, Block expected, bool designTime, params RazorDiagnostic[] expectedErrors)
-        {
-            ParseBlockTest(RazorLanguageVersion.Latest, document, directives, expected, designTime, expectedErrors);
-        }
-
-        internal virtual void ParseBlockTest(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, Block expected, bool designTime, params RazorDiagnostic[] expectedErrors)
+        internal virtual void ParseBlockTest(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime, params RazorDiagnostic[] expectedErrors)
         {
             var result = ParseBlock(version, document, directives, designTime);
 
@@ -471,24 +392,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             ParseDocumentTest(document, null, false);
         }
 
-        internal virtual void ParseDocumentTest(string document, IEnumerable<DirectiveDescriptor> directives)
+        internal virtual void ParseDocumentTest(string document, params RazorDiagnostic[] expectedErrors)
         {
-            ParseDocumentTest(document, directives, expected: null);
+            ParseDocumentTest(document, false, expectedErrors);
         }
 
-        internal virtual void ParseDocumentTest(string document, Block expectedRoot)
+        internal virtual void ParseDocumentTest(string document, IEnumerable<DirectiveDescriptor> directives, params RazorDiagnostic[] expectedErrors)
         {
-            ParseDocumentTest(document, expectedRoot, false, null);
-        }
-
-        internal virtual void ParseDocumentTest(string document, Block expectedRoot, params RazorDiagnostic[] expectedErrors)
-        {
-            ParseDocumentTest(document, expectedRoot, false, expectedErrors);
-        }
-
-        internal virtual void ParseDocumentTest(string document, IEnumerable<DirectiveDescriptor> directives, Block expected, params RazorDiagnostic[] expectedErrors)
-        {
-            ParseDocumentTest(document, directives, expected, false, expectedErrors);
+            ParseDocumentTest(document, directives, false, expectedErrors);
         }
 
         internal virtual void ParseDocumentTest(string document, bool designTime)
@@ -496,277 +407,57 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             ParseDocumentTest(document, null, designTime);
         }
 
-        internal virtual void ParseDocumentTest(string document, Block expectedRoot, bool designTime)
+        internal virtual void ParseDocumentTest(string document, bool designTime, params RazorDiagnostic[] expectedErrors)
         {
-            ParseDocumentTest(document, expectedRoot, designTime, null);
+            ParseDocumentTest(document, null, designTime, expectedErrors);
         }
 
-        internal virtual void ParseDocumentTest(string document, Block expected, bool designTime, params RazorDiagnostic[] expectedErrors)
-        {
-            ParseDocumentTest(document, null, expected, designTime, expectedErrors);
-        }
-
-        internal virtual void ParseDocumentTest(string document, IEnumerable<DirectiveDescriptor> directives, Block expected, bool designTime, params RazorDiagnostic[] expectedErrors)
+        internal virtual void ParseDocumentTest(string document, IEnumerable<DirectiveDescriptor> directives, bool designTime, params RazorDiagnostic[] expectedErrors)
         {
             var result = ParseDocument(document, directives, designTime);
 
             BaselineTest(result);
         }
 
-        internal static void EvaluateResults(RazorSyntaxTree result, Block expectedRoot)
-        {
-            EvaluateResults(result, expectedRoot, null);
-        }
-
-        internal static void EvaluateResults(RazorSyntaxTree result, Block expectedRoot, IList<RazorDiagnostic> expectedErrors)
-        {
-            EvaluateParseTree(result.Root, expectedRoot);
-            EvaluateRazorErrors(result.Diagnostics, expectedErrors);
-        }
-
-        internal static void EvaluateParseTree(Block actualRoot, Block expectedRoot)
-        {
-            // Evaluate the result
-            var collector = new ErrorCollector();
-
-            if (expectedRoot == null)
-            {
-                Assert.Null(actualRoot);
-            }
-            else
-            {
-                // Link all the nodes
-                expectedRoot.LinkNodes();
-                Assert.NotNull(actualRoot);
-                EvaluateSyntaxTreeNode(collector, actualRoot, expectedRoot);
-                if (collector.Success)
-                {
-                    WriteTraceLine("Parse Tree Validation Succeeded:" + Environment.NewLine + collector.Message);
-                }
-                else
-                {
-                    Assert.True(false, Environment.NewLine + collector.Message);
-                }
-            }
-        }
-
-        private static void EvaluateSyntaxTreeNode(ErrorCollector collector, SyntaxTreeNode actual, SyntaxTreeNode expected)
-        {
-            if (actual == null)
-            {
-                AddNullActualError(collector, actual, expected);
-                return;
-            }
-
-            if (actual.IsBlock != expected.IsBlock)
-            {
-                AddMismatchError(collector, actual, expected);
-            }
-            else
-            {
-                if (expected.IsBlock)
-                {
-                    EvaluateBlock(collector, (Block)actual, (Block)expected);
-                }
-                else
-                {
-                    EvaluateSpan(collector, (Span)actual, (Span)expected);
-                }
-            }
-        }
-
-        private static void EvaluateSpan(ErrorCollector collector, Span actual, Span expected)
-        {
-            if (!Equals(expected, actual))
-            {
-                AddMismatchError(collector, actual, expected);
-            }
-            else
-            {
-                AddPassedMessage(collector, expected);
-            }
-        }
-
-        private static void EvaluateBlock(ErrorCollector collector, Block actual, Block expected)
-        {
-            if (actual.Type != expected.Type || !expected.ChunkGenerator.Equals(actual.ChunkGenerator))
-            {
-                AddMismatchError(collector, actual, expected);
-            }
-            else
-            {
-                if (actual is TagHelperBlock)
-                {
-                    EvaluateTagHelperBlock(collector, actual as TagHelperBlock, expected as TagHelperBlock);
-                }
-
-                AddPassedMessage(collector, expected);
-                using (collector.Indent())
-                {
-                    var expectedNodes = expected.Children.GetEnumerator();
-                    var actualNodes = actual.Children.GetEnumerator();
-                    while (expectedNodes.MoveNext())
-                    {
-                        if (!actualNodes.MoveNext())
-                        {
-                            collector.AddError("{0} - FAILED :: No more elements at this node", expectedNodes.Current);
-                        }
-                        else
-                        {
-                            EvaluateSyntaxTreeNode(collector, actualNodes.Current, expectedNodes.Current);
-                        }
-                    }
-                    while (actualNodes.MoveNext())
-                    {
-                        collector.AddError("End of Node - FAILED :: Found Node: {0}", actualNodes.Current);
-                    }
-                }
-            }
-        }
-
-        private static void EvaluateTagHelperBlock(ErrorCollector collector, TagHelperBlock actual, TagHelperBlock expected)
-        {
-            if (expected == null)
-            {
-                AddMismatchError(collector, actual, expected);
-            }
-            else
-            {
-                if (!string.Equals(expected.TagName, actual.TagName, StringComparison.Ordinal))
-                {
-                    collector.AddError(
-                        "{0} - FAILED :: TagName mismatch for TagHelperBlock :: ACTUAL: {1}",
-                        expected.TagName,
-                        actual.TagName);
-                }
-
-                if (expected.TagMode != actual.TagMode)
-                {
-                    collector.AddError(
-                        $"{expected.TagMode} - FAILED :: {nameof(TagMode)} for {nameof(TagHelperBlock)} " +
-                        $"{actual.TagName} :: ACTUAL: {actual.TagMode}");
-                }
-
-                var expectedAttributes = expected.Attributes.GetEnumerator();
-                var actualAttributes = actual.Attributes.GetEnumerator();
-
-                while (expectedAttributes.MoveNext())
-                {
-                    if (!actualAttributes.MoveNext())
-                    {
-                        collector.AddError("{0} - FAILED :: No more attributes on this node", expectedAttributes.Current);
-                    }
-                    else
-                    {
-                        EvaluateTagHelperAttribute(collector, actualAttributes.Current, expectedAttributes.Current);
-                    }
-                }
-                while (actualAttributes.MoveNext())
-                {
-                    collector.AddError("End of Attributes - FAILED :: Found Attribute: {0}", actualAttributes.Current.Name);
-                }
-            }
-        }
-
-        private static void EvaluateTagHelperAttribute(
-            ErrorCollector collector,
-            TagHelperAttributeNode actual,
-            TagHelperAttributeNode expected)
-        {
-            if (actual.Name != expected.Name)
-            {
-                collector.AddError("{0} - FAILED :: Attribute names do not match", expected.Name);
-            }
-            else
-            {
-                collector.AddMessage("{0} - PASSED :: Attribute names match", expected.Name);
-            }
-
-            if (actual.AttributeStructure != expected.AttributeStructure)
-            {
-                collector.AddError("{0} - FAILED :: Attribute value styles do not match", expected.AttributeStructure.ToString());
-            }
-            else
-            {
-                collector.AddMessage("{0} - PASSED :: Attribute value style match", expected.AttributeStructure);
-            }
-
-            if (actual.AttributeStructure != AttributeStructure.Minimized)
-            {
-                EvaluateSyntaxTreeNode(collector, actual.Value, expected.Value);
-            }
-        }
-
-        private static void AddPassedMessage(ErrorCollector collector, SyntaxTreeNode expected)
-        {
-            collector.AddMessage("{0} - PASSED", expected);
-        }
-
-        private static void AddMismatchError(ErrorCollector collector, SyntaxTreeNode actual, SyntaxTreeNode expected)
-        {
-            collector.AddError("{0} - FAILED :: Actual: {1}", expected, actual);
-        }
-
-        private static void AddNullActualError(ErrorCollector collector, SyntaxTreeNode actual, SyntaxTreeNode expected)
-        {
-            collector.AddError("{0} - FAILED :: Actual: << Null >>", expected);
-        }
-
-        internal static void EvaluateRazorErrors(IEnumerable<RazorDiagnostic> actualErrors, IList<RazorDiagnostic> expectedErrors)
-        {
-            var realCount = actualErrors.Count();
-
-            // Evaluate the errors
-            if (expectedErrors == null || expectedErrors.Count == 0)
-            {
-                Assert.True(
-                    realCount == 0,
-                    "Expected that no errors would be raised, but the following errors were:" + Environment.NewLine + FormatErrors(actualErrors));
-            }
-            else
-            {
-                Assert.True(
-                    expectedErrors.Count == realCount,
-                    $"Expected that {expectedErrors.Count} errors would be raised, but {realCount} errors were." +
-                    $"{Environment.NewLine}Expected Errors: {Environment.NewLine}{FormatErrors(expectedErrors)}" +
-                    $"{Environment.NewLine}Actual Errors: {Environment.NewLine}{FormatErrors(actualErrors)}");
-                Assert.Equal(expectedErrors, actualErrors);
-            }
-            WriteTraceLine("Expected Errors were raised:" + Environment.NewLine + FormatErrors(expectedErrors));
-        }
-
-        internal static string FormatErrors(IEnumerable<RazorDiagnostic> errors)
-        {
-            if (errors == null)
-            {
-                return "\t<< No Errors >>";
-            }
-
-            var builder = new StringBuilder();
-            foreach (var error in errors)
-            {
-                builder.AppendFormat("\t{0}", error);
-                builder.AppendLine();
-            }
-            return builder.ToString();
-        }
-
-        [Conditional("PARSER_TRACE")]
-        private static void WriteTraceLine(string format, params object[] args)
-        {
-            Trace.WriteLine(string.Format(format, args));
-        }
-
-        private static RazorParserOptions CreateParserOptions(
+        internal static RazorParserOptions CreateParserOptions(
             RazorLanguageVersion version, 
             IEnumerable<DirectiveDescriptor> directives, 
-            bool designTime)
+            bool designTime,
+            RazorParserFeatureFlags featureFlags = null)
         {
-            return new DefaultRazorParserOptions(
+            return new TestRazorParserOptions(
                 directives.ToArray(),
                 designTime,
                 parseLeadingDirectives: false,
-                version: version);
+                version: version,
+                featureFlags: featureFlags);
+        }
+
+        private class TestRazorParserOptions : RazorParserOptions
+        {
+            public TestRazorParserOptions(DirectiveDescriptor[] directives, bool designTime, bool parseLeadingDirectives, RazorLanguageVersion version, RazorParserFeatureFlags featureFlags = null)
+            {
+                if (directives == null)
+                {
+                    throw new ArgumentNullException(nameof(directives));
+                }
+
+                Directives = directives;
+                DesignTime = designTime;
+                ParseLeadingDirectives = parseLeadingDirectives;
+                Version = version;
+                FeatureFlags = featureFlags ?? RazorParserFeatureFlags.Create(Version);
+            }
+
+            public override bool DesignTime { get; }
+
+            public override IReadOnlyCollection<DirectiveDescriptor> Directives { get; }
+
+            public override bool ParseLeadingDirectives { get; }
+
+            public override RazorLanguageVersion Version { get; }
+
+            internal override RazorParserFeatureFlags FeatureFlags { get; }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/RawTextToken.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/RawTextToken.cs
deleted file mode 100644
index 943ed7ffce..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/RawTextToken.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// 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;
-using System.Globalization;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class RawTextToken : IToken
-    {
-        public RawTextToken(SourceLocation start, string content)
-        {
-            Start = start;
-            Content = content;
-        }
-
-        public SourceLocation Start { get; private set; }
-        public string Content { get; }
-        public Span Parent { get; set; }
-
-        public override bool Equals(object obj)
-        {
-            var other = obj as RawTextToken;
-            return other != null && Equals(Start, other.Start) && Equals(Content, other.Content);
-        }
-
-        internal bool EquivalentTo(IToken token)
-        {
-            return Equals(Start, token.Start) && Equals(Content, token.Content);
-        }
-
-        public override int GetHashCode()
-        {
-            // Hash code should include only immutable properties.
-            return Content == null ? 0 : Content.GetHashCode();
-        }
-
-        public override string ToString()
-        {
-            return string.Format(CultureInfo.InvariantCulture, "{0} RAW - [{1}]", Start, Content);
-        }
-
-        internal void CalculateStart(Span prev)
-        {
-            if (prev == null)
-            {
-                Start = SourceLocation.Zero;
-            }
-            else
-            {
-                Start = new SourceLocationTracker(prev.Start).UpdateLocation(prev.Content).CurrentLocation;
-            }
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxTreeNodeSerializer.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeSerializer.cs
similarity index 52%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxTreeNodeSerializer.cs
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeSerializer.cs
index 50a22e25a7..df81d12351 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxTreeNodeSerializer.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeSerializer.cs
@@ -1,13 +1,14 @@
-// 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.IO;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
-    public static class SyntaxTreeNodeSerializer
+    public static class SyntaxNodeSerializer
     {
-        internal static string Serialize(SyntaxTreeNode node)
+        internal static string Serialize(SyntaxNode node)
         {
             using (var writer = new StringWriter())
             {
@@ -18,30 +19,42 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
 
-        private class Walker : SyntaxTreeNodeWalker
+        private class Walker : SyntaxNodeWalker
         {
-            private readonly SyntaxTreeNodeWriter _visitor;
+            private readonly SyntaxNodeWriter _visitor;
             private readonly TextWriter _writer;
 
             public Walker(TextWriter writer)
             {
-                _visitor = new SyntaxTreeNodeWriter(writer);
+                _visitor = new SyntaxNodeWriter(writer);
                 _writer = writer;
             }
 
             public TextWriter Writer { get; }
 
-            public override void Visit(SyntaxTreeNode node)
+            public override SyntaxNode Visit(SyntaxNode node)
             {
+                if (node == null)
+                {
+                    return node;
+                }
+
+                if (node.IsList)
+                {
+                    return base.DefaultVisit(node);
+                }
+
                 _visitor.Visit(node);
                 _writer.WriteLine();
 
-                if (node is Block block)
+                if (!node.IsToken && !node.IsTrivia)
                 {
                     _visitor.Depth++;
-                    base.VisitDefault(block);
+                    node = base.DefaultVisit(node);
                     _visitor.Depth--;
                 }
+
+                return node;
             }
         }
     }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxTreeNodeVerifier.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeVerifier.cs
similarity index 76%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxTreeNodeVerifier.cs
rename to src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeVerifier.cs
index bb8d0bab72..17a0cbf72f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxTreeNodeVerifier.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeVerifier.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;
@@ -6,24 +6,25 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Xunit;
 using Xunit.Sdk;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
-    public static class SyntaxTreeNodeVerifier
+    public static class SyntaxNodeVerifier
     {
-        internal static void Verify(SyntaxTreeNode node, string[] baseline)
+        internal static void Verify(SyntaxNode node, string[] baseline)
         {
             var walker = new Walker(baseline);
             walker.Visit(node);
             walker.AssertReachedEndOfBaseline();
         }
 
-        private class Walker : SyntaxTreeNodeWalker
+        private class Walker : SyntaxNodeWalker
         {
             private readonly string[] _baseline;
-            private readonly SyntaxTreeNodeWriter _visitor;
+            private readonly SyntaxNodeWriter _visitor;
             private readonly StringWriter _writer;
 
             private int _index;
@@ -32,14 +33,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             {
                 _writer = new StringWriter();
 
-                _visitor = new SyntaxTreeNodeWriter(_writer);
+                _visitor = new SyntaxNodeWriter(_writer);
                 _baseline = baseline;
             }
 
             public TextWriter Writer { get; }
 
-            public override void Visit(SyntaxTreeNode node)
+            public override SyntaxNode Visit(SyntaxNode node)
             {
+                if (node == null)
+                {
+                    return node;
+                }
+
+                if (node.IsList)
+                {
+                    return base.DefaultVisit(node);
+                }
+
                 var expected = _index < _baseline.Length ? _baseline[_index++] : null;
 
                 // Write the node as text for comparison
@@ -56,12 +67,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
                 AssertNodeEquals(node, Ancestors, expected, actual);
 
-                if (node is Block block)
+                if (!node.IsToken && !node.IsTrivia)
                 {
                     _visitor.Depth++;
-                    base.VisitDefault(block);
+                    base.DefaultVisit(node);
                     _visitor.Depth--;
                 }
+
+                return node;
             }
 
             public void AssertReachedEndOfBaseline()
@@ -70,7 +83,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 Assert.True(_baseline.Length == _index, "Not all lines of the baseline were visited!");
             }
 
-            private void AssertNodeEquals(SyntaxTreeNode node, IEnumerable<SyntaxTreeNode> ancestors, string expected, string actual)
+            private void AssertNodeEquals(SyntaxNode node, IEnumerable<SyntaxNode> ancestors, string expected, string actual)
             {
                 if (string.Equals(expected, actual))
                 {
@@ -81,7 +94,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 if (expected == null)
                 {
                     var message = "The node is missing from baseline.";
-                    throw new SyntaxTreeNodeBaselineException(node, Ancestors.ToArray(), expected, actual, message);
+                    throw new SyntaxNodeBaselineException(node, Ancestors.ToArray(), expected, actual, message);
                 }
 
                 int charsVerified = 0;
@@ -95,7 +108,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 throw new InvalidOperationException("We can't figure out HOW these two things are different. This is a bug.");
             }
 
-            private void AssertNestingEqual(SyntaxTreeNode node, IEnumerable<SyntaxTreeNode> ancestors, string expected, string actual, ref int charsVerified)
+            private void AssertNestingEqual(SyntaxNode node, IEnumerable<SyntaxNode> ancestors, string expected, string actual, ref int charsVerified)
             {
                 var i = 0;
                 for (; i < expected.Length; i++)
@@ -125,13 +138,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 if (failed)
                 {
                     var message = "The node is at the wrong level of nesting. This usually means a child is missing.";
-                    throw new SyntaxTreeNodeBaselineException(node, ancestors.ToArray(), expected, actual, message);
+                    throw new SyntaxNodeBaselineException(node, ancestors.ToArray(), expected, actual, message);
                 }
 
                 charsVerified = j;
             }
 
-            private void AssertNameEqual(SyntaxTreeNode node, IEnumerable<SyntaxTreeNode> ancestors, string expected, string actual, ref int charsVerified)
+            private void AssertNameEqual(SyntaxNode node, IEnumerable<SyntaxNode> ancestors, string expected, string actual, ref int charsVerified)
             {
                 var expectedName = GetName(expected, charsVerified);
                 var actualName = GetName(actual, charsVerified);
@@ -139,14 +152,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 if (!string.Equals(expectedName, actualName))
                 {
                     var message = $"Node names are not equal.";
-                    throw new SyntaxTreeNodeBaselineException(node, ancestors.ToArray(), expected, actual, message);
+                    throw new SyntaxNodeBaselineException(node, ancestors.ToArray(), expected, actual, message);
                 }
 
                 charsVerified += expectedName.Length;
             }
 
             // Either both strings need to have a delimiter next or neither should.
-            private void AssertDelimiter(SyntaxTreeNode node, string expected, string actual, bool required, ref int charsVerified)
+            private void AssertDelimiter(SyntaxNode node, string expected, string actual, bool required, ref int charsVerified)
             {
                 if (charsVerified == expected.Length && required)
                 {
@@ -180,7 +193,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 charsVerified += 3;
             }
 
-            private void AssertLocationEqual(SyntaxTreeNode node, IEnumerable<SyntaxTreeNode> ancestors, string expected, string actual, ref int charsVerified)
+            private void AssertLocationEqual(SyntaxNode node, IEnumerable<SyntaxNode> ancestors, string expected, string actual, ref int charsVerified)
             {
                 var expectedLocation = GetLocation(expected, charsVerified);
                 var actualLocation = GetLocation(actual, charsVerified);
@@ -188,13 +201,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 if (!string.Equals(expectedLocation, actualLocation))
                 {
                     var message = $"Locations are not equal.";
-                    throw new SyntaxTreeNodeBaselineException(node, ancestors.ToArray(), expected, actual, message);
+                    throw new SyntaxNodeBaselineException(node, ancestors.ToArray(), expected, actual, message);
                 }
 
                 charsVerified += expectedLocation.Length;
             }
 
-            private void AssertContentEqual(SyntaxTreeNode node, IEnumerable<SyntaxTreeNode> ancestors, string expected, string actual, ref int charsVerified)
+            private void AssertContentEqual(SyntaxNode node, IEnumerable<SyntaxNode> ancestors, string expected, string actual, ref int charsVerified)
             {
                 var expectedContent = GetContent(expected, charsVerified);
                 var actualContent = GetContent(actual, charsVerified);
@@ -202,7 +215,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 if (!string.Equals(expectedContent, actualContent))
                 {
                     var message = $"Contents are not equal.";
-                    throw new SyntaxTreeNodeBaselineException(node, ancestors.ToArray(), expected, actual, message);
+                    throw new SyntaxNodeBaselineException(node, ancestors.ToArray(), expected, actual, message);
                 }
 
                 charsVerified += expectedContent.Length;
@@ -230,9 +243,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 return start == text.Length ? string.Empty : text.Substring(start);
             }
 
-            private class SyntaxTreeNodeBaselineException : XunitException
+            private class SyntaxNodeBaselineException : XunitException
             {
-                public SyntaxTreeNodeBaselineException(SyntaxTreeNode node, SyntaxTreeNode[] ancestors, string expected, string actual, string userMessage)
+                public SyntaxNodeBaselineException(SyntaxNode node, SyntaxNode[] ancestors, string expected, string actual, string userMessage)
                     : base(Format(node, ancestors, expected, actual, userMessage))
                 {
                     Node = node;
@@ -240,13 +253,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                     Actual = actual;
                 }
 
-                public SyntaxTreeNode Node { get; }
+                public SyntaxNode Node { get; }
 
                 public string Actual { get; }
 
                 public string Expected { get; }
 
-                private static string Format(SyntaxTreeNode node, SyntaxTreeNode[] ancestors, string expected, string actual, string userMessage)
+                private static string Format(SyntaxNode node, SyntaxNode[] ancestors, string expected, string actual, string userMessage)
                 {
                     var builder = new StringBuilder();
                     builder.AppendLine(userMessage);
@@ -280,4 +293,4 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWalker.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWalker.cs
new file mode 100644
index 0000000000..818732d685
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWalker.cs
@@ -0,0 +1,37 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    internal class SyntaxNodeWalker : SyntaxRewriter
+    {
+        private readonly List<SyntaxNode> _ancestors = new List<SyntaxNode>();
+
+        protected IReadOnlyList<SyntaxNode> Ancestors => _ancestors;
+
+        protected SyntaxNode Parent => _ancestors.Count > 0 ? _ancestors[0] : null;
+
+        protected override SyntaxNode DefaultVisit(SyntaxNode node)
+        {
+            _ancestors.Insert(0, node);
+
+            try
+            {
+                for (var i = 0; i < node.SlotCount; i++)
+                {
+                    var child = node.GetNodeSlot(i);
+                    Visit(child);
+                }
+            }
+            finally
+            {
+                _ancestors.RemoveAt(0);
+            }
+
+            return node;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs
new file mode 100644
index 0000000000..3d1faba30e
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxNodeWriter.cs
@@ -0,0 +1,219 @@
+// 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;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+
+namespace Microsoft.AspNetCore.Razor.Language.Syntax
+{
+    internal class SyntaxNodeWriter : SyntaxRewriter
+    {
+        private readonly TextWriter _writer;
+        private bool _visitedRoot;
+
+        public SyntaxNodeWriter(TextWriter writer)
+        {
+            _writer = writer;
+        }
+
+        public int Depth { get; set; }
+
+        public override SyntaxNode Visit(SyntaxNode node)
+        {
+            if (node is SyntaxToken token)
+            {
+                return VisitToken(token);
+            }
+
+            WriteNode(node);
+            return node;
+        }
+
+        public override SyntaxNode VisitToken(SyntaxToken token)
+        {
+            WriteToken(token);
+            return base.VisitToken(token);
+        }
+
+        public override SyntaxNode VisitTrivia(SyntaxTrivia trivia)
+        {
+            WriteTrivia(trivia);
+            return base.VisitTrivia(trivia);
+        }
+
+        private void WriteNode(SyntaxNode node)
+        {
+            WriteIndent();
+            Write(node.Kind);
+            WriteSeparator();
+            Write($"[{node.Position}..{node.EndPosition})::{node.FullWidth}");
+
+            if (node is RazorDirectiveSyntax razorDirective)
+            {
+                WriteRazorDirective(razorDirective);
+            }
+            else if (node is MarkupTagHelperElementSyntax tagHelperElement)
+            {
+                WriteTagHelperElement(tagHelperElement);
+            }
+            else if (node is MarkupTagHelperAttributeSyntax tagHelperAttribute)
+            {
+                WriteTagHelperAttributeInfo(tagHelperAttribute.TagHelperAttributeInfo);
+            }
+            else if (node is MarkupMinimizedTagHelperAttributeSyntax minimizedTagHelperAttribute)
+            {
+                WriteTagHelperAttributeInfo(minimizedTagHelperAttribute.TagHelperAttributeInfo);
+            }
+
+            if (ShouldDisplayNodeContent(node))
+            {
+                WriteSeparator();
+                Write($"[{node.GetContent()}]");
+            }
+
+            var annotation = node.GetAnnotations().FirstOrDefault(a => a.Kind == SyntaxConstants.SpanContextKind);
+            if (annotation != null && annotation.Data is SpanContext context)
+            {
+                WriteSpanContext(context);
+            }
+
+            if (!_visitedRoot)
+            {
+                WriteSeparator();
+                Write($"[{node.ToFullString()}]");
+                _visitedRoot = true;
+            }
+        }
+
+        private void WriteRazorDirective(RazorDirectiveSyntax node)
+        {
+            if (node.DirectiveDescriptor == null)
+            {
+                return;
+            }
+
+            var builder = new StringBuilder("Directive:{");
+            builder.Append(node.DirectiveDescriptor.Directive);
+            builder.Append(";");
+            builder.Append(node.DirectiveDescriptor.Kind);
+            builder.Append(";");
+            builder.Append(node.DirectiveDescriptor.Usage);
+            builder.Append("}");
+
+            var diagnostics = node.GetDiagnostics();
+            if (diagnostics.Length > 0)
+            {
+                builder.Append(" [");
+                var ids = string.Join(", ", diagnostics.Select(diagnostic => $"{diagnostic.Id}{diagnostic.Span}"));
+                builder.Append(ids);
+                builder.Append("]");
+            }
+
+            WriteSeparator();
+            Write(builder.ToString());
+        }
+
+        private void WriteTagHelperElement(MarkupTagHelperElementSyntax node)
+        {
+            // Write tag name
+            WriteSeparator();
+            Write($"{node.TagHelperInfo.TagName}[{node.TagHelperInfo.TagMode}]");
+
+            // Write descriptors
+            foreach (var descriptor in node.TagHelperInfo.BindingResult.Descriptors)
+            {
+                WriteSeparator();
+
+                // Get the type name without the namespace.
+                var typeName = descriptor.Name.Substring(descriptor.Name.LastIndexOf('.') + 1);
+                Write(typeName);
+            }
+        }
+
+        private void WriteTagHelperAttributeInfo(TagHelperAttributeInfo info)
+        {
+            // Write attributes
+            WriteSeparator();
+            Write(info.Name);
+            WriteSeparator();
+            Write(info.AttributeStructure);
+            WriteSeparator();
+            Write(info.Bound ? "Bound" : "Unbound");
+        }
+
+        private void WriteToken(SyntaxToken token)
+        {
+            WriteIndent();
+            var content = token.IsMissing ? "<Missing>" : token.Content;
+            var diagnostics = token.GetDiagnostics();
+            var tokenString = $"{token.Kind};[{content}];{string.Join(", ", diagnostics.Select(diagnostic => diagnostic.Id + diagnostic.Span))}";
+            Write(tokenString);
+        }
+
+        private void WriteTrivia(SyntaxTrivia trivia)
+        {
+            throw new NotImplementedException();
+        }
+
+        private void WriteSpanContext(SpanContext context)
+        {
+            WriteSeparator();
+            Write($"Gen<{context.ChunkGenerator}>");
+            WriteSeparator();
+            Write(context.EditHandler);
+        }
+
+        protected void WriteIndent()
+        {
+            for (var i = 0; i < Depth; i++)
+            {
+                for (var j = 0; j < 4; j++)
+                {
+                    Write(' ');
+                }
+            }
+        }
+
+        protected void WriteSeparator()
+        {
+            Write(" - ");
+        }
+
+        protected void WriteNewLine()
+        {
+            _writer.WriteLine();
+        }
+
+        protected void Write(object value)
+        {
+            if (value is string stringValue)
+            {
+                stringValue = stringValue.Replace("\r\n", "LF");
+                _writer.Write(stringValue);
+                return;
+            }
+
+            _writer.Write(value);
+        }
+
+        private static bool ShouldDisplayNodeContent(SyntaxNode node)
+        {
+            return node.Kind == SyntaxKind.MarkupTextLiteral ||
+                node.Kind == SyntaxKind.MarkupEphemeralTextLiteral ||
+                node.Kind == SyntaxKind.MarkupTagBlock ||
+                node.Kind == SyntaxKind.MarkupAttributeBlock ||
+                node.Kind == SyntaxKind.MarkupMinimizedAttributeBlock ||
+                node.Kind == SyntaxKind.MarkupTagHelperAttribute ||
+                node.Kind == SyntaxKind.MarkupMinimizedTagHelperAttribute ||
+                node.Kind == SyntaxKind.MarkupLiteralAttributeValue ||
+                node.Kind == SyntaxKind.MarkupDynamicAttributeValue ||
+                node.Kind == SyntaxKind.CSharpStatementLiteral ||
+                node.Kind == SyntaxKind.CSharpExpressionLiteral ||
+                node.Kind == SyntaxKind.CSharpEphemeralTextLiteral ||
+                node.Kind == SyntaxKind.UnclassifiedTextLiteral;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxTreeNodeWalker.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxTreeNodeWalker.cs
deleted file mode 100644
index 93b84cd357..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxTreeNodeWalker.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// 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.Collections.Generic;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class SyntaxTreeNodeWalker : ParserVisitor
-    {
-        private readonly List<SyntaxTreeNode> _ancestors = new List<SyntaxTreeNode>();
-
-        protected IReadOnlyList<SyntaxTreeNode> Ancestors => _ancestors;
-
-        protected SyntaxTreeNode Parent => _ancestors.Count > 0 ? _ancestors[0] : null;
-
-        public override void VisitDefault(Block block)
-        {
-            var children = block.Children;
-            if (block.Children.Count == 0)
-            {
-                return;
-            }
-
-            _ancestors.Insert(0, block);
-
-            try
-            {
-                for (var i = 0; i < block.Children.Count; i++)
-                {
-                    var child = children[i];
-                    Visit(child);
-                }
-            }
-            finally
-            {
-                _ancestors.RemoveAt(0);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxTreeNodeWriter.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxTreeNodeWriter.cs
deleted file mode 100644
index 227c632192..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/SyntaxTreeNodeWriter.cs
+++ /dev/null
@@ -1,299 +0,0 @@
-// 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;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal class SyntaxTreeNodeWriter : ParserVisitor
-    {
-        private readonly TextWriter _writer;
-
-        public int Depth { get; set; }
-
-        public SyntaxTreeNodeWriter(TextWriter writer)
-        {
-            _writer = writer;
-        }
-
-        public override void VisitDefault(Block block)
-        {
-            WriteBlock(block);
-        }
-
-        public override void VisitDefault(Span span)
-        {
-            WriteSpan(span);
-        }
-
-        public override void VisitTagHelperBlock(TagHelperChunkGenerator chunkGenerator, Block block)
-        {
-            WriteBlock(block);
-            
-            if (block is TagHelperBlock tagHelperBlock)
-            {
-                // Write tag name
-                WriteSeparator();
-                Write(tagHelperBlock.TagName);
-
-                // Write descriptors
-                foreach (var descriptor in tagHelperBlock.Binding?.Descriptors ?? Array.Empty<TagHelperDescriptor>())
-                {
-                    WriteSeparator();
-
-                    // Get the type name without the namespace.
-                    var typeName = descriptor.Name.Substring(descriptor.Name.LastIndexOf('.') + 1);
-                    Write(typeName);
-                }
-
-                // Write tag mode, start tag and end tag
-                Depth++;
-                WriteNewLine();
-                WriteIndent();
-                Write(tagHelperBlock.TagMode);
-                WriteSeparator();
-                Write(GetNodeContent(tagHelperBlock.SourceStartTag));
-                if (tagHelperBlock.SourceEndTag != null)
-                {
-                    Write(" ... ");
-                    Write(GetNodeContent(tagHelperBlock.SourceEndTag));
-                }
-
-                // Write attributes
-                foreach (var attribute in tagHelperBlock.Attributes)
-                {
-                    WriteNewLine();
-                    WriteIndent();
-                    Write(attribute.Name);
-                    WriteSeparator();
-                    Write(attribute.AttributeStructure);
-
-                    if (attribute.Value != null)
-                    {
-                        Depth++;
-                        WriteNewLine();
-                        // Recursively render attribute value
-                        VisitNode(attribute.Value);
-                        Depth--;
-                    }
-                }
-                Depth--;
-            }
-        }
-
-        public override void VisitAttributeBlock(AttributeBlockChunkGenerator chunkGenerator, Block block)
-        {
-            WriteBlock(block);
-        }
-
-        public override void VisitCommentBlock(RazorCommentChunkGenerator chunkGenerator, Block block)
-        {
-            WriteBlock(block);
-        }
-
-        public override void VisitDirectiveBlock(DirectiveChunkGenerator chunkGenerator, Block block)
-        {
-            WriteBlock(block);
-        }
-
-        public override void VisitDynamicAttributeBlock(DynamicAttributeBlockChunkGenerator chunkGenerator, Block block)
-        {
-            WriteBlock(block);
-        }
-
-        public override void VisitExpressionBlock(ExpressionChunkGenerator chunkGenerator, Block block)
-        {
-            WriteBlock(block);
-        }
-
-        public override void VisitTemplateBlock(TemplateBlockChunkGenerator chunkGenerator, Block block)
-        {
-            WriteBlock(block);
-        }
-
-        public override void VisitMarkupSpan(MarkupChunkGenerator chunkGenerator, Span span)
-        {
-            WriteSpan(span);
-        }
-
-        public override void VisitAddTagHelperSpan(AddTagHelperChunkGenerator chunkGenerator, Span span)
-        {
-            WriteSpan(span);
-        }
-
-        public override void VisitExpressionSpan(ExpressionChunkGenerator chunkGenerator, Span span)
-        {
-            WriteSpan(span);
-        }
-
-        public override void VisitImportSpan(AddImportChunkGenerator chunkGenerator, Span span)
-        {
-            WriteSpan(span);
-        }
-
-        public override void VisitLiteralAttributeSpan(LiteralAttributeChunkGenerator chunkGenerator, Span span)
-        {
-            WriteSpan(span);
-        }
-
-        public override void VisitRemoveTagHelperSpan(RemoveTagHelperChunkGenerator chunkGenerator, Span span)
-        {
-            WriteSpan(span);
-        }
-
-        public override void VisitTagHelperPrefixDirectiveSpan(TagHelperPrefixDirectiveChunkGenerator chunkGenerator, Span span)
-        {
-            WriteSpan(span);
-        }
-
-        public override void VisitStatementSpan(StatementChunkGenerator chunkGenerator, Span span)
-        {
-            WriteSpan(span);
-        }
-
-        public override void VisitDirectiveToken(DirectiveTokenChunkGenerator chunkGenerator, Span span)
-        {
-            WriteSpan(span);
-        }
-
-        protected void WriteBlock(Block block)
-        {
-            WriteIndent();
-            Write($"{block.Type} block");
-            WriteSeparator();
-            Write($"Gen<{block.ChunkGenerator}>");
-            WriteSeparator();
-            Write(block.Length);
-            WriteSeparator();
-            WriteSourceLocation(block.Start);
-        }
-
-        protected void WriteSpan(Span span)
-        {
-            WriteIndent();
-            Write($"{span.Kind} span");
-            WriteSeparator();
-            Write($"Gen<{span.ChunkGenerator}>");
-            WriteSeparator();
-            Write($"[{span.Content}]");
-            WriteSeparator();
-            Write(span.EditHandler);
-            WriteSeparator();
-            WriteSourceLocation(span.Start);
-            WriteSeparator();
-            Write($"Tokens:{span.Tokens.Count}");
-
-            // Write tokens
-            Depth++;
-            foreach (var token in span.Tokens)
-            {
-                WriteNewLine();
-                WriteIndent();
-                WriteToken(token);
-            }
-            Depth--;
-        }
-
-        protected void WriteToken(IToken token)
-        {
-            var tokenType = string.Empty;
-            IEnumerable<RazorDiagnostic> diagnostics = RazorDiagnostic.EmptyArray;
-
-            if (token is HtmlToken htmlToken)
-            {
-                tokenType = $"{htmlToken.Type.GetType().Name}.{htmlToken.Type}";
-                diagnostics = htmlToken.Errors;
-            }
-            else if (token is CSharpToken csharpToken)
-            {
-                tokenType = $"{csharpToken.Type.GetType().Name}.{csharpToken.Type}";
-                diagnostics = csharpToken.Errors;
-            }
-
-            var tokenString = $"{tokenType};[{token.Content}];{string.Join(", ", diagnostics.Select(diagnostic => diagnostic.Id + diagnostic.Span))}";
-            Write(tokenString);
-        }
-
-        protected void WriteSourceLocation(SourceLocation location)
-        {
-            Write(location);
-        }
-
-        protected void WriteLocationTaggedString(LocationTagged<string> item)
-        {
-            Write(item.ToString("F", null));
-        }
-
-        protected void WriteIndent()
-        {
-            for (var i = 0; i < Depth; i++)
-            {
-                for (var j = 0; j < 4; j++)
-                {
-                    Write(' ');
-                }
-            }
-        }
-
-        protected void WriteSeparator()
-        {
-            Write(" - ");
-        }
-
-        protected void WriteNewLine()
-        {
-            _writer.WriteLine();
-        }
-
-        protected void Write(object value)
-        {
-            if (value is string stringValue)
-            {
-                stringValue = stringValue.Replace("\r\n", "LF");
-                _writer.Write(stringValue);
-                return;
-            }
-
-            _writer.Write(value);
-        }
-
-        private string GetNodeContent(SyntaxTreeNode node)
-        {
-            if (node is Span span)
-            {
-                return span.Content;
-            }
-            else if (node is Block block)
-            {
-                var content = string.Empty;
-                foreach (var child in block.Children)
-                {
-                    content += GetNodeContent(child);
-                }
-
-                return content;
-            }
-
-            return string.Empty;
-        }
-
-        private void VisitNode(SyntaxTreeNode node)
-        {
-            Visit(node);
-
-            if (node is Block block)
-            {
-                Depth++;
-                foreach (var child in block.Children)
-                {
-                    WriteNewLine();
-                    VisitNode(child);
-                }
-                Depth--;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanSerializer.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanSerializer.cs
index 1639bb2685..8b4e0bd8ed 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanSerializer.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanSerializer.cs
@@ -1,18 +1,19 @@
 // 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;
 using System.IO;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal class TagHelperSpanSerializer
     {
-        internal static string Serialize(SyntaxTreeNode node, string filePath = null)
+        internal static string Serialize(RazorSyntaxTree syntaxTree)
         {
             using (var writer = new StringWriter())
             {
-                var visitor = new TagHelperSpanWriter(writer, filePath);
-                visitor.Visit(node);
+                var visitor = new TagHelperSpanWriter(writer, syntaxTree);
+                visitor.Visit();
 
                 return writer.ToString();
             }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanVerifier.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanVerifier.cs
index 7fd7d9f075..3b5a08a271 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanVerifier.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanVerifier.cs
@@ -1,6 +1,7 @@
 // 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;
 using System.IO;
 using System.Text;
 using Xunit;
@@ -10,12 +11,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal class TagHelperSpanVerifier
     {
-        internal static void Verify(SyntaxTreeNode node, string filePath, string[] baseline)
+        internal static void Verify(RazorSyntaxTree syntaxTree, string[] baseline)
         {
             using (var writer = new StringWriter())
             {
-                var walker = new Walker(writer, filePath, baseline);
-                walker.Visit(node);
+                var walker = new Walker(writer, syntaxTree, baseline);
+                walker.Visit();
                 walker.AssertReachedEndOfBaseline();
             }
         }
@@ -27,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 
             private int _index;
 
-            public Walker(StringWriter writer, string filePath, string[] baseline) : base(writer, filePath)
+            public Walker(StringWriter writer, RazorSyntaxTree syntaxTree, string[] baseline) : base(writer, syntaxTree)
             {
                 _writer = writer;
                 _baseline = baseline;
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanWriter.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanWriter.cs
index 1552bdb71d..3a814aa067 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanWriter.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TagHelperSpan/TagHelperSpanWriter.cs
@@ -1,31 +1,24 @@
 // 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;
-using System.Collections.Generic;
 using System.IO;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal class TagHelperSpanWriter
     {
-        private readonly string _filePath;
+        private readonly RazorSyntaxTree _syntaxTree;
         private readonly TextWriter _writer;
 
-        public TagHelperSpanWriter(TextWriter writer, string filePath)
+        public TagHelperSpanWriter(TextWriter writer, RazorSyntaxTree syntaxTree)
         {
             _writer = writer;
-            _filePath = filePath;
+            _syntaxTree = syntaxTree;
         }
 
-        public virtual void Visit(SyntaxTreeNode node)
+        public virtual void Visit()
         {
-            if (!(node is Block block))
-            {
-                return;
-            }
-
-            var tagHelperSpans = GetTagHelperSpans(block, _filePath);
+            var tagHelperSpans = _syntaxTree.GetTagHelperSpans();
             foreach (var span in tagHelperSpans)
             {
                 VisitTagHelperSpan(span);
@@ -65,17 +58,5 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             _writer.Write(value);
         }
-
-        internal static IReadOnlyList<TagHelperSpanInternal> GetTagHelperSpans(Block root, string filePath)
-        {
-            // We don't care about the options and diagnostic here.
-            var syntaxTree = RazorSyntaxTree.Create(
-                root,
-                TestRazorSourceDocument.Create(filePath: filePath),
-                Array.Empty<RazorDiagnostic>(),
-                RazorParserOptions.CreateDefault());
-
-            return syntaxTree.GetTagHelperSpans();
-        }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TestSpanBuilder.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TestSpanBuilder.cs
deleted file mode 100644
index acbc782550..0000000000
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/Legacy/TestSpanBuilder.cs
+++ /dev/null
@@ -1,448 +0,0 @@
-// 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;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Microsoft.AspNetCore.Razor.Language.Legacy
-{
-    internal static class SpanFactoryExtensions
-    {
-        public static UnclassifiedCodeSpanConstructor EmptyCSharp(this SpanFactory self)
-        {
-            return new UnclassifiedCodeSpanConstructor(
-                self.Span(
-                    SpanKindInternal.Code,
-                    new CSharpToken(string.Empty, CSharpTokenType.Unknown)));
-        }
-
-        public static SpanConstructor EmptyHtml(this SpanFactory self)
-        {
-            return self
-                .Span(
-                    SpanKindInternal.Markup,
-                    new HtmlToken(string.Empty, HtmlTokenType.Unknown))
-                .With(new MarkupChunkGenerator());
-        }
-
-        public static UnclassifiedCodeSpanConstructor Code(this SpanFactory self, string content)
-        {
-            return new UnclassifiedCodeSpanConstructor(
-                self.Span(SpanKindInternal.Code, content, markup: false));
-        }
-
-        public static SpanConstructor CodeTransition(this SpanFactory self)
-        {
-            return self
-                .Span(SpanKindInternal.Transition, SyntaxConstants.TransitionString, markup: false)
-                .Accepts(AcceptedCharactersInternal.None);
-        }
-
-        public static SpanConstructor CodeTransition(this SpanFactory self, string content)
-        {
-            return self.Span(SpanKindInternal.Transition, content, markup: false).Accepts(AcceptedCharactersInternal.None);
-        }
-
-        public static SpanConstructor CodeTransition(this SpanFactory self, CSharpTokenType type)
-        {
-            return self
-                .Span(SpanKindInternal.Transition, SyntaxConstants.TransitionString, type)
-                .Accepts(AcceptedCharactersInternal.None);
-        }
-
-        public static SpanConstructor CodeTransition(this SpanFactory self, string content, CSharpTokenType type)
-        {
-            return self.Span(SpanKindInternal.Transition, content, type).Accepts(AcceptedCharactersInternal.None);
-        }
-
-        public static SpanConstructor MarkupTransition(this SpanFactory self)
-        {
-            return self
-                .Span(SpanKindInternal.Transition, SyntaxConstants.TransitionString, markup: true)
-                .Accepts(AcceptedCharactersInternal.None);
-        }
-
-        public static SpanConstructor MarkupTransition(this SpanFactory self, string content)
-        {
-            return self.Span(SpanKindInternal.Transition, content, markup: true).Accepts(AcceptedCharactersInternal.None);
-        }
-
-        public static SpanConstructor MarkupTransition(this SpanFactory self, HtmlTokenType type)
-        {
-            return self
-                .Span(SpanKindInternal.Transition, SyntaxConstants.TransitionString, type)
-                .Accepts(AcceptedCharactersInternal.None);
-        }
-
-        public static SpanConstructor MarkupTransition(this SpanFactory self, string content, HtmlTokenType type)
-        {
-            return self.Span(SpanKindInternal.Transition, content, type).Accepts(AcceptedCharactersInternal.None);
-        }
-
-        public static SpanConstructor MetaCode(this SpanFactory self, string content)
-        {
-            return self.Span(SpanKindInternal.MetaCode, content, markup: false);
-        }
-
-        public static SpanConstructor MetaCode(this SpanFactory self, string content, CSharpTokenType type)
-        {
-            return self.Span(SpanKindInternal.MetaCode, content, type);
-        }
-
-        public static SpanConstructor MetaMarkup(this SpanFactory self, string content)
-        {
-            return self.Span(SpanKindInternal.MetaCode, content, markup: true);
-        }
-
-        public static SpanConstructor MetaMarkup(this SpanFactory self, string content, HtmlTokenType type)
-        {
-            return self.Span(SpanKindInternal.MetaCode, content, type);
-        }
-
-        public static SpanConstructor Comment(this SpanFactory self, string content, CSharpTokenType type)
-        {
-            return self.Span(SpanKindInternal.Comment, content, type);
-        }
-
-        public static SpanConstructor Comment(this SpanFactory self, string content, HtmlTokenType type)
-        {
-            return self.Span(SpanKindInternal.Comment, content, type);
-        }
-
-        public static SpanConstructor BangEscape(this SpanFactory self)
-        {
-            return self
-                .Span(SpanKindInternal.MetaCode, "!", markup: true)
-                .With(SpanChunkGenerator.Null)
-                .Accepts(AcceptedCharactersInternal.None);
-        }
-
-        public static SpanConstructor Markup(this SpanFactory self, string content)
-        {
-            return self.Span(SpanKindInternal.Markup, content, markup: true).With(new MarkupChunkGenerator());
-        }
-
-        public static SpanConstructor Markup(this SpanFactory self, params string[] content)
-        {
-            return self.Span(SpanKindInternal.Markup, content, markup: true).With(new MarkupChunkGenerator());
-        }
-
-        public static SpanConstructor CodeMarkup(this SpanFactory self, params string[] content)
-        {
-            return self
-                .Span(SpanKindInternal.Code, content, markup: true)
-                .AsCodeMarkup();
-        }
-
-        public static SpanConstructor CSharpCodeMarkup(this SpanFactory self, string content)
-        {
-            return self.Code(content)
-                .AsImplicitExpression(CSharpCodeParser.DefaultKeywords, acceptTrailingDot: true)
-                .AsCodeMarkup();
-        }
-
-        public static SpanConstructor AsCodeMarkup(this SpanConstructor self)
-        {
-            return self
-                .With(new ImplicitExpressionEditHandler(
-                    (content) => SpanConstructor.TestTokenizer(content),
-                    CSharpCodeParser.DefaultKeywords,
-                    acceptTrailingDot: true))
-                .With(new MarkupChunkGenerator())
-                .Accepts(AcceptedCharactersInternal.AnyExceptNewline);
-        }
-
-        public static SpanConstructor AsDirectiveToken(this SpanConstructor self, DirectiveTokenDescriptor descriptor)
-        {
-            return self
-                .With(new DirectiveTokenChunkGenerator(descriptor))
-                .With(new DirectiveTokenEditHandler((content) => SpanConstructor.TestTokenizer(content)))
-                .Accepts(AcceptedCharactersInternal.NonWhiteSpace);
-        }
-
-        public static SourceLocation GetLocationAndAdvance(this SourceLocationTracker self, string content)
-        {
-            var ret = self.CurrentLocation;
-            self.UpdateLocation(content);
-            return ret;
-        }
-    }
-
-    internal class SpanFactory
-    {
-        public SpanFactory()
-        {
-            LocationTracker = new SourceLocationTracker();
-
-            MarkupTokenizerFactory = doc => new HtmlTokenizer(doc);
-            CodeTokenizerFactory = doc => new CSharpTokenizer(doc);
-        }
-
-        public Func<ITextDocument, HtmlTokenizer> MarkupTokenizerFactory { get; }
-        public Func<ITextDocument, CSharpTokenizer> CodeTokenizerFactory { get; }
-        public SourceLocationTracker LocationTracker { get; }
-
-
-        public SpanConstructor Span(SpanKindInternal kind, string content, CSharpTokenType type)
-        {
-            return CreateTokenSpan(kind, content, () => new CSharpToken(content, type));
-        }
-
-        public SpanConstructor Span(SpanKindInternal kind, string content, HtmlTokenType type)
-        {
-            return CreateTokenSpan(kind, content, () => new HtmlToken(content, type));
-        }
-
-        public SpanConstructor Span(SpanKindInternal kind, string content, bool markup)
-        {
-            return new SpanConstructor(kind, LocationTracker.CurrentLocation, Tokenize(new[] { content }, markup));
-        }
-
-        public SpanConstructor Span(SpanKindInternal kind, string[] content, bool markup)
-        {
-            return new SpanConstructor(kind, LocationTracker.CurrentLocation, Tokenize(content, markup));
-        }
-
-        public SpanConstructor Span(SpanKindInternal kind, params IToken[] tokens)
-        {
-            var start = LocationTracker.CurrentLocation;
-            foreach (var token in tokens)
-            {
-                LocationTracker.UpdateLocation(token.Content);
-            }
-
-            return new SpanConstructor(kind, start, tokens);
-        }
-
-        private SpanConstructor CreateTokenSpan(SpanKindInternal kind, string content, Func<IToken> ctor)
-        {
-            var start = LocationTracker.CurrentLocation;
-            LocationTracker.UpdateLocation(content);
-
-            return new SpanConstructor(kind, start, new[] { ctor() });
-        }
-
-        public void Reset()
-        {
-            LocationTracker.CurrentLocation = SourceLocation.Zero;
-        }
-
-        private IEnumerable<IToken> Tokenize(IEnumerable<string> contentFragments, bool markup)
-        {
-            return contentFragments.SelectMany(fragment => Tokenize(fragment, markup));
-        }
-
-        private IEnumerable<IToken> Tokenize(string content, bool markup)
-        {
-            var tokenizer = MakeTokenizer(markup, new SeekableTextReader(content, filePath: null));
-            IToken token;
-            IToken last = null;
-
-            while ((token = tokenizer.NextToken()) != null)
-            {
-                last = token;
-                yield return token;
-            }
-
-            LocationTracker.UpdateLocation(content);
-        }
-
-        private ITokenizer MakeTokenizer(bool markup, SeekableTextReader seekableTextReader)
-        {
-            if (markup)
-            {
-                return MarkupTokenizerFactory(seekableTextReader);
-            }
-            else
-            {
-                return CodeTokenizerFactory(seekableTextReader);
-            }
-        }
-    }
-
-    internal static class SpanConstructorExtensions
-    {
-        public static SpanConstructor Accepts(this SpanConstructor self, AcceptedCharactersInternal accepted)
-        {
-            return self.With(eh => eh.AcceptedCharacters = accepted);
-        }
-
-        public static SpanConstructor AutoCompleteWith(this SpanConstructor self, string autoCompleteString)
-        {
-            return AutoCompleteWith(self, autoCompleteString, atEndOfSpan: false);
-        }
-
-        public static SpanConstructor AutoCompleteWith(
-            this SpanConstructor self,
-            string autoCompleteString,
-            bool atEndOfSpan)
-        {
-            return self.With(new AutoCompleteEditHandler(
-                (content) => SpanConstructor.TestTokenizer(content),
-                autoCompleteAtEndOfSpan: atEndOfSpan)
-            {
-                AutoCompleteString = autoCompleteString
-            });
-        }
-    }
-
-    internal class UnclassifiedCodeSpanConstructor
-    {
-        SpanConstructor _self;
-
-        public UnclassifiedCodeSpanConstructor(SpanConstructor self)
-        {
-            _self = self;
-        }
-
-        public SpanConstructor AsMetaCode()
-        {
-            _self.Builder.Kind = SpanKindInternal.MetaCode;
-            return _self;
-        }
-
-        public SpanConstructor AsStatement()
-        {
-            return _self.With(new StatementChunkGenerator());
-        }
-
-        public SpanConstructor AsCodeBlock()
-        {
-            return AsStatement().With(new CodeBlockEditHandler(CSharpLanguageCharacteristics.Instance.TokenizeString));
-        }
-
-        public SpanConstructor AsExpression()
-        {
-            return _self.With(new ExpressionChunkGenerator());
-        }
-
-        public SpanConstructor AsImplicitExpression(ISet<string> keywords)
-        {
-            return AsImplicitExpression(keywords, acceptTrailingDot: false);
-        }
-
-        public SpanConstructor AsImplicitExpression(ISet<string> keywords, bool acceptTrailingDot)
-        {
-            return _self
-                .With(new ImplicitExpressionEditHandler((content) => SpanConstructor.TestTokenizer(content), keywords, acceptTrailingDot))
-                .With(new ExpressionChunkGenerator());
-        }
-
-        public SpanConstructor AsNamespaceImport(string ns)
-        {
-            return _self.With(new AddImportChunkGenerator(ns));
-        }
-
-        public SpanConstructor Hidden()
-        {
-            return _self.With(SpanChunkGenerator.Null);
-        }
-
-        public SpanConstructor AsAddTagHelper(
-            string lookupText,
-            string directiveText,
-            string typePattern = null,
-            string assemblyName = null,
-            params RazorDiagnostic[] errors)
-        {
-            var diagnostics = errors.ToList();
-            return _self
-                .With(new AddTagHelperChunkGenerator(lookupText, directiveText, typePattern, assemblyName, diagnostics))
-                .Accepts(AcceptedCharactersInternal.AnyExceptNewline);
-        }
-
-        public SpanConstructor AsRemoveTagHelper(
-            string lookupText,
-            string directiveText,
-            string typePattern = null,
-            string assemblyName = null,
-            params RazorDiagnostic[] errors)
-        {
-            var diagnostics = errors.ToList();
-            return _self
-                .With(new RemoveTagHelperChunkGenerator(lookupText, directiveText, typePattern, assemblyName, diagnostics))
-                .Accepts(AcceptedCharactersInternal.AnyExceptNewline);
-        }
-
-        public SpanConstructor AsTagHelperPrefixDirective(string prefix, string directiveText, params RazorDiagnostic[] errors)
-        {
-            var diagnostics = errors.ToList();
-            return _self
-                .With(new TagHelperPrefixDirectiveChunkGenerator(prefix, directiveText, diagnostics))
-                .Accepts(AcceptedCharactersInternal.AnyExceptNewline);
-        }
-
-        public SpanConstructor As(ISpanChunkGenerator chunkGenerator)
-        {
-            return _self.With(chunkGenerator);
-        }
-    }
-
-    internal class SpanConstructor
-    {
-        public SpanBuilder Builder { get; private set; }
-
-        internal static IEnumerable<IToken> TestTokenizer(string str)
-        {
-            yield return new RawTextToken(SourceLocation.Zero, str);
-        }
-
-        public SpanConstructor(SpanKindInternal kind, SourceLocation location, IEnumerable<IToken> tokens)
-        {
-            Builder = new SpanBuilder(location);
-            Builder.Kind = kind;
-            Builder.EditHandler = SpanEditHandler.CreateDefault((content) => SpanConstructor.TestTokenizer(content));
-            foreach (IToken sym in tokens)
-            {
-                Builder.Accept(sym);
-            }
-        }
-
-        private Span Build()
-        {
-            return Builder.Build();
-        }
-
-        public SpanConstructor As(SpanKindInternal spanKind)
-        {
-            Builder.Kind = spanKind;
-            return this;
-        }
-
-        public SpanConstructor With(ISpanChunkGenerator generator)
-        {
-            Builder.ChunkGenerator = generator;
-            return this;
-        }
-
-        public SpanConstructor With(SpanEditHandler handler)
-        {
-            Builder.EditHandler = handler;
-            return this;
-        }
-
-        public SpanConstructor With(Action<ISpanChunkGenerator> generatorConfigurer)
-        {
-            generatorConfigurer(Builder.ChunkGenerator);
-            return this;
-        }
-
-        public SpanConstructor With(Action<SpanEditHandler> handlerConfigurer)
-        {
-            handlerConfigurer(Builder.EditHandler);
-            return this;
-        }
-
-        public static implicit operator Span(SpanConstructor self)
-        {
-            return self.Build();
-        }
-
-        public SpanConstructor Hidden()
-        {
-            Builder.ChunkGenerator = SpanChunkGenerator.Null;
-            return this;
-        }
-    }
-}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs
index e0b26941a4..fee17d1368 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/SyntaxTreeVerifier.cs
@@ -3,39 +3,43 @@
 
 using System;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language
 {
     // Verifies recursively that a syntax tree has no gaps in terms of position/location.
-    internal class SyntaxTreeVerifier : ParserVisitor
+    internal class SyntaxTreeVerifier
     {
-        private readonly SourceLocationTracker _tracker = new SourceLocationTracker(SourceLocation.Zero);
-
-        private SyntaxTreeVerifier()
-        {
-        }
-
         public static void Verify(RazorSyntaxTree syntaxTree)
         {
-            Verify(syntaxTree.Root);
+            new Verifier(syntaxTree.Source).Visit(syntaxTree.Root);
         }
 
-        public static void Verify(Block block)
+        private class Verifier : SyntaxRewriter
         {
-            new SyntaxTreeVerifier().VisitBlock(block);
-        }
+            private readonly SourceLocationTracker _tracker;
+            private readonly RazorSourceDocument _source;
 
-        public override void VisitSpan(Span span)
-        {
-            var start = span.Start;
-            if (!start.Equals(_tracker.CurrentLocation))
+            public Verifier(RazorSourceDocument source)
             {
-                throw new InvalidOperationException($"Span starting at {span.Start} should start at {_tracker.CurrentLocation} - {span} ");
+                _tracker = new SourceLocationTracker(new SourceLocation(source.FilePath, 0, 0, 0));
+                _source = source;
             }
 
-            for (var i = 0; i < span.Tokens.Count; i++)
+            public override SyntaxNode VisitToken(SyntaxToken token)
             {
-                _tracker.UpdateLocation(span.Tokens[i].Content);
+                if (token != null && !token.IsMissing && token.Kind != SyntaxKind.Marker)
+                {
+                    var start = token.GetSourceLocation(_source);
+                    if (!start.Equals(_tracker.CurrentLocation))
+                    {
+                        throw new InvalidOperationException($"Token starting at {start} should start at {_tracker.CurrentLocation} - {token} ");
+                    }
+
+                    _tracker.UpdateLocation(token.Content);
+                }
+
+                return base.VisitToken(token);
             }
         }
     }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorCodeDocument.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorCodeDocument.cs
index 4a6430d618..00afb4fb5d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorCodeDocument.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Language/TestRazorCodeDocument.cs
@@ -13,9 +13,9 @@ namespace Microsoft.AspNetCore.Razor.Language
             return new DefaultRazorCodeDocument(source, imports: null);
         }
 
-        public static RazorCodeDocument Create(string content)
+        public static RazorCodeDocument Create(string content, bool normalizeNewLines = false)
         {
-            var source = TestRazorSourceDocument.Create(content);
+            var source = TestRazorSourceDocument.Create(content, normalizeNewLines: normalizeNewLines);
             return new DefaultRazorCodeDocument(source, imports: null);
         }
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
index 95f1644d40..a68e6182b4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <!-- To generate baselines, run tests with /p:GenerateBaselines=true -->
     <DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
     <DefineConstants>$(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES</DefineConstants>
-    <TargetFrameworks>netcoreapp2.2;net46</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Properties/AssemblyInfo.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Properties/AssemblyInfo.cs
index 576c4e4e44..098d7b5b27 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Properties/AssemblyInfo.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Properties/AssemblyInfo.cs
@@ -2,8 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Runtime.CompilerServices;
+[assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Language.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj
index 6872d97beb..7043de7d02 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib/Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim\Microsoft.AspNetCore.Mvc*\**\*.cs" />
+    <Compile Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim\Microsoft.*\**\*.cs" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
index 8c0ce3583f..9fa0e8c4ae 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs
new file mode 100644
index 0000000000..9b07e85ed5
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs
@@ -0,0 +1,10 @@
+// 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.
+
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    public class CompiledRazorAssemblyApplicationPartFactory
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/ProvideApplicationPartFactoryAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/ProvideApplicationPartFactoryAttribute.cs
new file mode 100644
index 0000000000..d5a3c744d1
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/ProvideApplicationPartFactoryAttribute.cs
@@ -0,0 +1,19 @@
+// 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;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)]
+    public sealed class ProvideApplicationPartFactoryAttribute : Attribute
+    {
+        public ProvideApplicationPartFactoryAttribute(Type factoryType)
+        {
+        }
+
+        public ProvideApplicationPartFactoryAttribute(string factoryTypeName)
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/RelatedAssemblyAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/RelatedAssemblyAttribute.cs
new file mode 100644
index 0000000000..3722dd1229
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ApplicationParts/RelatedAssemblyAttribute.cs
@@ -0,0 +1,15 @@
+// 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;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    public sealed class RelatedAssemblyAttribute : Attribute
+    {
+        public RelatedAssemblyAttribute(string name)
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs
new file mode 100644
index 0000000000..094a762152
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs
@@ -0,0 +1,22 @@
+// 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;
+using System.IO;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public class HelperResult : IHtmlContent
+    {
+        public HelperResult(Func<TextWriter, Task> asyncAction)
+        {
+        }
+
+        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs
new file mode 100644
index 0000000000..321129faea
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorInjectAttribute.cs
@@ -0,0 +1,14 @@
+// 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;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class RazorInjectAttribute : Attribute
+    {
+        public RazorInjectAttribute ()
+        {
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs
new file mode 100644
index 0000000000..2b7b7450cd
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs
@@ -0,0 +1,48 @@
+// 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.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public abstract class RazorPage : RazorPageBase
+    {
+        public override void EndContext()
+        {
+        }
+
+        public override void BeginContext(int position, int length, bool isLiteral)
+        {
+        }
+
+        public override void EnsureRenderedBodyOrSections()
+        {
+        }
+
+        protected virtual IHtmlContent RenderBody()
+        {
+            return null;
+        }
+
+        public HtmlString RenderSection(string name)
+        {
+            return null;
+        }
+
+        public HtmlString RenderSection(string name, bool required)
+        {
+            return null;
+        }
+
+        public Task<HtmlString> RenderSectionAsync(string name)
+        {
+            return null;
+        }
+
+        public Task<HtmlString> RenderSectionAsync(string name, bool required)
+        {
+            return null;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs
new file mode 100644
index 0000000000..a4916e5378
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs
@@ -0,0 +1,165 @@
+// 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;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.Runtime.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public abstract class RazorPageBase
+    {
+        public virtual ViewContext ViewContext { get; set; }
+
+        public string Layout { get; set; }
+
+        public virtual TextWriter Output { get; }
+
+        public string Path { get; set; }
+
+        public IDictionary<string, RenderAsyncDelegate> SectionWriters { get; }
+
+        public dynamic ViewBag { get; }
+
+        public bool IsLayoutBeingRendered { get; set; }
+
+        public IHtmlContent BodyContent { get; set; }
+
+        public IDictionary<string, RenderAsyncDelegate> PreviousSectionWriters { get; set; }
+
+        public DiagnosticSource DiagnosticSource { get; set; }
+
+        public HtmlEncoder HtmlEncoder { get; set; }
+
+        // This was "ClaimsPrincipal" but we didn't want to add the reference.
+        public virtual object User { get; }
+
+        public ITempDataDictionary TempData { get; }
+
+        public abstract Task ExecuteAsync();
+
+        public TTagHelper CreateTagHelper<TTagHelper>() where TTagHelper : ITagHelper
+        {
+            throw new NotImplementedException();
+        }
+
+        protected virtual void PushWriter(TextWriter writer)
+        {
+        }
+
+        protected virtual TextWriter PopWriter()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void StartTagHelperWritingScope(HtmlEncoder encoder)
+        {
+        }
+
+        public TagHelperContent EndTagHelperWritingScope()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void BeginWriteTagHelperAttribute()
+        {
+        }
+
+        public string EndWriteTagHelperAttribute()
+        {
+            throw new NotImplementedException();
+        }
+
+        public virtual string Href(string contentPath)
+        {
+            throw new NotImplementedException();
+        }
+
+        // Compatibility for 1.X projects
+        protected void DefineSection(string name, Func<object, Task> section)
+        {
+        }
+
+        public virtual void DefineSection(string name, RenderAsyncDelegate section)
+        {
+        }
+
+        public virtual void Write(object value)
+        {
+        }
+
+        public virtual void WriteLiteral(object value)
+        {
+        }
+
+        public virtual void BeginWriteAttribute(
+            string name,
+            string prefix,
+            int prefixOffset,
+            string suffix,
+            int suffixOffset,
+            int attributeValuesCount)
+        {
+        }
+
+        public void WriteAttributeValue(
+            string prefix,
+            int prefixOffset,
+            object value,
+            int valueOffset,
+            int valueLength,
+            bool isLiteral)
+        {
+        }
+
+        public virtual void EndWriteAttribute()
+        {
+        }
+
+        public void BeginAddHtmlAttributeValues(
+            TagHelperExecutionContext executionContext,
+            string attributeName,
+            int attributeValuesCount,
+            HtmlAttributeValueStyle attributeValueStyle)
+        {
+        }
+
+        public void AddHtmlAttributeValue(
+            string prefix,
+            int prefixOffset,
+            object value,
+            int valueOffset,
+            int valueLength,
+            bool isLiteral)
+        {
+        }
+
+        public void EndAddHtmlAttributeValues(TagHelperExecutionContext executionContext)
+        {
+        }
+
+        public virtual Task<HtmlString> FlushAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        public virtual HtmlString SetAntiforgeryCookieAndHeader()
+        {
+            throw new NotImplementedException();
+        }
+
+        public abstract void BeginContext(int position, int length, bool isLiteral);
+
+        public abstract void EndContext();
+
+        public abstract void EnsureRenderedBodyOrSections();
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs
new file mode 100644
index 0000000000..e1460a5f82
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs
@@ -0,0 +1,14 @@
+// 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 Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public abstract class RazorPage<TModel> : RazorPage
+    {
+        public TModel Model { get; }
+
+        public ViewDataDictionary<TModel> ViewData { get; set; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs
new file mode 100644
index 0000000000..1ac6aba09a
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RazorViewAttribute.cs
@@ -0,0 +1,27 @@
+// 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;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+{
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    public class RazorViewAttribute : Attribute
+    {
+        public RazorViewAttribute(string path, Type viewType)
+        {
+            Path = path;
+            ViewType = viewType;
+        }
+
+        /// <summary>
+        /// Gets the path of the view.
+        /// </summary>
+        public string Path { get; }
+
+        /// <summary>
+        /// Gets the view type.
+        /// </summary>
+        public Type ViewType { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs
new file mode 100644
index 0000000000..05d0ccc236
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs
@@ -0,0 +1,9 @@
+// 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.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public delegate Task RenderAsyncDelegate();
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs
new file mode 100644
index 0000000000..b6b67e75b0
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs
@@ -0,0 +1,32 @@
+// 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;
+using Microsoft.AspNetCore.Mvc.Razor;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    public abstract class Page : RazorPageBase
+    {
+        public PageContext PageContext { get; set; }
+
+        public virtual RedirectResult Redirect(string url) => throw new NotImplementedException();
+
+        public override void EnsureRenderedBodyOrSections()
+        {
+
+        }
+
+        public override void BeginContext(int position, int length, bool isLiteral)
+        {
+        }
+
+        public override void EndContext()
+        {
+        }
+
+        public virtual bool TryValidateModel(object model) => throw new NotImplementedException();
+
+        public virtual bool TryValidateModel(object model, string prefix) => throw new NotImplementedException();
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs
new file mode 100644
index 0000000000..2f2a1ea9ed
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    public class PageContext : ViewContext
+    {
+        public Page Page { get; set; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs
new file mode 100644
index 0000000000..c851d7a1c1
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs
@@ -0,0 +1,43 @@
+// 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;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    public abstract class PageModel
+    {
+        public IUrlHelper Url { get; set; }
+
+        public Page Page => PageContext?.Page;
+
+        public PageContext PageContext { get; set; }
+
+        public ViewContext ViewContext => PageContext;
+
+        public ITempDataDictionary TempData { get; }
+
+        public ViewDataDictionary ViewData { get; }
+
+        protected internal Task<bool> TryUpdateModelAsync<TModel>(TModel model)
+            where TModel : class
+        {
+            throw new NotImplementedException();
+        }
+
+        protected internal Task<bool> TryUpdateModelAsync<TModel>(TModel model, string name)
+            where TModel : class
+        {
+            throw new NotImplementedException();
+        }
+
+        protected internal RedirectResult Redirect(string url) => throw new NotImplementedException();
+
+        public virtual bool TryValidateModel(object model) => throw new NotImplementedException();
+
+        public virtual bool TryValidateModel(object model, string name) => throw new NotImplementedException();
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs
new file mode 100644
index 0000000000..900827a018
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.RazorPages/RazorPageAttribute.cs
@@ -0,0 +1,19 @@
+// 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;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class RazorPageAttribute : RazorViewAttribute
+    {
+        public RazorPageAttribute(string path, Type viewType, string routeTemplate)
+            : base(path, viewType)
+        {
+            RouteTemplate = routeTemplate;
+        }
+
+        public string RouteTemplate { get; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs
new file mode 100644
index 0000000000..32d8c06988
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/IHtmlHelperOfT.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public interface IHtmlHelper<TModel>
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs
new file mode 100644
index 0000000000..acc44e7b61
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/IJsonHelper.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public interface IJsonHelper
+    {
+
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs
new file mode 100644
index 0000000000..0f8a3b5bb6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.Rendering/ViewContext.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class ViewContext
+    {
+        public ViewDataDictionary ViewData { get; set; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs
new file mode 100644
index 0000000000..508b0cbda7
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs
@@ -0,0 +1,15 @@
+// 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;
+using System.Linq.Expressions;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public interface IModelExpressionProvider
+    {
+        ModelExpression CreateModelExpression<TModel, TValue>(
+               ViewDataDictionary<TModel> viewData,
+               Expression<Func<TModel, TValue>> expression);
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs
new file mode 100644
index 0000000000..2cfa53744b
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public interface ITempDataDictionary
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs
new file mode 100644
index 0000000000..0090cf91b1
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public interface IViewContextAware
+    {
+        void Contextualize(ViewContext viewContext);
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs
new file mode 100644
index 0000000000..3ee8ddc801
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public sealed class ModelExpression
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs
new file mode 100644
index 0000000000..8a97b136cf
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs
@@ -0,0 +1,11 @@
+// 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;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewContextAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs
new file mode 100644
index 0000000000..fa4a7d7c60
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs
@@ -0,0 +1,92 @@
+// 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;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewDataDictionary : IDictionary<string, object>
+    {
+        #region IDictionary properties
+        public object this[string index]
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public int Count { get; }
+
+        public bool IsReadOnly { get; }
+
+        public ICollection<string> Keys { get; }
+
+        public ICollection<object> Values { get; }
+        #endregion
+
+        #region IDictionary methods
+        public void Add(string key, object value)
+        {
+        }
+
+        public bool ContainsKey(string key)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool Remove(string key)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool TryGetValue(string key, out object value)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Add(KeyValuePair<string, object> item)
+        {
+        }
+
+        public void Clear()
+        {
+        }
+
+        public bool Contains(KeyValuePair<string, object> item)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void CopyTo(KeyValuePair<string, object>[] array, int arrayIndex)
+        {
+        }
+
+        public bool Remove(KeyValuePair<string, object> item)
+        {
+            throw new NotImplementedException();
+        }
+
+        IEnumerator<KeyValuePair<string, object>> IEnumerable<KeyValuePair<string, object>>.GetEnumerator()
+        {
+            throw new NotImplementedException();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            throw new NotImplementedException();
+        }
+
+        public IEnumerator GetEnumerator()
+        {
+            throw new NotImplementedException();
+        }
+        #endregion
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs
new file mode 100644
index 0000000000..f96eb55805
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs
@@ -0,0 +1,7 @@
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewDataDictionary<TModel> : ViewDataDictionary
+    {
+        public TModel Model { get; set; }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/ActionResult.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/ActionResult.cs
new file mode 100644
index 0000000000..790e9499c5
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/ActionResult.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ActionResult : IActionResult
+    {
+
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IActionResult.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IActionResult.cs
new file mode 100644
index 0000000000..afc2e87bf7
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IActionResult.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IActionResult
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IUrlHelper.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IUrlHelper.cs
new file mode 100644
index 0000000000..049f20183c
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IUrlHelper.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IUrlHelper
+    {
+
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs
new file mode 100644
index 0000000000..75f23a78aa
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/IViewComponentHelper.cs
@@ -0,0 +1,16 @@
+// 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;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IViewComponentHelper
+    {
+        Task<IHtmlContent> InvokeAsync(string name, object arguments);
+
+        Task<IHtmlContent> InvokeAsync(Type componentType, object arguments);
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/RedirectResult.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/RedirectResult.cs
new file mode 100644
index 0000000000..93d00ade21
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/RedirectResult.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class RedirectResult : ActionResult
+    {
+
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs
new file mode 100644
index 0000000000..5b470744c6
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Mvc/ViewComponentAttribute.cs
@@ -0,0 +1,11 @@
+// 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;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public sealed class ViewComponentAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj
new file mode 100644
index 0000000000..9fa0e8c4ae
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/xunit.runner.json b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/xunit.runner.json
new file mode 100644
index 0000000000..1c72a421ad
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/xunit.runner.json
@@ -0,0 +1,3 @@
+{
+  "shadowCopy": false
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/Component.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/Component.cs
new file mode 100644
index 0000000000..87301deb92
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/Component.cs
@@ -0,0 +1,16 @@
+// 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 Microsoft.AspNetCore.Components.RenderTree;
+
+namespace Microsoft.AspNetCore.Components
+{
+    public abstract class Component : IComponent
+    {
+        public virtual void BuildRenderTree(RenderTreeBuilder builder)
+        {
+        }
+
+        protected void WriteLiteral(string literal) { }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/IComponent.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/IComponent.cs
new file mode 100644
index 0000000000..c2fe5924da
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/IComponent.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Components
+{
+    public interface IComponent
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
new file mode 100644
index 0000000000..f250e0bb39
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Components.RenderTree
+{
+    public abstract class RenderTreeBuilder
+    {
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
index 8c0ce3583f..9fa0e8c4ae 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.MvcShim/Microsoft.AspNetCore.Razor.Test.MvcShim.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/Microsoft.AspNetCore.Razor.Tools.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
index 352f3a9e7d..06aacff48d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/MvcShim.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/MvcShim.cs
new file mode 100644
index 0000000000..f4fae94c35
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Tools.Test/MvcShim.cs
@@ -0,0 +1,45 @@
+// 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.IO;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace Microsoft.AspNetCore.Razor.Tools
+{
+    internal static class MvcShim
+    {
+        public static readonly string AssemblyName = "Microsoft.AspNetCore.Razor.Test.MvcShim";
+
+        private static Assembly _assembly;
+        private static CSharpCompilation _baseCompilation;
+
+        public static Assembly Assembly
+        {
+            get
+            {
+                if (_assembly == null)
+                {
+                    var filePath = Path.Combine(Directory.GetCurrentDirectory(), AssemblyName + ".dll");
+                    _assembly = Assembly.LoadFrom(filePath);
+                }
+
+                return _assembly;
+            }
+        }
+
+        public static CSharpCompilation BaseCompilation
+        {
+            get
+            {
+                if (_baseCompilation == null)
+                {
+                    _baseCompilation = TestCompilation.Create(Assembly);
+                }
+
+                return _baseCompilation;
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj
index c32bd85577..3ea5cdf474 100644
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj
+++ b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46;$(StandardTestTfms)</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/DefaultRazorCompletionFactsServiceTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/DefaultRazorCompletionFactsServiceTest.cs
new file mode 100644
index 0000000000..7cffe6dece
--- /dev/null
+++ b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/DefaultRazorCompletionFactsServiceTest.cs
@@ -0,0 +1,240 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+using Moq;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public class DefaultRazorCompletionFactsServiceTest
+    {
+        private static readonly IReadOnlyList<DirectiveDescriptor> DefaultDirectives = new[]
+        {
+            CSharpCodeParser.AddTagHelperDirectiveDescriptor,
+            CSharpCodeParser.RemoveTagHelperDirectiveDescriptor,
+            CSharpCodeParser.TagHelperPrefixDirectiveDescriptor,
+        };
+
+        [Fact]
+        public void GetDirectiveCompletionItems_ReturnsDefaultDirectivesAsCompletionItems()
+        {
+            // Arrange
+            var syntaxTree = CreateSyntaxTree("@addTag");
+
+            // Act
+            var completionItems = DefaultRazorCompletionFactsService.GetDirectiveCompletionItems(syntaxTree);
+
+            // Assert
+            Assert.Collection(
+                completionItems,
+                item => AssertRazorCompletionItem(DefaultDirectives[0], item),
+                item => AssertRazorCompletionItem(DefaultDirectives[1], item),
+                item => AssertRazorCompletionItem(DefaultDirectives[2], item));
+        }
+
+        [Fact]
+        public void GetDirectiveCompletionItems_ReturnsCustomDirectivesAsCompletionItems()
+        {
+            // Arrange
+            var customDirective = DirectiveDescriptor.CreateSingleLineDirective("custom", builder =>
+            {
+                builder.Description = "My Custom Directive.";
+            });
+            var syntaxTree = CreateSyntaxTree("@addTag", customDirective);
+
+            // Act
+            var completionItems = DefaultRazorCompletionFactsService.GetDirectiveCompletionItems(syntaxTree);
+
+            // Assert
+            Assert.Collection(
+                completionItems,
+                item => AssertRazorCompletionItem(customDirective, item),
+                item => AssertRazorCompletionItem(DefaultDirectives[0], item),
+                item => AssertRazorCompletionItem(DefaultDirectives[1], item),
+                item => AssertRazorCompletionItem(DefaultDirectives[2], item));
+        }
+
+        [Fact]
+        public void GetDirectiveCompletionItems_UsesDisplayNamesWhenNotNull()
+        {
+            // Arrange
+            var customDirective = DirectiveDescriptor.CreateSingleLineDirective("custom", builder =>
+            {
+                builder.DisplayName = "different";
+                builder.Description = "My Custom Directive.";
+            });
+            var syntaxTree = CreateSyntaxTree("@addTag", customDirective);
+
+            // Act
+            var completionItems = DefaultRazorCompletionFactsService.GetDirectiveCompletionItems(syntaxTree);
+
+            // Assert
+            Assert.Collection(
+                completionItems,
+                item => AssertRazorCompletionItem("different", customDirective, item),
+                item => AssertRazorCompletionItem(DefaultDirectives[0], item),
+                item => AssertRazorCompletionItem(DefaultDirectives[1], item),
+                item => AssertRazorCompletionItem(DefaultDirectives[2], item));
+        }
+
+        [Fact]
+        public void AtDirectiveCompletionPoint_ReturnsFalseIfSyntaxTreeNull()
+        {
+            // Act
+            var result = DefaultRazorCompletionFactsService.AtDirectiveCompletionPoint(syntaxTree: null, location: new SourceSpan(0, 0));
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void AtDirectiveCompletionPoint_ReturnsFalseIfNoOwner()
+        {
+            // Arrange
+            var syntaxTree = CreateSyntaxTree("@");
+            var location = new SourceSpan(2, 0);
+
+            // Act
+            var result = DefaultRazorCompletionFactsService.AtDirectiveCompletionPoint(syntaxTree, location);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void AtDirectiveCompletionPoint_ReturnsFalseWhenOwnerIsNotExpression()
+        {
+            // Arrange
+            var syntaxTree = CreateSyntaxTree("@{");
+            var location = new SourceSpan(2, 0);
+
+            // Act
+            var result = DefaultRazorCompletionFactsService.AtDirectiveCompletionPoint(syntaxTree, location);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void AtDirectiveCompletionPoint_ReturnsFalseWhenOwnerIsComplexExpression()
+        {
+            // Arrange
+            var syntaxTree = CreateSyntaxTree("@DateTime.Now");
+            var location = new SourceSpan(2, 0);
+
+            // Act
+            var result = DefaultRazorCompletionFactsService.AtDirectiveCompletionPoint(syntaxTree, location);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void AtDirectiveCompletionPoint_ReturnsFalseWhenOwnerIsExplicitExpression()
+        {
+            // Arrange
+            var syntaxTree = CreateSyntaxTree("@(something)");
+            var location = new SourceSpan(4, 0);
+
+            // Act
+            var result = DefaultRazorCompletionFactsService.AtDirectiveCompletionPoint(syntaxTree, location);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void AtDirectiveCompletionPoint_ReturnsTrueForSimpleImplicitExpressions()
+        {
+            // Arrange
+            var syntaxTree = CreateSyntaxTree("@mod");
+            var location = new SourceSpan(2, 0);
+
+            // Act
+            var result = DefaultRazorCompletionFactsService.AtDirectiveCompletionPoint(syntaxTree, location);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void IsDirectiveCompletableToken_ReturnsTrueForCSharpIdentifiers()
+        {
+            // Arrange
+            var csharpToken = SyntaxFactory.Token(SyntaxKind.Identifier, "model");
+
+            // Act
+            var result = DefaultRazorCompletionFactsService.IsDirectiveCompletableToken(csharpToken);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void IsDirectiveCompletableToken_ReturnsTrueForCSharpMarkerTokens()
+        {
+            // Arrange
+            var csharpToken = SyntaxFactory.Token(SyntaxKind.Marker, string.Empty);
+
+            // Act
+            var result = DefaultRazorCompletionFactsService.IsDirectiveCompletableToken(csharpToken);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void IsDirectiveCompletableToken_ReturnsFalseForNonCSharpTokens()
+        {
+            // Arrange
+            var token = SyntaxFactory.Token(SyntaxKind.Text, string.Empty);
+
+            // Act
+            var result = DefaultRazorCompletionFactsService.IsDirectiveCompletableToken(token);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsDirectiveCompletableToken_ReturnsFalseForInvalidCSharpTokens()
+        {
+            // Arrange
+            var csharpToken = SyntaxFactory.Token(SyntaxKind.Tilde, "~");
+
+            // Act
+            var result = DefaultRazorCompletionFactsService.IsDirectiveCompletableToken(csharpToken);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        private static void AssertRazorCompletionItem(string completionDisplayText, DirectiveDescriptor directive, RazorCompletionItem item)
+        {
+            Assert.Equal(item.DisplayText, completionDisplayText);
+            Assert.Equal(item.InsertText, directive.Directive);
+            Assert.Equal(directive.Description, item.Description);
+        }
+
+        private static void AssertRazorCompletionItem(DirectiveDescriptor directive, RazorCompletionItem item) =>
+            AssertRazorCompletionItem(directive.Directive, directive, item);
+
+        private static RazorSyntaxTree CreateSyntaxTree(string text, params DirectiveDescriptor[] directives)
+        {
+            var sourceDocument = TestRazorSourceDocument.Create(text);
+            var options = RazorParserOptions.Create(builder =>
+            {
+                foreach (var directive in directives)
+                {
+                    builder.Directives.Add(directive);
+                }
+            });
+            var syntaxTree = RazorSyntaxTree.Parse(sourceDocument, options);
+            return syntaxTree;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DefaultDocumentSnapshotTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DefaultDocumentSnapshotTest.cs
new file mode 100644
index 0000000000..2d0eeab92c
--- /dev/null
+++ b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DefaultDocumentSnapshotTest.cs
@@ -0,0 +1,89 @@
+// 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;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Text;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
+{
+    public class DefaultDocumentSnapshotTest : WorkspaceTestBase
+    {
+        public DefaultDocumentSnapshotTest()
+        {
+            var projectState = ProjectState.Create(Workspace.Services, TestProjectData.SomeProject);
+            var project = new DefaultProjectSnapshot(projectState);
+            HostDocument = new HostDocument(TestProjectData.SomeProjectFile1.FilePath, TestProjectData.SomeProjectFile1.TargetPath);
+            SourceText = SourceText.From("<p>Hello World</p>");
+            Version = VersionStamp.Create();
+            var textAndVersion = TextAndVersion.Create(SourceText, Version);
+            var documentState = DocumentState.Create(Workspace.Services, HostDocument, () => Task.FromResult(textAndVersion));
+            Document = new DefaultDocumentSnapshot(project, documentState);
+        }
+
+        private SourceText SourceText { get; }
+
+        private VersionStamp Version { get; }
+
+        private HostDocument HostDocument { get; }
+
+        private DefaultDocumentSnapshot Document { get; }
+
+        protected override void ConfigureLanguageServices(List<ILanguageService> services)
+        {
+            services.Add(new TestTagHelperResolver());
+        }
+
+        [Fact]
+        public async Task GetGeneratedOutputAsync_SetsHostDocumentOutput()
+        {
+            // Act
+            await Document.GetGeneratedOutputAsync();
+
+            // Assert
+            Assert.NotNull(HostDocument.GeneratedCodeContainer.Output);
+            Assert.Same(SourceText, HostDocument.GeneratedCodeContainer.Source);
+        }
+
+        [Fact]
+        public async Task GetGeneratedOutputAsync_SetsOutputWhenDocumentIsNewer()
+        {
+            // Arrange
+            var newSourceText = SourceText.From("NEW!");
+            var newDocumentState = Document.State.WithText(newSourceText, Version.GetNewerVersion());
+            var newDocument = new DefaultDocumentSnapshot(Document.ProjectInternal, newDocumentState);
+
+            // Force the output to be the new output
+            await Document.GetGeneratedOutputAsync();
+
+            // Act
+            await newDocument.GetGeneratedOutputAsync();
+
+            // Assert
+            Assert.NotNull(HostDocument.GeneratedCodeContainer.Output);
+            Assert.Same(newSourceText, HostDocument.GeneratedCodeContainer.Source);
+        }
+
+        [Fact]
+        public async Task GetGeneratedOutputAsync_OnlySetsOutputIfDocumentNewer()
+        {
+            // Arrange
+            var newSourceText = SourceText.From("NEW!");
+            var newDocumentState = Document.State.WithText(newSourceText, Version.GetNewerVersion());
+            var newDocument = new DefaultDocumentSnapshot(Document.ProjectInternal, newDocumentState);
+
+            // Force the output to be the new output
+            await newDocument.GetGeneratedOutputAsync();
+
+            // Act
+            await Document.GetGeneratedOutputAsync();
+
+            // Assert
+            Assert.NotNull(HostDocument.GeneratedCodeContainer.Output);
+            Assert.Same(newSourceText, HostDocument.GeneratedCodeContainer.Source);
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DefaultProjectSnapshotTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DefaultProjectSnapshotTest.cs
index 3dd6e35b53..3abc655cc8 100644
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DefaultProjectSnapshotTest.cs
+++ b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DefaultProjectSnapshotTest.cs
@@ -1,35 +1,23 @@
 // 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 Microsoft.AspNetCore.Razor.Language;
-using Microsoft.CodeAnalysis.Host;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Host;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 {
-    public class DefaultProjectSnapshotTest
+    public class DefaultProjectSnapshotTest : WorkspaceTestBase
     {
         public DefaultProjectSnapshotTest()
         {
             TagHelperResolver = new TestTagHelperResolver();
 
-            HostServices = TestServices.Create(
-                new IWorkspaceService[]
-                {
-                    new TestProjectSnapshotProjectEngineFactory(),
-                },
-                new ILanguageService[]
-                {
-                    TagHelperResolver,
-                });
-
-            HostProject = new HostProject("c:\\MyProject\\Test.csproj", FallbackRazorConfiguration.MVC_2_0);
-            HostProjectWithConfigurationChange = new HostProject("c:\\MyProject\\Test.csproj", FallbackRazorConfiguration.MVC_1_0);
-
-            Workspace = TestWorkspace.Create(HostServices);
+            HostProject = new HostProject(TestProjectData.SomeProject.FilePath, FallbackRazorConfiguration.MVC_2_0);
+            HostProjectWithConfigurationChange = new HostProject(TestProjectData.SomeProject.FilePath, FallbackRazorConfiguration.MVC_1_0);
 
             var projectId = ProjectId.CreateNewId("Test");
             var solution = Workspace.CurrentSolution.AddProject(ProjectInfo.Create(
@@ -38,19 +26,21 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 "Test",
                 "Test",
                 LanguageNames.CSharp,
-                "c:\\MyProject\\Test.csproj"));
+                TestProjectData.SomeProject.FilePath));
             WorkspaceProject = solution.GetProject(projectId);
 
-            SomeTagHelpers = new List<TagHelperDescriptor>();
-            SomeTagHelpers.Add(TagHelperDescriptorBuilder.Create("Test1", "TestAssembly").Build());
+            SomeTagHelpers = new List<TagHelperDescriptor>
+            {
+                TagHelperDescriptorBuilder.Create("Test1", "TestAssembly").Build()
+            };
 
             Documents = new HostDocument[]
             {
-                new HostDocument("c:\\MyProject\\File.cshtml", "File.cshtml"),
-                new HostDocument("c:\\MyProject\\Index.cshtml", "Index.cshtml"),
+                TestProjectData.SomeProjectFile1,
+                TestProjectData.SomeProjectFile2,
 
                 // linked file
-                new HostDocument("c:\\SomeOtherProject\\Index.cshtml", "Pages\\Index.cshtml"),
+                TestProjectData.AnotherProjectNestedFile3,
             };
         }
 
@@ -64,12 +54,25 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
         private TestTagHelperResolver TagHelperResolver { get; }
 
-        private HostServices HostServices { get; }
-
-        private Workspace Workspace { get; }
-
         private List<TagHelperDescriptor> SomeTagHelpers { get; }
 
+        private void Configure(RazorProjectEngineBuilder builder)
+        {
+            builder.Features.Remove(builder.Features.OfType<IImportProjectFeature>().Single());
+            builder.Features.Add(new TestImportProjectFeature());
+        }
+
+        protected override void ConfigureLanguageServices(List<ILanguageService> services)
+        {
+            services.Add(TagHelperResolver);
+        }
+
+        protected override void ConfigureProjectEngine(RazorProjectEngineBuilder builder)
+        {
+            builder.Features.Remove(builder.Features.OfType<IImportProjectFeature>().Single());
+            builder.Features.Add(new TestImportProjectFeature());
+        }
+
         [Fact]
         public void ProjectSnapshot_CachesDocumentSnapshots()
         {
@@ -92,27 +95,77 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
         }
 
         [Fact]
-        public void ProjectSnapshot_CachesTagHelperTask()
+        public void IsImportDocument_NonImportDocument_ReturnsFalse()
         {
             // Arrange
-            TagHelperResolver.CompletionSource = new TaskCompletionSource<TagHelperResolutionResult>();
+            var state = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
+                .WithAddedHostDocument(Documents[0], DocumentState.EmptyLoader);
+            var snapshot = new DefaultProjectSnapshot(state);
 
-            try
-            {
-                var state = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject);
-                var snapshot = new DefaultProjectSnapshot(state);
+            var document = snapshot.GetDocument(Documents[0].FilePath);
 
-                // Act
-                var task1 = snapshot.GetTagHelpersAsync();
-                var task2 = snapshot.GetTagHelpersAsync();
+            // Act
+            var result = snapshot.IsImportDocument(document);
 
-                // Assert
-                Assert.Same(task1, task2);
-            }
-            finally
-            {
-                TagHelperResolver.CompletionSource.SetCanceled();
-            }
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsImportDocument_ImportDocument_ReturnsTrue()
+        {
+            // Arrange
+            var state = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
+                .WithAddedHostDocument(Documents[0], DocumentState.EmptyLoader)
+                .WithAddedHostDocument(TestProjectData.SomeProjectImportFile, DocumentState.EmptyLoader);
+            var snapshot = new DefaultProjectSnapshot(state);
+
+            var document = snapshot.GetDocument(TestProjectData.SomeProjectImportFile.FilePath);
+
+            // Act
+            var result = snapshot.IsImportDocument(document);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void GetRelatedDocuments_NonImportDocument_ReturnsEmpty()
+        {
+            // Arrange
+            var state = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
+                .WithAddedHostDocument(Documents[0], DocumentState.EmptyLoader);
+            var snapshot = new DefaultProjectSnapshot(state);
+
+            var document = snapshot.GetDocument(Documents[0].FilePath);
+
+            // Act
+            var documents = snapshot.GetRelatedDocuments(document);
+
+            // Assert
+            Assert.Empty(documents);
+        }
+
+        [Fact]
+        public void GetRelatedDocuments_ImportDocument_ReturnsRelated()
+        {
+            // Arrange
+            var state = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
+                .WithAddedHostDocument(Documents[0], DocumentState.EmptyLoader)
+                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader)
+                .WithAddedHostDocument(TestProjectData.SomeProjectImportFile, DocumentState.EmptyLoader);
+            var snapshot = new DefaultProjectSnapshot(state);
+
+            var document = snapshot.GetDocument(TestProjectData.SomeProjectImportFile.FilePath);
+
+            // Act
+            var documents = snapshot.GetRelatedDocuments(document);
+
+            // Assert
+            Assert.Collection(
+                documents.OrderBy(d => d.FilePath),
+                d => Assert.Equal(Documents[0].FilePath, d.FilePath),
+                d => Assert.Equal(Documents[1].FilePath, d.FilePath));
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DocumentStateTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DocumentStateTest.cs
index cf4db709e8..58e64d287c 100644
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DocumentStateTest.cs
+++ b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DocumentStateTest.cs
@@ -3,37 +3,22 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Text;
-using Moq;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 {
-    public class DocumentStateTest
+    public class DocumentStateTest : WorkspaceTestBase
     {
         public DocumentStateTest()
         {
             TagHelperResolver = new TestTagHelperResolver();
-
-            HostServices = TestServices.Create(
-                new IWorkspaceService[]
-                {
-                    new TestProjectSnapshotProjectEngineFactory(),
-                },
-                new ILanguageService[]
-                {
-                    TagHelperResolver,
-                });
-
-            HostProject = new HostProject("c:\\MyProject\\Test.csproj", FallbackRazorConfiguration.MVC_2_0);
-            HostProjectWithConfigurationChange = new HostProject("c:\\MyProject\\Test.csproj", FallbackRazorConfiguration.MVC_1_0);
-
-            Workspace = TestWorkspace.Create(HostServices);
+            
+            HostProject = new HostProject(TestProjectData.SomeProject.FilePath, FallbackRazorConfiguration.MVC_2_0);
+            HostProjectWithConfigurationChange = new HostProject(TestProjectData.SomeProject.FilePath, FallbackRazorConfiguration.MVC_1_0);
 
             var projectId = ProjectId.CreateNewId("Test");
             var solution = Workspace.CurrentSolution.AddProject(ProjectInfo.Create(
@@ -42,19 +27,19 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 "Test",
                 "Test",
                 LanguageNames.CSharp,
-                "c:\\MyProject\\Test.csproj"));
+                TestProjectData.SomeProject.FilePath));
             WorkspaceProject = solution.GetProject(projectId);
 
             SomeTagHelpers = new List<TagHelperDescriptor>();
             SomeTagHelpers.Add(TagHelperDescriptorBuilder.Create("Test1", "TestAssembly").Build());
 
-            Document = new HostDocument("c:\\MyProject\\File.cshtml", "File.cshtml");
+            HostDocument = TestProjectData.SomeProjectFile1;
 
             Text = SourceText.From("Hello, world!");
             TextLoader = () => Task.FromResult(TextAndVersion.Create(Text, VersionStamp.Create()));
         }
 
-        private HostDocument Document { get; }
+        private HostDocument HostDocument { get; }
 
         private HostProject HostProject { get; }
 
@@ -64,21 +49,22 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
         private TestTagHelperResolver TagHelperResolver { get; }
 
-        private HostServices HostServices { get; }
-
-        private Workspace Workspace { get; }
-
         private List<TagHelperDescriptor> SomeTagHelpers { get; }
 
         private Func<Task<TextAndVersion>> TextLoader { get; }
 
         private SourceText Text { get; }
 
+        protected override void ConfigureLanguageServices(List<ILanguageService> services)
+        {
+            services.Add(TagHelperResolver);
+        }
+
         [Fact]
         public async Task DocumentState_CreatedNew_HasEmptyText()
         {
             // Arrange & Act
-            var state = DocumentState.Create(Workspace.Services, Document, DocumentState.EmptyLoader);
+            var state = DocumentState.Create(Workspace.Services, HostDocument, DocumentState.EmptyLoader);
             
             // Assert
             var text = await state.GetTextAsync();
@@ -89,7 +75,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
         public async Task DocumentState_WithText_CreatesNewState()
         {
             // Arrange
-            var original = DocumentState.Create(Workspace.Services, Document, DocumentState.EmptyLoader);
+            var original = DocumentState.Create(Workspace.Services, HostDocument, DocumentState.EmptyLoader);
 
             // Act
             var state = original.WithText(Text, VersionStamp.Create());
@@ -103,7 +89,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
         public async Task DocumentState_WithTextLoader_CreatesNewState()
         {
             // Arrange
-            var original = DocumentState.Create(Workspace.Services, Document, DocumentState.EmptyLoader);
+            var original = DocumentState.Create(Workspace.Services, HostDocument, DocumentState.EmptyLoader);
 
             // Act
             var state = original.WithTextLoader(TextLoader);
@@ -117,7 +103,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
         public void DocumentState_WithConfigurationChange_CachesSnapshotText()
         {
             // Arrange
-            var original = DocumentState.Create(Workspace.Services, Document, DocumentState.EmptyLoader)
+            var original = DocumentState.Create(Workspace.Services, HostDocument, DocumentState.EmptyLoader)
                 .WithText(Text, VersionStamp.Create());
 
             // Act
@@ -132,7 +118,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
         public async Task DocumentState_WithConfigurationChange_CachesLoadedText()
         {
             // Arrange
-            var original = DocumentState.Create(Workspace.Services, Document, DocumentState.EmptyLoader)
+            var original = DocumentState.Create(Workspace.Services, HostDocument, DocumentState.EmptyLoader)
                 .WithTextLoader(TextLoader);
 
             await original.GetTextAsync();
@@ -145,11 +131,43 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             Assert.True(state.TryGetTextVersion(out _));
         }
 
+        [Fact]
+        public void DocumentState_WithImportsChange_CachesSnapshotText()
+        {
+            // Arrange
+            var original = DocumentState.Create(Workspace.Services, HostDocument, DocumentState.EmptyLoader)
+                .WithText(Text, VersionStamp.Create());
+
+            // Act
+            var state = original.WithImportsChange();
+
+            // Assert
+            Assert.True(state.TryGetText(out _));
+            Assert.True(state.TryGetTextVersion(out _));
+        }
+
+        [Fact]
+        public async Task DocumentState_WithImportsChange_CachesLoadedText()
+        {
+            // Arrange
+            var original = DocumentState.Create(Workspace.Services, HostDocument, DocumentState.EmptyLoader)
+                .WithTextLoader(TextLoader);
+
+            await original.GetTextAsync();
+
+            // Act
+            var state = original.WithImportsChange();
+
+            // Assert
+            Assert.True(state.TryGetText(out _));
+            Assert.True(state.TryGetTextVersion(out _));
+        }
+
         [Fact]
         public void DocumentState_WithWorkspaceProjectChange_CachesSnapshotText()
         {
             // Arrange
-            var original = DocumentState.Create(Workspace.Services, Document, DocumentState.EmptyLoader)
+            var original = DocumentState.Create(Workspace.Services, HostDocument, DocumentState.EmptyLoader)
                 .WithText(Text, VersionStamp.Create());
 
             // Act
@@ -160,12 +178,11 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             Assert.True(state.TryGetTextVersion(out _));
         }
 
-
         [Fact]
         public async Task DocumentState_WithWorkspaceProjectChange_CachesLoadedText()
         {
             // Arrange
-            var original = DocumentState.Create(Workspace.Services, Document, DocumentState.EmptyLoader)
+            var original = DocumentState.Create(Workspace.Services, HostDocument, DocumentState.EmptyLoader)
                 .WithTextLoader(TextLoader);
 
             await original.GetTextAsync();
@@ -177,20 +194,5 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             Assert.True(state.TryGetText(out _));
             Assert.True(state.TryGetTextVersion(out _));
         }
-
-        [Fact]
-        public void DocumentState_WithWorkspaceProjectChange_TriesToCacheGeneratedOutput()
-        {
-            // Arrange
-            var original = DocumentState.Create(Workspace.Services, Document, DocumentState.EmptyLoader);
-
-            GC.KeepAlive(original.GeneratedOutput);
-
-            // Act
-            var state = original.WithWorkspaceProjectChange();
-
-            // Assert
-            Assert.Same(state.GeneratedOutput.Older, original.GeneratedOutput);
-        }
     }
 }
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/GeneratedCodeContainerTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/GeneratedCodeContainerTest.cs
new file mode 100644
index 0000000000..f3b04cc39f
--- /dev/null
+++ b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/GeneratedCodeContainerTest.cs
@@ -0,0 +1,81 @@
+// 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.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Text;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
+{
+    public class GeneratedCodeContainerTest
+    {
+        [Fact]
+        public void SetOutput_AcceptsSameVersionedDocuments()
+        {
+            // Arrange
+            var services = TestWorkspace.Create().Services;
+            var hostProject = new HostProject("C:/project.csproj", RazorConfiguration.Default);
+            var projectState = ProjectState.Create(services, hostProject);
+            var project = new DefaultProjectSnapshot(projectState);
+
+            var text = SourceText.From("...");
+            var textAndVersion = TextAndVersion.Create(text, VersionStamp.Default);
+            var hostDocument = new HostDocument("C:/file.cshtml", "C:/file.cshtml");
+            var documentState = new DocumentState(services, hostDocument, text, VersionStamp.Default, () => Task.FromResult(textAndVersion));
+            var document = new DefaultDocumentSnapshot(project, documentState);
+            var newDocument = new DefaultDocumentSnapshot(project, documentState);
+
+            var csharpDocument = RazorCSharpDocument.Create("...", RazorCodeGenerationOptions.CreateDefault(), Enumerable.Empty<RazorDiagnostic>());
+
+            var version = VersionStamp.Create();
+            var container = new GeneratedCodeContainer();
+            container.SetOutput(document, csharpDocument, version, version);
+
+            // Act
+            container.SetOutput(newDocument, csharpDocument, version, version);
+
+            // Assert
+            Assert.Same(newDocument, container.LatestDocument);
+        }
+
+        [Fact]
+        public void SetOutput_AcceptsInitialOutput()
+        {
+            // Arrange
+            var services = TestWorkspace.Create().Services;
+            var hostProject = new HostProject("C:/project.csproj", RazorConfiguration.Default);
+            var projectState = ProjectState.Create(services, hostProject);
+            var project = new DefaultProjectSnapshot(projectState);
+
+            var text = SourceText.From("...");
+            var textAndVersion = TextAndVersion.Create(text, VersionStamp.Default);
+            var hostDocument = new HostDocument("C:/file.cshtml", "C:/file.cshtml");
+            var documentState = new DocumentState(services, hostDocument, text, VersionStamp.Default, () => Task.FromResult(textAndVersion));
+            var document = new DefaultDocumentSnapshot(project, documentState);
+            var csharpDocument = RazorCSharpDocument.Create("...", RazorCodeGenerationOptions.CreateDefault(), Enumerable.Empty<RazorDiagnostic>());
+
+            var version = VersionStamp.Create();
+            var container = new GeneratedCodeContainer();
+
+            // Act
+            container.SetOutput(document, csharpDocument, version, version);
+
+            // Assert
+            Assert.NotNull(container.LatestDocument);
+        }
+
+        private static RazorCodeDocument GetCodeDocument(string content)
+        {
+            var sourceProjectItem = new TestRazorProjectItem("test.cshtml")
+            {
+                Content = content,
+            };
+
+            var engine = RazorProjectEngine.Create();
+            var codeDocument = engine.ProcessDesignTime(sourceProjectItem);
+            return codeDocument;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/ProjectStateGeneratedOutputTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/ProjectStateGeneratedOutputTest.cs
new file mode 100644
index 0000000000..db8390f554
--- /dev/null
+++ b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/ProjectStateGeneratedOutputTest.cs
@@ -0,0 +1,264 @@
+// 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;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Text;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
+{
+    public class ProjectStateGeneratedOutputTest : WorkspaceTestBase
+    {
+        public ProjectStateGeneratedOutputTest()
+        {
+            HostProject = new HostProject(TestProjectData.SomeProject.FilePath, FallbackRazorConfiguration.MVC_2_0);
+            HostProjectWithConfigurationChange = new HostProject(TestProjectData.SomeProject.FilePath, FallbackRazorConfiguration.MVC_1_0);
+
+            var projectId = ProjectId.CreateNewId("Test");
+            var solution = Workspace.CurrentSolution.AddProject(ProjectInfo.Create(
+                projectId,
+                VersionStamp.Default,
+                "Test",
+                "Test",
+                LanguageNames.CSharp,
+                TestProjectData.SomeProject.FilePath));
+            WorkspaceProject = solution.GetProject(projectId);
+
+            SomeTagHelpers = new List<TagHelperDescriptor>();
+            SomeTagHelpers.Add(TagHelperDescriptorBuilder.Create("Test1", "TestAssembly").Build());
+
+            HostDocument = TestProjectData.SomeProjectFile1;
+
+            Text = SourceText.From("Hello, world!");
+            TextLoader = () => Task.FromResult(TextAndVersion.Create(Text, VersionStamp.Create()));
+        }
+
+        private HostDocument HostDocument { get; }
+
+        private HostProject HostProject { get; }
+
+        private HostProject HostProjectWithConfigurationChange { get; }
+
+        private Project WorkspaceProject { get; }
+
+        private TestTagHelperResolver TagHelperResolver { get; } = new TestTagHelperResolver();
+
+        private List<TagHelperDescriptor> SomeTagHelpers { get; }
+
+        private Func<Task<TextAndVersion>> TextLoader { get; }
+
+        private SourceText Text { get; }
+
+        protected override void ConfigureLanguageServices(List<ILanguageService> services)
+        {
+            services.Add(TagHelperResolver);
+        }
+
+        protected override void ConfigureProjectEngine(RazorProjectEngineBuilder builder)
+        {
+            builder.Features.Remove(builder.Features.OfType<IImportProjectFeature>().Single());
+            builder.Features.Add(new TestImportProjectFeature());
+        }
+
+        [Fact]
+        public async Task HostDocumentAdded_CachesOutput()
+        {
+            // Arrange
+            var original =
+                ProjectState.Create(Workspace.Services, HostProject)
+                .WithAddedHostDocument(HostDocument, DocumentState.EmptyLoader);
+
+            var (originalOutput, originalInputVersion, originalOutputVersion) = await GetOutputAsync(original, HostDocument);
+
+            // Act
+            var state = original.WithAddedHostDocument(TestProjectData.AnotherProjectFile1, DocumentState.EmptyLoader);
+
+            // Assert
+            var (actualOutput, actualInputVersion, actualOutputVersion) = await GetOutputAsync(state, HostDocument);
+            Assert.Same(originalOutput, actualOutput);
+            Assert.Equal(originalInputVersion, actualInputVersion);
+            Assert.Equal(originalOutputVersion, actualOutputVersion);
+            Assert.Equal(await state.GetComputedStateVersionAsync(new DefaultProjectSnapshot(state)), actualOutputVersion);
+        }
+
+        [Fact]
+        public async Task HostDocumentAdded_Import_DoesNotCacheOutput()
+        {
+            // Arrange
+            var original =
+                ProjectState.Create(Workspace.Services, HostProject)
+                .WithAddedHostDocument(HostDocument, DocumentState.EmptyLoader);
+
+            var (originalOutput, originalInputVersion, originalOutputVersion) = await GetOutputAsync(original, HostDocument);
+
+            // Act
+            var state = original.WithAddedHostDocument(TestProjectData.SomeProjectImportFile, DocumentState.EmptyLoader);
+
+            // Assert
+            var (actualOutput, actualInputVersion, actualOutputVersion) = await GetOutputAsync(state, HostDocument);
+            Assert.NotSame(originalOutput, actualOutput);
+            Assert.NotEqual(originalInputVersion, actualInputVersion);
+            Assert.Equal(originalOutputVersion, actualOutputVersion);
+            Assert.Equal(state.DocumentCollectionVersion, actualInputVersion);
+        }
+
+        [Fact]
+        public async Task HostDocumentChanged_DoesNotCacheOutput()
+        {
+            // Arrange
+            var original =
+                ProjectState.Create(Workspace.Services, HostProject)
+                .WithAddedHostDocument(HostDocument, DocumentState.EmptyLoader)
+                .WithAddedHostDocument(TestProjectData.SomeProjectImportFile, DocumentState.EmptyLoader);
+
+            var (originalOutput, originalInputVersion, originalOutputVersion) = await GetOutputAsync(original, HostDocument);
+
+            // Act
+            var version = VersionStamp.Create();
+            var state = original.WithChangedHostDocument(HostDocument, () =>
+            {
+                return Task.FromResult(TextAndVersion.Create(SourceText.From("@using System"), version));
+            });
+
+            // Assert
+            var (actualOutput, actualInputVersion, actualOutputVersion) = await GetOutputAsync(state, HostDocument);
+            Assert.NotSame(originalOutput, actualOutput);
+            Assert.NotEqual(originalInputVersion, actualInputVersion);
+            Assert.NotEqual(originalOutputVersion, actualOutputVersion);
+            Assert.Equal(version, actualInputVersion);
+        }
+
+        [Fact]
+        public async Task HostDocumentChanged_Import_DoesNotCacheOutput()
+        {
+            // Arrange
+            var original =
+                ProjectState.Create(Workspace.Services, HostProject)
+                .WithAddedHostDocument(HostDocument, DocumentState.EmptyLoader)
+                .WithAddedHostDocument(TestProjectData.SomeProjectImportFile, DocumentState.EmptyLoader);
+
+            var (originalOutput, originalInputVersion, originalOutputVersion) = await GetOutputAsync(original, HostDocument);
+
+            // Act
+            var version = VersionStamp.Create();
+            var state = original.WithChangedHostDocument(TestProjectData.SomeProjectImportFile, () =>
+            {
+                return Task.FromResult(TextAndVersion.Create(SourceText.From("@using System"), version));
+            });
+
+            // Assert
+            var (actualOutput, actualInputVersion, actualOutputVersion) = await GetOutputAsync(state, HostDocument);
+            Assert.NotSame(originalOutput, actualOutput);
+            Assert.NotEqual(originalInputVersion, actualInputVersion);
+            Assert.NotEqual(originalOutputVersion, actualOutputVersion);
+            Assert.Equal(version, actualInputVersion);
+        }
+
+        [Fact]
+        public async Task HostDocumentRemoved_Import_DoesNotCacheOutput()
+        {
+            // Arrange
+            var original =
+                ProjectState.Create(Workspace.Services, HostProject)
+                .WithAddedHostDocument(HostDocument, DocumentState.EmptyLoader)
+                .WithAddedHostDocument(TestProjectData.SomeProjectImportFile, DocumentState.EmptyLoader);
+
+            var (originalOutput, originalInputVersion, originalOutputVersion) = await GetOutputAsync(original, HostDocument);
+
+            // Act
+            var state = original.WithRemovedHostDocument(TestProjectData.SomeProjectImportFile);
+
+            // Assert
+            var (actualOutput, actualInputVersion, actualOutputVersion) = await GetOutputAsync(state, HostDocument);
+            Assert.NotSame(originalOutput, actualOutput);
+            Assert.NotEqual(originalInputVersion, actualInputVersion);
+            Assert.Equal(originalOutputVersion, actualOutputVersion);
+            Assert.Equal(state.DocumentCollectionVersion, actualInputVersion);
+        }
+
+        [Fact]
+        public async Task WorkspaceProjectChange_CachesOutput()
+        {
+            // Arrange
+            var original =
+                ProjectState.Create(Workspace.Services, HostProject)
+                .WithAddedHostDocument(HostDocument, DocumentState.EmptyLoader);
+
+            var (originalOutput, originalInputVersion, originalOutputVersion) = await GetOutputAsync(original, HostDocument);
+
+            // Act
+            var state = original.WithWorkspaceProject(WorkspaceProject.WithAssemblyName("Test2"));
+
+            // Assert
+            var (actualOutput, actualInputVersion, actualOutputVersion) = await GetOutputAsync(state, HostDocument);
+            Assert.Same(originalOutput, actualOutput);
+            Assert.Equal(originalInputVersion, actualInputVersion);
+            Assert.Equal(originalOutputVersion, actualOutputVersion);
+            Assert.Equal(await state.GetComputedStateVersionAsync(new DefaultProjectSnapshot(state)), actualInputVersion);
+        }
+
+        // The generated code's text doesn't change as a result, so the output version does not change
+        [Fact]
+        public async Task WorkspaceProjectChange_WithTagHelperChange_DoesNotCacheOutput()
+        {
+            // Arrange
+            var original =
+                ProjectState.Create(Workspace.Services, HostProject)
+                .WithAddedHostDocument(HostDocument, DocumentState.EmptyLoader);
+
+            var (originalOutput, originalInputVersion, originalOutputVersion) = await GetOutputAsync(original, HostDocument);
+
+            TagHelperResolver.TagHelpers = SomeTagHelpers;
+
+            // Act
+            var state = original.WithWorkspaceProject(WorkspaceProject.WithAssemblyName("Test2"));
+
+            // Assert
+            var (actualOutput, actualInputVersion, actualOutputVersion) = await GetOutputAsync(state, HostDocument);
+            Assert.NotSame(originalOutput, actualOutput);
+            Assert.NotEqual(originalInputVersion, actualInputVersion);
+            Assert.Equal(originalOutputVersion, actualOutputVersion);
+            Assert.Equal(await state.GetComputedStateVersionAsync(new DefaultProjectSnapshot(state)), actualInputVersion);
+        }
+
+        [Fact]
+        public async Task ConfigurationChange_DoesNotCacheOutput()
+        {
+            // Arrange
+            var original =
+                ProjectState.Create(Workspace.Services, HostProject)
+                .WithAddedHostDocument(HostDocument, DocumentState.EmptyLoader);
+
+            var (originalOutput, originalInputVersion, originalOutputVersion) = await GetOutputAsync(original, HostDocument);
+
+            // Act
+            var state = original.WithHostProject(HostProjectWithConfigurationChange);
+
+            // Assert
+            var (actualOutput, actualInputVersion, actualOutputVersion) = await GetOutputAsync(state, HostDocument);
+            Assert.NotSame(originalOutput, actualOutput);
+            Assert.NotEqual(originalInputVersion, actualInputVersion);
+            Assert.NotEqual(originalOutputVersion, actualOutputVersion);
+            Assert.Equal(await state.GetComputedStateVersionAsync(new DefaultProjectSnapshot(state)), actualInputVersion);
+        }
+
+        private static Task<(RazorCodeDocument, VersionStamp, VersionStamp)> GetOutputAsync(ProjectState project, HostDocument hostDocument)
+        {
+            var document = project.Documents[hostDocument.FilePath];
+            return GetOutputAsync(project, document);
+        }
+
+        private static Task<(RazorCodeDocument, VersionStamp, VersionStamp)> GetOutputAsync(ProjectState project, DocumentState document)
+        {
+
+            var projectSnapshot = new DefaultProjectSnapshot(project);
+            var documentSnapshot = new DefaultDocumentSnapshot(projectSnapshot, document);
+            return document.GetGeneratedOutputAndVersionAsync(projectSnapshot, documentSnapshot);
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/ProjectStateTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/ProjectStateTest.cs
index 585d5af27e..9ee22b31a3 100644
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/ProjectStateTest.cs
+++ b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/ProjectStateTest.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
@@ -12,26 +13,12 @@ using Xunit;
 
 namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 {
-    public class ProjectStateTest
+    public class ProjectStateTest : WorkspaceTestBase
     {
         public ProjectStateTest()
         {
-            TagHelperResolver = new TestTagHelperResolver();
-
-            HostServices = TestServices.Create(
-                new IWorkspaceService[]
-                {
-                    new TestProjectSnapshotProjectEngineFactory(),
-                },
-                new ILanguageService[]
-                {
-                    TagHelperResolver,
-                });
-
-            HostProject = new HostProject("c:\\MyProject\\Test.csproj", FallbackRazorConfiguration.MVC_2_0);
-            HostProjectWithConfigurationChange = new HostProject("c:\\MyProject\\Test.csproj", FallbackRazorConfiguration.MVC_1_0);
-
-            Workspace = TestWorkspace.Create(HostServices);
+            HostProject = new HostProject(TestProjectData.SomeProject.FilePath, FallbackRazorConfiguration.MVC_2_0);
+            HostProjectWithConfigurationChange = new HostProject(TestProjectData.SomeProject.FilePath, FallbackRazorConfiguration.MVC_1_0);
 
             var projectId = ProjectId.CreateNewId("Test");
             var solution = Workspace.CurrentSolution.AddProject(ProjectInfo.Create(
@@ -40,7 +27,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 "Test",
                 "Test",
                 LanguageNames.CSharp,
-                "c:\\MyProject\\Test.csproj"));
+                TestProjectData.SomeProject.FilePath));
             WorkspaceProject = solution.GetProject(projectId);
 
             SomeTagHelpers = new List<TagHelperDescriptor>();
@@ -48,11 +35,11 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             Documents = new HostDocument[]
             {
-                new HostDocument("c:\\MyProject\\File.cshtml", "File.cshtml"),
-                new HostDocument("c:\\MyProject\\Index.cshtml", "Index.cshtml"),
+                TestProjectData.SomeProjectFile1,
+                TestProjectData.SomeProjectFile2,
 
                 // linked file
-                new HostDocument("c:\\SomeOtherProject\\Index.cshtml", "Pages\\Index.cshtml"),
+                TestProjectData.AnotherProjectNestedFile3,
             };
 
             Text = SourceText.From("Hello, world!");
@@ -67,11 +54,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
         private Project WorkspaceProject { get; }
 
-        private TestTagHelperResolver TagHelperResolver { get; }
-
-        private HostServices HostServices { get; }
-
-        private Workspace Workspace { get; }
+        private TestTagHelperResolver TagHelperResolver { get; set; }
 
         private List<TagHelperDescriptor> SomeTagHelpers { get; }
 
@@ -79,6 +62,18 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
         private SourceText Text { get; }
 
+        protected override void ConfigureLanguageServices(List<ILanguageService> services)
+        {
+            TagHelperResolver = new TestTagHelperResolver();
+            services.Add(TagHelperResolver);
+        }
+
+        protected override void ConfigureProjectEngine(RazorProjectEngineBuilder builder)
+        {
+            builder.Features.Remove(builder.Features.OfType<IImportProjectFeature>().Single());
+            builder.Features.Add(new TestImportProjectFeature());
+        }
+
         [Fact]
         public void ProjectState_ConstructedNew()
         {
@@ -107,6 +102,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             Assert.Collection(
                 state.Documents.OrderBy(kvp => kvp.Key),
                 d => Assert.Same(Documents[0], d.Value.HostDocument));
+            Assert.NotEqual(original.DocumentCollectionVersion, state.DocumentCollectionVersion);
         }
 
         [Fact] // When we first add a document, we have no way to read the text, so it's empty.
@@ -139,13 +135,98 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             Assert.Collection(
                 state.Documents.OrderBy(kvp => kvp.Key),
+                d => Assert.Same(Documents[2], d.Value.HostDocument),
                 d => Assert.Same(Documents[0], d.Value.HostDocument),
-                d => Assert.Same(Documents[1], d.Value.HostDocument),
-                d => Assert.Same(Documents[2], d.Value.HostDocument));
+                d => Assert.Same(Documents[1], d.Value.HostDocument));
+            Assert.NotEqual(original.DocumentCollectionVersion, state.DocumentCollectionVersion);
         }
 
         [Fact]
-        public void ProjectState_AddHostDocument_RetainsComputedState()
+        public void ProjectState_AddHostDocument_TracksImports()
+        {
+            // Arrange
+            
+            // Act
+            var state = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
+                .WithAddedHostDocument(TestProjectData.SomeProjectFile1, DocumentState.EmptyLoader)
+                .WithAddedHostDocument(TestProjectData.SomeProjectFile2, DocumentState.EmptyLoader)
+                .WithAddedHostDocument(TestProjectData.SomeProjectNestedFile3, DocumentState.EmptyLoader)
+                .WithAddedHostDocument(TestProjectData.AnotherProjectNestedFile4, DocumentState.EmptyLoader);
+            
+            // Assert
+            Assert.Collection(
+                state.ImportsToRelatedDocuments.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal(TestProjectData.SomeProjectImportFile.TargetPath, kvp.Key);
+                    Assert.Equal(
+                        new string[]
+                        {
+                            TestProjectData.AnotherProjectNestedFile4.FilePath,
+                            TestProjectData.SomeProjectFile1.FilePath,
+                            TestProjectData.SomeProjectFile2.FilePath,
+                            TestProjectData.SomeProjectNestedFile3.FilePath,
+                        },
+                        kvp.Value.OrderBy(f => f));
+                },
+                kvp =>
+                {
+                    Assert.Equal(TestProjectData.SomeProjectNestedImportFile.TargetPath, kvp.Key);
+                    Assert.Equal(
+                        new string[]
+                        {
+                            TestProjectData.AnotherProjectNestedFile4.FilePath,
+                            TestProjectData.SomeProjectNestedFile3.FilePath,
+                        },
+                        kvp.Value.OrderBy(f => f));
+                });
+        }
+
+        [Fact]
+        public void ProjectState_AddHostDocument_TracksImports_AddImportFile()
+        {
+            // Arrange
+            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
+                .WithAddedHostDocument(TestProjectData.SomeProjectFile1, DocumentState.EmptyLoader)
+                .WithAddedHostDocument(TestProjectData.SomeProjectFile2, DocumentState.EmptyLoader)
+                .WithAddedHostDocument(TestProjectData.SomeProjectNestedFile3, DocumentState.EmptyLoader)
+                .WithAddedHostDocument(TestProjectData.AnotherProjectNestedFile4, DocumentState.EmptyLoader);
+
+            // Act
+            var state = original
+                .WithAddedHostDocument(TestProjectData.AnotherProjectImportFile, DocumentState.EmptyLoader);
+
+            // Assert
+            Assert.Collection(
+                state.ImportsToRelatedDocuments.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal(TestProjectData.SomeProjectImportFile.TargetPath, kvp.Key);
+                    Assert.Equal(
+                        new string[]
+                        {
+                            TestProjectData.AnotherProjectNestedFile4.FilePath,
+                            TestProjectData.SomeProjectFile1.FilePath,
+                            TestProjectData.SomeProjectFile2.FilePath,
+                            TestProjectData.SomeProjectNestedFile3.FilePath,
+                        },
+                        kvp.Value.OrderBy(f => f));
+                },
+                kvp =>
+                {
+                    Assert.Equal(TestProjectData.SomeProjectNestedImportFile.TargetPath, kvp.Key);
+                    Assert.Equal(
+                        new string[]
+                        {
+                            TestProjectData.AnotherProjectNestedFile4.FilePath,
+                            TestProjectData.SomeProjectNestedFile3.FilePath,
+                        },
+                        kvp.Value.OrderBy(f => f));
+                });
+        }
+
+        [Fact]
+        public async Task ProjectState_AddHostDocument_RetainsComputedState()
         {
             // Arrange
             var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
@@ -153,15 +234,19 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
 
             // Force init
-            GC.KeepAlive(original.ProjectEngine);
-            GC.KeepAlive(original.TagHelpers);
+            var originalTagHelpers = await original.GetTagHelpersAsync(new DefaultProjectSnapshot(original));
+            var originalComputedVersion = await original.GetComputedStateVersionAsync(new DefaultProjectSnapshot(original));
 
             // Act
             var state = original.WithAddedHostDocument(Documents[0], DocumentState.EmptyLoader);
 
             // Assert
+            var actualTagHelpers = await state.GetTagHelpersAsync(new DefaultProjectSnapshot(state));
+            var actualComputedVersion = await state.GetComputedStateVersionAsync(new DefaultProjectSnapshot(state));
+
             Assert.Same(original.ProjectEngine, state.ProjectEngine);
-            Assert.Same(original.TagHelpers, state.TagHelpers);
+            Assert.Same(originalTagHelpers, actualTagHelpers);
+            Assert.Equal(originalComputedVersion, actualComputedVersion);
 
             Assert.Same(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
             Assert.Same(original.Documents[Documents[2].FilePath], state.Documents[Documents[2].FilePath]);
@@ -198,6 +283,8 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             var text = await state.Documents[Documents[1].FilePath].GetTextAsync();
             Assert.Same(Text, text);
+
+            Assert.Equal(original.DocumentCollectionVersion, state.DocumentCollectionVersion);
         }
 
         [Fact]
@@ -216,10 +303,12 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             var text = await state.Documents[Documents[1].FilePath].GetTextAsync();
             Assert.Same(Text, text);
+
+            Assert.Equal(original.DocumentCollectionVersion, state.DocumentCollectionVersion);
         }
 
         [Fact]
-        public void ProjectState_WithChangedHostDocument_Loader_RetainsComputedState()
+        public async Task ProjectState_WithChangedHostDocument_Loader_RetainsComputedState()
         {
             // Arrange
             var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
@@ -227,21 +316,25 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
 
             // Force init
-            GC.KeepAlive(original.ProjectEngine);
-            GC.KeepAlive(original.TagHelpers);
+            var originalTagHelpers = await original.GetTagHelpersAsync(new DefaultProjectSnapshot(original));
+            var originalComputedVersion = await original.GetComputedStateVersionAsync(new DefaultProjectSnapshot(original));
 
             // Act
             var state = original.WithChangedHostDocument(Documents[1], TextLoader);
 
             // Assert
+            var actualTagHelpers = await state.GetTagHelpersAsync(new DefaultProjectSnapshot(state));
+            var actualComputedVersion = await state.GetComputedStateVersionAsync(new DefaultProjectSnapshot(state));
+
             Assert.Same(original.ProjectEngine, state.ProjectEngine);
-            Assert.Same(original.TagHelpers, state.TagHelpers);
+            Assert.Same(originalTagHelpers, actualTagHelpers);
+            Assert.Equal(originalComputedVersion, actualComputedVersion);
 
             Assert.NotSame(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
         }
 
         [Fact]
-        public void ProjectState_WithChangedHostDocument_Snapshot_RetainsComputedState()
+        public async Task ProjectState_WithChangedHostDocument_Snapshot_RetainsComputedState()
         {
             // Arrange
             var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
@@ -249,15 +342,19 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
 
             // Force init
-            GC.KeepAlive(original.ProjectEngine);
-            GC.KeepAlive(original.TagHelpers);
+            var originalTagHelpers = await original.GetTagHelpersAsync(new DefaultProjectSnapshot(original));
+            var originalComputedVersion = await original.GetComputedStateVersionAsync(new DefaultProjectSnapshot(original));
 
             // Act
             var state = original.WithChangedHostDocument(Documents[1], Text, VersionStamp.Create());
 
             // Assert
+            var actualTagHelpers = await state.GetTagHelpersAsync(new DefaultProjectSnapshot(state));
+            var actualComputedVersion = await state.GetComputedStateVersionAsync(new DefaultProjectSnapshot(state));
+
             Assert.Same(original.ProjectEngine, state.ProjectEngine);
-            Assert.Same(original.TagHelpers, state.TagHelpers);
+            Assert.Same(originalTagHelpers, actualTagHelpers);
+            Assert.Equal(originalComputedVersion, actualComputedVersion);
 
             Assert.NotSame(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
         }
@@ -309,10 +406,74 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             Assert.Collection(
                 state.Documents.OrderBy(kvp => kvp.Key),
                 d => Assert.Same(Documents[2], d.Value.HostDocument));
+
+            Assert.NotEqual(original.DocumentCollectionVersion, state.DocumentCollectionVersion);
         }
 
         [Fact]
-        public void ProjectState_RemoveHostDocument_RetainsComputedState()
+        public void ProjectState_RemoveHostDocument_TracksImports()
+        {
+            // Arrange
+            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
+                .WithAddedHostDocument(TestProjectData.SomeProjectFile1, DocumentState.EmptyLoader)
+                .WithAddedHostDocument(TestProjectData.SomeProjectFile2, DocumentState.EmptyLoader)
+                .WithAddedHostDocument(TestProjectData.SomeProjectNestedFile3, DocumentState.EmptyLoader)
+                .WithAddedHostDocument(TestProjectData.AnotherProjectNestedFile4, DocumentState.EmptyLoader);
+
+            // Act
+            var state = original.WithRemovedHostDocument(TestProjectData.SomeProjectNestedFile3);
+
+            // Assert
+            Assert.Collection(
+                state.ImportsToRelatedDocuments.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal(TestProjectData.SomeProjectImportFile.TargetPath, kvp.Key);
+                    Assert.Equal(
+                        new string[]
+                        {
+                            TestProjectData.AnotherProjectNestedFile4.FilePath,
+                            TestProjectData.SomeProjectFile1.FilePath,
+                            TestProjectData.SomeProjectFile2.FilePath,
+                        },
+                        kvp.Value.OrderBy(f => f));
+                },
+                kvp =>
+                {
+                    Assert.Equal(TestProjectData.SomeProjectNestedImportFile.TargetPath, kvp.Key);
+                    Assert.Equal(
+                        new string[]
+                        {
+                            TestProjectData.AnotherProjectNestedFile4.FilePath,
+                        },
+                        kvp.Value.OrderBy(f => f));
+                });
+        }
+
+        [Fact]
+        public void ProjectState_RemoveHostDocument_TracksImports_RemoveAllDocuments()
+        {
+            // Arrange
+            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
+                .WithAddedHostDocument(TestProjectData.SomeProjectFile1, DocumentState.EmptyLoader)
+                .WithAddedHostDocument(TestProjectData.SomeProjectFile2, DocumentState.EmptyLoader)
+                .WithAddedHostDocument(TestProjectData.SomeProjectNestedFile3, DocumentState.EmptyLoader)
+                .WithAddedHostDocument(TestProjectData.AnotherProjectNestedFile4, DocumentState.EmptyLoader);
+
+            // Act
+            var state = original
+                .WithRemovedHostDocument(TestProjectData.SomeProjectFile1)
+                .WithRemovedHostDocument(TestProjectData.SomeProjectFile2)
+                .WithRemovedHostDocument(TestProjectData.SomeProjectNestedFile3)
+                .WithRemovedHostDocument(TestProjectData.AnotherProjectNestedFile4);
+
+            // Assert
+            Assert.Empty(state.Documents);
+            Assert.Empty(state.ImportsToRelatedDocuments);
+        }
+
+        [Fact]
+        public async Task ProjectState_RemoveHostDocument_RetainsComputedState()
         {
             // Arrange
             var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
@@ -320,15 +481,19 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
 
             // Force init
-            GC.KeepAlive(original.ProjectEngine);
-            GC.KeepAlive(original.TagHelpers);
+            var originalTagHelpers = await original.GetTagHelpersAsync(new DefaultProjectSnapshot(original));
+            var originalComputedVersion = await original.GetComputedStateVersionAsync(new DefaultProjectSnapshot(original));
 
             // Act
             var state = original.WithRemovedHostDocument(Documents[2]);
 
             // Assert
+            var actualTagHelpers = await state.GetTagHelpersAsync(new DefaultProjectSnapshot(state));
+            var actualComputedVersion = await state.GetComputedStateVersionAsync(new DefaultProjectSnapshot(state));
+
             Assert.Same(original.ProjectEngine, state.ProjectEngine);
-            Assert.Same(original.TagHelpers, state.TagHelpers);
+            Assert.Same(originalTagHelpers, actualTagHelpers);
+            Assert.Equal(originalComputedVersion, actualComputedVersion);
 
             Assert.Same(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
         }
@@ -349,7 +514,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
         }
 
         [Fact]
-        public void ProjectState_WithHostProject_ConfigurationChange_UpdatesComputedState()
+        public async Task ProjectState_WithHostProject_ConfigurationChange_UpdatesComputedState()
         {
             // Arrange
             var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
@@ -357,8 +522,10 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
 
             // Force init
-            GC.KeepAlive(original.ProjectEngine);
-            GC.KeepAlive(original.TagHelpers);
+            var originalTagHelpers = await original.GetTagHelpersAsync(new DefaultProjectSnapshot(original));
+            var originalComputedVersion = await original.GetComputedStateVersionAsync(new DefaultProjectSnapshot(original));
+
+            TagHelperResolver.TagHelpers = SomeTagHelpers;
 
             // Act
             var state = original.WithHostProject(HostProjectWithConfigurationChange);
@@ -367,15 +534,21 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             Assert.NotEqual(original.Version, state.Version);
             Assert.Same(HostProjectWithConfigurationChange, state.HostProject);
 
+            var actualTagHelpers = await state.GetTagHelpersAsync(new DefaultProjectSnapshot(state));
+            var actualComputedVersion = await state.GetComputedStateVersionAsync(new DefaultProjectSnapshot(state));
+
             Assert.NotSame(original.ProjectEngine, state.ProjectEngine);
-            Assert.NotSame(original.TagHelpers, state.TagHelpers);
+            Assert.NotSame(originalTagHelpers, actualTagHelpers);
+            Assert.NotEqual(originalComputedVersion, actualComputedVersion);
 
             Assert.NotSame(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
             Assert.NotSame(original.Documents[Documents[2].FilePath], state.Documents[Documents[2].FilePath]);
+
+            Assert.NotEqual(original.DocumentCollectionVersion, state.DocumentCollectionVersion);
         }
 
         [Fact]
-        public void ProjectState_WithHostProject_NoConfigurationChange_Noops()
+        public async Task ProjectState_WithHostProject_NoConfigurationChange_Noops()
         {
             // Arrange
             var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
@@ -383,8 +556,8 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
 
             // Force init
-            GC.KeepAlive(original.ProjectEngine);
-            GC.KeepAlive(original.TagHelpers);
+            var originalTagHelpers = await original.GetTagHelpersAsync(new DefaultProjectSnapshot(original));
+            var originalComputedVersion = await original.GetComputedStateVersionAsync(new DefaultProjectSnapshot(original));
 
             // Act
             var state = original.WithHostProject(HostProject);
@@ -398,13 +571,13 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
         {
             // Arrange
             var callCount = 0;
-
-            var documents = new Dictionary<string, DocumentState>();
+            
+            var documents = ImmutableDictionary.CreateBuilder<string, DocumentState>(FilePathComparer.Instance);
             documents[Documents[1].FilePath] = TestDocumentState.Create(Workspace.Services, Documents[1], onConfigurationChange: () => callCount++);
             documents[Documents[2].FilePath] = TestDocumentState.Create(Workspace.Services, Documents[2], onConfigurationChange: () => callCount++);
 
             var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject);
-            original.Documents = documents;
+            original.Documents = documents.ToImmutable();
 
             var changed = WorkspaceProject.WithAssemblyName("Test1");
 
@@ -418,7 +591,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
         }
 
         [Fact]
-        public void ProjectState_WithWorkspaceProject_Removed()
+        public async Task ProjectState_WithWorkspaceProject_Removed()
         {
             // Arrange
             var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
@@ -426,8 +599,8 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
 
             // Force init
-            GC.KeepAlive(original.ProjectEngine);
-            GC.KeepAlive(original.TagHelpers);
+            var originalTagHelpers = await original.GetTagHelpersAsync(new DefaultProjectSnapshot(original));
+            var originalComputedVersion = await original.GetComputedStateVersionAsync(new DefaultProjectSnapshot(original));
 
             // Act
             var state = original.WithWorkspaceProject(null);
@@ -436,15 +609,20 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             Assert.NotEqual(original.Version, state.Version);
             Assert.Null(state.WorkspaceProject);
 
+            var actualTagHelpers = await state.GetTagHelpersAsync(new DefaultProjectSnapshot(state));
+            var actualComputedVersion = await state.GetComputedStateVersionAsync(new DefaultProjectSnapshot(state));
+
+            // The configuration didn't change, and the tag helpers didn't actually change
             Assert.Same(original.ProjectEngine, state.ProjectEngine);
-            Assert.NotSame(original.TagHelpers, state.TagHelpers);
+            Assert.Same(originalTagHelpers, actualTagHelpers);
+            Assert.Equal(originalComputedVersion, actualComputedVersion);
 
             Assert.NotSame(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
             Assert.NotSame(original.Documents[Documents[2].FilePath], state.Documents[Documents[2].FilePath]);
         }
 
         [Fact]
-        public void ProjectState_WithWorkspaceProject_Added()
+        public async Task ProjectState_WithWorkspaceProject_Added()
         {
             // Arrange
             var original = ProjectState.Create(Workspace.Services, HostProject, null)
@@ -452,8 +630,8 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
 
             // Force init
-            GC.KeepAlive(original.ProjectEngine);
-            GC.KeepAlive(original.TagHelpers);
+            var originalTagHelpers = await original.GetTagHelpersAsync(new DefaultProjectSnapshot(original));
+            var originalComputedVersion = await original.GetComputedStateVersionAsync(new DefaultProjectSnapshot(original));
 
             // Act
             var state = original.WithWorkspaceProject(WorkspaceProject);
@@ -462,15 +640,20 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             Assert.NotEqual(original.Version, state.Version);
             Assert.Same(WorkspaceProject, state.WorkspaceProject);
 
+            var actualTagHelpers = await state.GetTagHelpersAsync(new DefaultProjectSnapshot(state));
+            var actualComputedVersion = await state.GetComputedStateVersionAsync(new DefaultProjectSnapshot(state));
+
+            // The configuration didn't change, and the tag helpers didn't actually change
             Assert.Same(original.ProjectEngine, state.ProjectEngine);
-            Assert.NotSame(original.TagHelpers, state.TagHelpers);
+            Assert.Same(originalTagHelpers, actualTagHelpers);
+            Assert.Equal(originalComputedVersion, actualComputedVersion);
 
             Assert.NotSame(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
             Assert.NotSame(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
         }
 
         [Fact]
-        public void ProjectState_WithWorkspaceProject_Changed()
+        public async Task ProjectState_WithWorkspaceProject_Changed()
         {
             // Arrange
             var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
@@ -478,8 +661,8 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
 
             // Force init
-            GC.KeepAlive(original.ProjectEngine);
-            GC.KeepAlive(original.TagHelpers);
+            var originalTagHelpers = await original.GetTagHelpersAsync(new DefaultProjectSnapshot(original));
+            var originalComputedVersion = await original.GetComputedStateVersionAsync(new DefaultProjectSnapshot(original));
 
             var changed = WorkspaceProject.WithAssemblyName("Test1");
 
@@ -490,8 +673,50 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             Assert.NotEqual(original.Version, state.Version);
             Assert.Same(changed, state.WorkspaceProject);
 
+            var actualTagHelpers = await state.GetTagHelpersAsync(new DefaultProjectSnapshot(state));
+            var actualComputedVersion = await state.GetComputedStateVersionAsync(new DefaultProjectSnapshot(state));
+
+            // The configuration didn't change, and the tag helpers didn't actually change
             Assert.Same(original.ProjectEngine, state.ProjectEngine);
-            Assert.NotSame(original.TagHelpers, state.TagHelpers);
+            Assert.Same(originalTagHelpers, actualTagHelpers);
+            Assert.Equal(originalComputedVersion, actualComputedVersion);
+
+            Assert.NotSame(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
+            Assert.NotSame(original.Documents[Documents[2].FilePath], state.Documents[Documents[2].FilePath]);
+        }
+
+        [Fact]
+        public async Task ProjectState_WithWorkspaceProject_Changed_TagHelpersChanged()
+        {
+            // Arrange
+            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject)
+                .WithAddedHostDocument(Documents[2], DocumentState.EmptyLoader)
+                .WithAddedHostDocument(Documents[1], DocumentState.EmptyLoader);
+
+            // Force init
+            var originalTagHelpers = await original.GetTagHelpersAsync(new DefaultProjectSnapshot(original));
+            var originalComputedVersion = await original.GetComputedStateVersionAsync(new DefaultProjectSnapshot(original));
+
+            var changed = WorkspaceProject.WithAssemblyName("Test1");
+
+            // Now create some tag helpers
+            TagHelperResolver.TagHelpers = SomeTagHelpers;
+
+            // Act
+            var state = original.WithWorkspaceProject(changed);
+
+            // Assert
+            Assert.NotEqual(original.Version, state.Version);
+            Assert.Same(changed, state.WorkspaceProject);
+
+            var actualTagHelpers = await state.GetTagHelpersAsync(new DefaultProjectSnapshot(state));
+            var actualComputedVersion = await state.GetComputedStateVersionAsync(new DefaultProjectSnapshot(state));
+
+            // The configuration didn't change, but the tag helpers did
+            Assert.Same(original.ProjectEngine, state.ProjectEngine);
+            Assert.NotEqual(originalTagHelpers, actualTagHelpers);
+            Assert.NotEqual(originalComputedVersion, actualComputedVersion);
+            Assert.Equal(state.Version, actualComputedVersion);
 
             Assert.NotSame(original.Documents[Documents[1].FilePath], state.Documents[Documents[1].FilePath]);
             Assert.NotSame(original.Documents[Documents[2].FilePath], state.Documents[Documents[2].FilePath]);
@@ -503,12 +728,12 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             // Arrange
             var callCount = 0;
 
-            var documents = new Dictionary<string, DocumentState>();
+            var documents = ImmutableDictionary.CreateBuilder<string, DocumentState>(FilePathComparer.Instance);
             documents[Documents[1].FilePath] = TestDocumentState.Create(Workspace.Services, Documents[1], onWorkspaceProjectChange: () => callCount++);
             documents[Documents[2].FilePath] = TestDocumentState.Create(Workspace.Services, Documents[2], onWorkspaceProjectChange: () => callCount++);
 
             var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject);
-            original.Documents = documents;
+            original.Documents = documents.ToImmutable();
 
             var changed = WorkspaceProject.WithAssemblyName("Test1");
 
@@ -520,6 +745,231 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             Assert.Equal(2, callCount);
         }
 
+        [Fact]
+        public void ProjectState_WhenImportDocumentAdded_CallsImportsChanged()
+        {
+            // Arrange
+            var callCount = 0;
+            
+            var document1 = TestProjectData.SomeProjectFile1;
+            var document2 = TestProjectData.SomeProjectFile2;
+            var document3 = TestProjectData.SomeProjectNestedFile3;
+            var document4 = TestProjectData.AnotherProjectNestedFile4;
+
+            var documents = ImmutableDictionary.CreateBuilder<string, DocumentState>(FilePathComparer.Instance);
+            documents[document1.FilePath] = TestDocumentState.Create(Workspace.Services, document1, onImportsChange: () => callCount++);
+            documents[document2.FilePath] = TestDocumentState.Create(Workspace.Services, document2, onImportsChange: () => callCount++);
+            documents[document3.FilePath] = TestDocumentState.Create(Workspace.Services, document3, onImportsChange: () => callCount++);
+            documents[document4.FilePath] = TestDocumentState.Create(Workspace.Services, document4, onImportsChange: () => callCount++);
+
+            var importsToRelatedDocuments = ImmutableDictionary.CreateBuilder<string, ImmutableArray<string>>(FilePathComparer.Instance);
+            importsToRelatedDocuments.Add(
+                TestProjectData.SomeProjectImportFile.TargetPath, 
+                ImmutableArray.Create(
+                    TestProjectData.SomeProjectFile1.FilePath,
+                    TestProjectData.SomeProjectFile2.FilePath,
+                    TestProjectData.SomeProjectNestedFile3.FilePath,
+                    TestProjectData.AnotherProjectNestedFile4.FilePath));
+            importsToRelatedDocuments.Add(
+                TestProjectData.SomeProjectNestedImportFile.TargetPath,
+                ImmutableArray.Create(
+                    TestProjectData.SomeProjectNestedFile3.FilePath,
+                    TestProjectData.AnotherProjectNestedFile4.FilePath));
+
+            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject);
+            original.Documents = documents.ToImmutable();
+            original.ImportsToRelatedDocuments = importsToRelatedDocuments.ToImmutable();
+
+            // Act
+            var state = original.WithAddedHostDocument(TestProjectData.AnotherProjectImportFile, DocumentState.EmptyLoader);
+
+            // Assert
+            Assert.NotEqual(original.Version, state.Version);
+            Assert.Equal(4, callCount);
+        }
+
+        [Fact]
+        public void ProjectState_WhenImportDocumentAdded_CallsImportsChanged_Nested()
+        {
+            // Arrange
+            var callCount = 0;
+
+            var document1 = TestProjectData.SomeProjectFile1;
+            var document2 = TestProjectData.SomeProjectFile2;
+            var document3 = TestProjectData.SomeProjectNestedFile3;
+            var document4 = TestProjectData.AnotherProjectNestedFile4;
+
+            var documents = ImmutableDictionary.CreateBuilder<string, DocumentState>(FilePathComparer.Instance);
+            documents[document1.FilePath] = TestDocumentState.Create(Workspace.Services, document1, onImportsChange: () => callCount++);
+            documents[document2.FilePath] = TestDocumentState.Create(Workspace.Services, document2, onImportsChange: () => callCount++);
+            documents[document3.FilePath] = TestDocumentState.Create(Workspace.Services, document3, onImportsChange: () => callCount++);
+            documents[document4.FilePath] = TestDocumentState.Create(Workspace.Services, document4, onImportsChange: () => callCount++);
+
+            var importsToRelatedDocuments = ImmutableDictionary.CreateBuilder<string, ImmutableArray<string>>(FilePathComparer.Instance);
+            importsToRelatedDocuments.Add(
+                TestProjectData.SomeProjectImportFile.TargetPath,
+                ImmutableArray.Create(
+                    TestProjectData.SomeProjectFile1.FilePath,
+                    TestProjectData.SomeProjectFile2.FilePath,
+                    TestProjectData.SomeProjectNestedFile3.FilePath,
+                    TestProjectData.AnotherProjectNestedFile4.FilePath));
+            importsToRelatedDocuments.Add(
+                TestProjectData.SomeProjectNestedImportFile.TargetPath,
+                ImmutableArray.Create(
+                    TestProjectData.SomeProjectNestedFile3.FilePath,
+                    TestProjectData.AnotherProjectNestedFile4.FilePath));
+
+            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject);
+            original.Documents = documents.ToImmutable();
+            original.ImportsToRelatedDocuments = importsToRelatedDocuments.ToImmutable();
+
+            // Act
+            var state = original.WithAddedHostDocument(TestProjectData.AnotherProjectNestedImportFile, DocumentState.EmptyLoader);
+
+            // Assert
+            Assert.NotEqual(original.Version, state.Version);
+            Assert.Equal(2, callCount);
+        }
+
+        [Fact]
+        public void ProjectState_WhenImportDocumentChangedTextLoader_CallsImportsChanged()
+        {
+            // Arrange
+            var callCount = 0;
+
+            var document1 = TestProjectData.SomeProjectFile1;
+            var document2 = TestProjectData.SomeProjectFile2;
+            var document3 = TestProjectData.SomeProjectNestedFile3;
+            var document4 = TestProjectData.AnotherProjectNestedFile4;
+            var document5 = TestProjectData.AnotherProjectNestedImportFile;
+
+            var documents = ImmutableDictionary.CreateBuilder<string, DocumentState>(FilePathComparer.Instance);
+            documents[document1.FilePath] = TestDocumentState.Create(Workspace.Services, document1, onImportsChange: () => callCount++);
+            documents[document2.FilePath] = TestDocumentState.Create(Workspace.Services, document2, onImportsChange: () => callCount++);
+            documents[document3.FilePath] = TestDocumentState.Create(Workspace.Services, document3, onImportsChange: () => callCount++);
+            documents[document4.FilePath] = TestDocumentState.Create(Workspace.Services, document4, onImportsChange: () => callCount++);
+            documents[document5.FilePath] = TestDocumentState.Create(Workspace.Services, document5, onImportsChange: () => callCount++);
+
+            var importsToRelatedDocuments = ImmutableDictionary.CreateBuilder<string, ImmutableArray<string>>(FilePathComparer.Instance);
+            importsToRelatedDocuments.Add(
+                TestProjectData.SomeProjectImportFile.TargetPath,
+                ImmutableArray.Create(
+                    TestProjectData.SomeProjectFile1.FilePath,
+                    TestProjectData.SomeProjectFile2.FilePath,
+                    TestProjectData.SomeProjectNestedFile3.FilePath,
+                    TestProjectData.AnotherProjectNestedFile4.FilePath,
+                    TestProjectData.AnotherProjectNestedImportFile.FilePath));
+            importsToRelatedDocuments.Add(
+                TestProjectData.SomeProjectNestedImportFile.TargetPath,
+                ImmutableArray.Create(
+                    TestProjectData.SomeProjectNestedFile3.FilePath,
+                    TestProjectData.AnotherProjectNestedFile4.FilePath));
+
+            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject);
+            original.Documents = documents.ToImmutable();
+            original.ImportsToRelatedDocuments = importsToRelatedDocuments.ToImmutable();
+
+            // Act
+            var state = original.WithChangedHostDocument(document5, DocumentState.EmptyLoader);
+
+            // Assert
+            Assert.NotEqual(original.Version, state.Version);
+            Assert.Equal(2, callCount);
+        }
+
+        [Fact]
+        public void ProjectState_WhenImportDocumentChangedSnapshot_CallsImportsChanged()
+        {
+            // Arrange
+            var callCount = 0;
+
+            var document1 = TestProjectData.SomeProjectFile1;
+            var document2 = TestProjectData.SomeProjectFile2;
+            var document3 = TestProjectData.SomeProjectNestedFile3;
+            var document4 = TestProjectData.AnotherProjectNestedFile4;
+            var document5 = TestProjectData.AnotherProjectNestedImportFile;
+
+            var documents = ImmutableDictionary.CreateBuilder<string, DocumentState>(FilePathComparer.Instance);
+            documents[document1.FilePath] = TestDocumentState.Create(Workspace.Services, document1, onImportsChange: () => callCount++);
+            documents[document2.FilePath] = TestDocumentState.Create(Workspace.Services, document2, onImportsChange: () => callCount++);
+            documents[document3.FilePath] = TestDocumentState.Create(Workspace.Services, document3, onImportsChange: () => callCount++);
+            documents[document4.FilePath] = TestDocumentState.Create(Workspace.Services, document4, onImportsChange: () => callCount++);
+            documents[document5.FilePath] = TestDocumentState.Create(Workspace.Services, document5, onImportsChange: () => callCount++);
+
+            var importsToRelatedDocuments = ImmutableDictionary.CreateBuilder<string, ImmutableArray<string>>(FilePathComparer.Instance);
+            importsToRelatedDocuments.Add(
+                TestProjectData.SomeProjectImportFile.TargetPath,
+                ImmutableArray.Create(
+                    TestProjectData.SomeProjectFile1.FilePath,
+                    TestProjectData.SomeProjectFile2.FilePath,
+                    TestProjectData.SomeProjectNestedFile3.FilePath,
+                    TestProjectData.AnotherProjectNestedFile4.FilePath,
+                    TestProjectData.AnotherProjectNestedImportFile.FilePath));
+            importsToRelatedDocuments.Add(
+                TestProjectData.SomeProjectNestedImportFile.TargetPath,
+                ImmutableArray.Create(
+                    TestProjectData.SomeProjectNestedFile3.FilePath,
+                    TestProjectData.AnotherProjectNestedFile4.FilePath));
+
+            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject);
+            original.Documents = documents.ToImmutable();
+            original.ImportsToRelatedDocuments = importsToRelatedDocuments.ToImmutable();
+
+            // Act
+            var state = original.WithChangedHostDocument(document5, Text, VersionStamp.Create());
+
+            // Assert
+            Assert.NotEqual(original.Version, state.Version);
+            Assert.Equal(2, callCount);
+        }
+
+
+        [Fact]
+        public void ProjectState_WhenImportDocumentRemoved_CallsImportsChanged()
+        {
+            // Arrange
+            var callCount = 0;
+
+            var document1 = TestProjectData.SomeProjectFile1;
+            var document2 = TestProjectData.SomeProjectFile2;
+            var document3 = TestProjectData.SomeProjectNestedFile3;
+            var document4 = TestProjectData.AnotherProjectNestedFile4;
+            var document5 = TestProjectData.AnotherProjectNestedImportFile;
+
+            var documents = ImmutableDictionary.CreateBuilder<string, DocumentState>(FilePathComparer.Instance);
+            documents[document1.FilePath] = TestDocumentState.Create(Workspace.Services, document1, onImportsChange: () => callCount++);
+            documents[document2.FilePath] = TestDocumentState.Create(Workspace.Services, document2, onImportsChange: () => callCount++);
+            documents[document3.FilePath] = TestDocumentState.Create(Workspace.Services, document3, onImportsChange: () => callCount++);
+            documents[document4.FilePath] = TestDocumentState.Create(Workspace.Services, document4, onImportsChange: () => callCount++);
+            documents[document5.FilePath] = TestDocumentState.Create(Workspace.Services, document5, onImportsChange: () => callCount++);
+
+            var importsToRelatedDocuments = ImmutableDictionary.CreateBuilder<string, ImmutableArray<string>>(FilePathComparer.Instance);
+            importsToRelatedDocuments.Add(
+                TestProjectData.SomeProjectImportFile.TargetPath,
+                ImmutableArray.Create(
+                    TestProjectData.SomeProjectFile1.FilePath,
+                    TestProjectData.SomeProjectFile2.FilePath,
+                    TestProjectData.SomeProjectNestedFile3.FilePath,
+                    TestProjectData.AnotherProjectNestedFile4.FilePath,
+                    TestProjectData.AnotherProjectNestedImportFile.FilePath));
+            importsToRelatedDocuments.Add(
+                TestProjectData.SomeProjectNestedImportFile.TargetPath,
+                ImmutableArray.Create(
+                    TestProjectData.SomeProjectNestedFile3.FilePath,
+                    TestProjectData.AnotherProjectNestedFile4.FilePath));
+
+            var original = ProjectState.Create(Workspace.Services, HostProject, WorkspaceProject);
+            original.Documents = documents.ToImmutable();
+            original.ImportsToRelatedDocuments = importsToRelatedDocuments.ToImmutable();
+
+            // Act
+            var state = original.WithRemovedHostDocument(document5);
+
+            // Assert
+            Assert.NotEqual(original.Version, state.Version);
+            Assert.Equal(2, callCount);
+        }
+
         private class TestDocumentState : DocumentState
         {
             public static TestDocumentState Create(
@@ -529,15 +979,27 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 Action onTextChange = null,
                 Action onTextLoaderChange = null,
                 Action onConfigurationChange = null,
+                Action onImportsChange = null,
                 Action onWorkspaceProjectChange = null)
             {
-                return new TestDocumentState(services, hostDocument, null, null, loader, onTextChange, onTextLoaderChange, onConfigurationChange, onWorkspaceProjectChange);
+                return new TestDocumentState(
+                    services, 
+                    hostDocument, 
+                    null, 
+                    null, 
+                    loader, 
+                    onTextChange, 
+                    onTextLoaderChange, 
+                    onConfigurationChange, 
+                    onImportsChange,
+                    onWorkspaceProjectChange);
             }
 
-            Action _onTextChange;
-            Action _onTextLoaderChange;
-            Action _onConfigurationChange;
-            Action _onWorkspaceProjectChange;
+            private readonly Action _onTextChange;
+            private readonly Action _onTextLoaderChange;
+            private readonly Action _onConfigurationChange;
+            private readonly Action _onImportsChange;
+            private readonly Action _onWorkspaceProjectChange;
 
             private TestDocumentState(
                 HostWorkspaceServices services,
@@ -548,12 +1010,14 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 Action onTextChange,
                 Action onTextLoaderChange,
                 Action onConfigurationChange,
+                Action onImportsChange,
                 Action onWorkspaceProjectChange)
                 : base(services, hostDocument, text, version, loader)
             {
                 _onTextChange = onTextChange;
                 _onTextLoaderChange = onTextLoaderChange;
                 _onConfigurationChange = onConfigurationChange;
+                _onImportsChange = onImportsChange;
                 _onWorkspaceProjectChange = onWorkspaceProjectChange;
             }
 
@@ -575,6 +1039,12 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 return base.WithConfigurationChange();
             }
 
+            public override DocumentState WithImportsChange()
+            {
+                _onImportsChange?.Invoke();
+                return base.WithImportsChange();
+            }
+
             public override DocumentState WithWorkspaceProjectChange()
             {
                 _onWorkspaceProjectChange?.Invoke();
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/RazorExcerptServiceTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/RazorExcerptServiceTest.cs
new file mode 100644
index 0000000000..7466c4f09f
--- /dev/null
+++ b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/RazorExcerptServiceTest.cs
@@ -0,0 +1,564 @@
+// 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;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Classification;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+using Microsoft.CodeAnalysis.Text;
+using Xunit;
+using static Microsoft.CodeAnalysis.Razor.RazorDocumentExcerptService;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public class RazorExcerptServiceTest : WorkspaceTestBase
+    {
+        public RazorExcerptServiceTest()
+        {
+            HostProject = TestProjectData.SomeProject;
+            HostDocument = TestProjectData.SomeProjectFile1;
+        }
+
+        private HostProject HostProject { get; }
+        private HostDocument HostDocument { get; }
+
+        protected override void ConfigureLanguageServices(List<ILanguageService> services)
+        {
+            services.Add(new TestTagHelperResolver());
+        }
+
+        [Fact]
+        public async Task TryGetExcerptInternalAsync_SingleLine_CanClassifyCSharp()
+        {
+            // Arrange
+            var (sourceText, primarySpan) = CreateText(
+@"
+<html>
+@{
+    var |foo| = ""Hello, World!"";
+}
+  <body>@foo</body>
+  <div>@(3 + 4)</div><div>@(foo + foo)</div>
+</html>
+");
+
+            var (primary, secondary) = Initialize(sourceText);
+            var service = CreateExcerptService(primary);
+
+            var secondarySpan = await GetSecondarySpanAsync(primary, primarySpan, secondary);
+            
+            // Act
+            var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, ExcerptModeInternal.SingleLine, CancellationToken.None);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Equal(secondarySpan, result.Value.Span);
+            Assert.Same(secondary, result.Value.Document);
+
+            // Verifies that the right part of the primary document will be highlighted.
+            Assert.Equal(
+                (await secondary.GetTextAsync()).GetSubText(secondarySpan).ToString(),
+                result.Value.Content.GetSubText(result.Value.MappedSpan).ToString(),
+                ignoreLineEndingDifferences: true);
+
+            Assert.Equal(@"    var foo = ""Hello, World!"";", result.Value.Content.ToString(), ignoreLineEndingDifferences: true);
+            Assert.Collection(
+                result.Value.ClassifiedSpans,
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal("    ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c => 
+                {
+                    Assert.Equal(ClassificationTypeNames.Keyword, c.ClassificationType);
+                    Assert.Equal("var", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.LocalName, c.ClassificationType);
+                    Assert.Equal("foo", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Operator, c.ClassificationType);
+                    Assert.Equal("=", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.StringLiteral, c.ClassificationType);
+                    Assert.Equal("\"Hello, World!\"", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Punctuation, c.ClassificationType);
+                    Assert.Equal(";", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                });
+        }
+
+        [Fact]
+        public async Task TryGetExcerptInternalAsync_SingleLine_CanClassifyCSharp_ImplicitExpression()
+        {
+            // Arrange
+            var (sourceText, primarySpan) = CreateText(
+@"
+<html>
+@{
+    var foo = ""Hello, World!"";
+}
+  <body>@|foo|</body>
+  <div>@(3 + 4)</div><div>@(foo + foo)</div>
+</html>
+");
+
+            var (primary, secondary) = Initialize(sourceText);
+            var service = CreateExcerptService(primary);
+
+            var secondarySpan = await GetSecondarySpanAsync(primary, primarySpan, secondary);
+
+            // Act
+            var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, ExcerptModeInternal.SingleLine, CancellationToken.None);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Equal(secondarySpan, result.Value.Span);
+            Assert.Same(secondary, result.Value.Document);
+
+            // Verifies that the right part of the primary document will be highlighted.
+            Assert.Equal(
+                (await secondary.GetTextAsync()).GetSubText(secondarySpan).ToString(),
+                result.Value.Content.GetSubText(result.Value.MappedSpan).ToString(),
+                ignoreLineEndingDifferences: true);
+
+            Assert.Equal(@"  <body>@foo</body>", result.Value.Content.ToString(), ignoreLineEndingDifferences: true);
+            Assert.Collection(
+                result.Value.ClassifiedSpans,
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal("  <body>@", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.LocalName, c.ClassificationType);
+                    Assert.Equal("foo", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal("</body>", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                });
+        }
+
+        [Fact]
+        public async Task TryGetExcerptInternalAsync_SingleLine_CanClassifyCSharp_ComplexLine()
+        {
+            // Arrange
+            var (sourceText, primarySpan) = CreateText(
+@"
+<html>
+@{
+    var foo = ""Hello, World!"";
+}
+  <body>@foo</body>
+  <div>@(3 + 4)</div><div>@(foo + |foo|)</div>
+</html>
+");
+
+            var (primary, secondary) = Initialize(sourceText);
+            var service = CreateExcerptService(primary);
+
+            var secondarySpan = await GetSecondarySpanAsync(primary, primarySpan, secondary);
+
+            // Act
+            var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, ExcerptModeInternal.SingleLine, CancellationToken.None);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Equal(secondarySpan, result.Value.Span);
+            Assert.Same(secondary, result.Value.Document);
+
+            // Verifies that the right part of the primary document will be highlighted.
+            Assert.Equal(
+                (await secondary.GetTextAsync()).GetSubText(secondarySpan).ToString(),
+                result.Value.Content.GetSubText(result.Value.MappedSpan).ToString(),
+                ignoreLineEndingDifferences: true);
+
+            Assert.Equal(@"  <div>@(3 + 4)</div><div>@(foo + foo)</div>", result.Value.Content.ToString(), ignoreLineEndingDifferences: true);
+            Assert.Collection(
+                result.Value.ClassifiedSpans,
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal("  <div>@(", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.NumericLiteral, c.ClassificationType);
+                    Assert.Equal("3", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Operator, c.ClassificationType);
+                    Assert.Equal("+", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.NumericLiteral, c.ClassificationType);
+                    Assert.Equal("4", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(")</div><div>@(", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.LocalName, c.ClassificationType);
+                    Assert.Equal("foo", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Operator, c.ClassificationType);
+                    Assert.Equal("+", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.LocalName, c.ClassificationType);
+                    Assert.Equal("foo", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(")</div>", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                });
+        }
+
+        [Fact]
+        public async Task TryGetExcerptInternalAsync_MultiLine_CanClassifyCSharp()
+        {
+            // Arrange
+            var (sourceText, primarySpan) = CreateText(
+@"
+<html>
+@{
+    var |foo| = ""Hello, World!"";
+}
+  <body></body>
+  <div></div>
+</html>
+");
+
+            var (primary, secondary) = Initialize(sourceText);
+            var service = CreateExcerptService(primary);
+
+            var secondarySpan = await GetSecondarySpanAsync(primary, primarySpan, secondary);
+
+            // Act
+            var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, ExcerptModeInternal.Tooltip, CancellationToken.None);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Equal(secondarySpan, result.Value.Span);
+            Assert.Same(secondary, result.Value.Document);
+
+            // Verifies that the right part of the primary document will be highlighted.
+            Assert.Equal(
+                (await secondary.GetTextAsync()).GetSubText(secondarySpan).ToString(),
+                result.Value.Content.GetSubText(result.Value.MappedSpan).ToString(),
+                ignoreLineEndingDifferences: true);
+
+            Assert.Equal(
+@"
+<html>
+@{
+    var foo = ""Hello, World!"";
+}
+  <body></body>
+  <div></div>", 
+                result.Value.Content.ToString(), ignoreLineEndingDifferences: true);
+
+            Assert.Collection(
+                result.Value.ClassifiedSpans,
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(
+@"
+<html>
+@{", 
+                            result.Value.Content.GetSubText(c.TextSpan).ToString(),
+                            ignoreLineEndingDifferences: true);
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal("\r\n    ", result.Value.Content.GetSubText(c.TextSpan).ToString(), ignoreLineEndingDifferences: true);
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Keyword, c.ClassificationType);
+                    Assert.Equal("var", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.LocalName, c.ClassificationType);
+                    Assert.Equal("foo", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Operator, c.ClassificationType);
+                    Assert.Equal("=", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.StringLiteral, c.ClassificationType);
+                    Assert.Equal("\"Hello, World!\"", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Punctuation, c.ClassificationType);
+                    Assert.Equal(";", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal("\r\n", result.Value.Content.GetSubText(c.TextSpan).ToString(), ignoreLineEndingDifferences: true);
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(
+@"}
+  <body></body>
+  <div></div>", 
+                        result.Value.Content.GetSubText(c.TextSpan).ToString(), 
+                        ignoreLineEndingDifferences: true);
+                });
+        }
+
+        [Fact]
+        public async Task TryGetExcerptInternalAsync_MultiLine_Boundaries_CanClassifyCSharp()
+        {
+            // Arrange
+            var (sourceText, primarySpan) = CreateText(@"@{ var |foo| = ""Hello, World!""; }");
+
+            var (primary, secondary) = Initialize(sourceText);
+            var service = CreateExcerptService(primary);
+
+            var secondarySpan = await GetSecondarySpanAsync(primary, primarySpan, secondary);
+
+            // Act
+            var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, ExcerptModeInternal.Tooltip, CancellationToken.None);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Equal(secondarySpan, result.Value.Span);
+            Assert.Same(secondary, result.Value.Document);
+
+            // Verifies that the right part of the primary document will be highlighted.
+            Assert.Equal(
+                (await secondary.GetTextAsync()).GetSubText(secondarySpan).ToString(),
+                result.Value.Content.GetSubText(result.Value.MappedSpan).ToString(),
+                ignoreLineEndingDifferences: true);
+
+            Assert.Equal(
+@"@{ var foo = ""Hello, World!""; }",
+                result.Value.Content.ToString(), ignoreLineEndingDifferences: true);
+
+            Assert.Collection(
+                result.Value.ClassifiedSpans,
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal("@{", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Keyword, c.ClassificationType);
+                    Assert.Equal("var", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.LocalName, c.ClassificationType);
+                    Assert.Equal("foo", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Operator, c.ClassificationType);
+                    Assert.Equal("=", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.StringLiteral, c.ClassificationType);
+                    Assert.Equal("\"Hello, World!\"", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Punctuation, c.ClassificationType);
+                    Assert.Equal(";", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                },
+                c =>
+                {
+                    Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                    Assert.Equal("}", result.Value.Content.GetSubText(c.TextSpan).ToString());
+                });
+        }
+
+        public (SourceText sourceText, TextSpan span) CreateText(string text)
+        {
+            // Since we're using positions, normalize to Windows style
+            text = text.Replace("\r", "").Replace("\n", "\r\n");
+
+            var start = text.IndexOf('|');
+            var length = text.IndexOf('|', start + 1) - start - 1;
+            text = text.Replace("|", "");
+
+            if (start < 0 || length < 0)
+            {
+                throw new InvalidOperationException("Could not find delimited text.");
+            }
+
+            return (SourceText.From(text), new TextSpan(start, length));
+        }
+
+        // Adds the text to a ProjectSnapshot, generates code, and updates the workspace.
+        private (DocumentSnapshot primary, Document secondary) Initialize(SourceText sourceText)
+        {
+            var project = new DefaultProjectSnapshot(
+                ProjectState.Create(Workspace.Services, HostProject)
+                .WithAddedHostDocument(HostDocument, () =>
+                {
+                    return Task.FromResult(TextAndVersion.Create(sourceText, VersionStamp.Create()));
+                }));
+
+            var primary = project.GetDocument(HostDocument.FilePath);
+
+            var solution = Workspace.CurrentSolution.AddProject(ProjectInfo.Create(
+                ProjectId.CreateNewId(Path.GetFileNameWithoutExtension(HostDocument.FilePath)),
+                VersionStamp.Create(),
+                Path.GetFileNameWithoutExtension(HostDocument.FilePath),
+                Path.GetFileNameWithoutExtension(HostDocument.FilePath),
+                LanguageNames.CSharp,
+                HostDocument.FilePath));
+
+            solution = solution.AddDocument(
+                DocumentId.CreateNewId(solution.ProjectIds.Single(), HostDocument.FilePath),
+                HostDocument.FilePath,
+                new GeneratedOutputTextLoader(primary, HostDocument.FilePath));
+
+            var secondary = solution.Projects.Single().Documents.Single();
+            return (primary, secondary);
+        }
+
+        // Maps a span in the primary buffer to the secondary buffer. This is only valid for C# code
+        // that appears in the primary buffer.
+        private async Task<TextSpan> GetSecondarySpanAsync(DocumentSnapshot primary, TextSpan primarySpan, Document secondary)
+        {
+            var output = await primary.GetGeneratedOutputAsync();
+
+            var mappings = output.GetCSharpDocument().SourceMappings;
+            for (var i = 0; i < mappings.Count; i++)
+            {
+                var mapping = mappings[i];
+                if (mapping.OriginalSpan.AsTextSpan().Contains(primarySpan))
+                {
+                    var offset = mapping.GeneratedSpan.AbsoluteIndex - mapping.OriginalSpan.AbsoluteIndex;
+                    var secondarySpan = new TextSpan(primarySpan.Start + offset, primarySpan.Length);
+                    Assert.Equal(
+                        (await primary.GetTextAsync()).GetSubText(primarySpan).ToString(),
+                        (await secondary.GetTextAsync()).GetSubText(secondarySpan).ToString());
+                    return secondarySpan;
+                }
+            }
+
+            throw new InvalidOperationException("Could not map the primary span to the generated code.");
+        }
+
+        private RazorDocumentExcerptService CreateExcerptService(DocumentSnapshot document)
+        {
+            return new RazorDocumentExcerptService(document, new RazorSpanMappingService(document));
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/RazorSpanMappingServiceTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/RazorSpanMappingServiceTest.cs
new file mode 100644
index 0000000000..f2153325f4
--- /dev/null
+++ b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/RazorSpanMappingServiceTest.cs
@@ -0,0 +1,164 @@
+// 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.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+using Microsoft.CodeAnalysis.Text;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public class RazorSpanMappingServiceTest : WorkspaceTestBase
+    {
+        public RazorSpanMappingServiceTest()
+        {
+            HostProject = TestProjectData.SomeProject;
+            HostDocument = TestProjectData.SomeProjectFile1;
+        }
+
+        private HostProject HostProject { get; }
+        private HostDocument HostDocument { get; }
+
+        protected override void ConfigureLanguageServices(List<ILanguageService> services)
+        {
+            services.Add(new TestTagHelperResolver());
+        }
+
+        [Fact]
+        public async Task TryGetLinePositionSpan_SpanMatchesSourceMapping_ReturnsTrue()
+        {
+            // Arrange
+            var sourceText = SourceText.From(@"
+@SomeProperty
+");
+
+            var project = new DefaultProjectSnapshot(
+                ProjectState.Create(Workspace.Services, HostProject)
+                .WithAddedHostDocument(HostDocument, () =>
+                {
+                    return Task.FromResult(TextAndVersion.Create(sourceText, VersionStamp.Create()));
+                }));
+
+            var document = project.GetDocument(HostDocument.FilePath);
+            var service = new RazorSpanMappingService(document);
+
+            var output = await document.GetGeneratedOutputAsync();
+            var generated = output.GetCSharpDocument();
+
+            var symbol = "SomeProperty";
+            var span = new TextSpan(generated.GeneratedCode.IndexOf(symbol), symbol.Length);
+
+            // Act
+            var result = RazorSpanMappingService.TryGetLinePositionSpan(span, await document.GetTextAsync(), generated, out var mapped);
+            
+            // Assert
+            Assert.True(result);
+            Assert.Equal(new LinePositionSpan(new LinePosition(1, 1), new LinePosition(1, 13)), mapped);
+        }
+
+        [Fact]
+        public async Task TryGetLinePositionSpan_SpanMatchesSourceMappingAndPosition_ReturnsTrue()
+        {
+            // Arrange
+            var sourceText = SourceText.From(@"
+@SomeProperty
+@SomeProperty
+@SomeProperty
+");
+
+            var project = new DefaultProjectSnapshot(
+                ProjectState.Create(Workspace.Services, HostProject)
+                .WithAddedHostDocument(HostDocument, () =>
+                {
+                    return Task.FromResult(TextAndVersion.Create(sourceText, VersionStamp.Create()));
+                }));
+
+            var document = project.GetDocument(HostDocument.FilePath);
+            var service = new RazorSpanMappingService(document);
+
+            var output = await document.GetGeneratedOutputAsync();
+            var generated = output.GetCSharpDocument();
+
+            var symbol = "SomeProperty";
+            // Second occurrence
+            var span = new TextSpan(generated.GeneratedCode.IndexOf(symbol, generated.GeneratedCode.IndexOf(symbol) + symbol.Length), symbol.Length);
+
+            // Act
+            var result = RazorSpanMappingService.TryGetLinePositionSpan(span, await document.GetTextAsync(), generated, out var mapped);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(new LinePositionSpan(new LinePosition(2, 1), new LinePosition(2, 13)), mapped);
+        }
+
+        [Fact]
+        public async Task TryGetLinePositionSpan_SpanWithinSourceMapping_ReturnsTrue()
+        {
+            // Arrange
+            var sourceText = SourceText.From(@"
+@{
+    var x = SomeClass.SomeProperty;
+}
+");
+
+            var project = new DefaultProjectSnapshot(
+                ProjectState.Create(Workspace.Services, HostProject)
+                .WithAddedHostDocument(HostDocument, () =>
+                {
+                    return Task.FromResult(TextAndVersion.Create(sourceText, VersionStamp.Create()));
+                }));
+
+            var document = project.GetDocument(HostDocument.FilePath);
+            var service = new RazorSpanMappingService(document);
+
+            var output = await document.GetGeneratedOutputAsync();
+            var generated = output.GetCSharpDocument();
+
+            var symbol = "SomeProperty";
+            var span = new TextSpan(generated.GeneratedCode.IndexOf(symbol), symbol.Length);
+
+            // Act
+            var result = RazorSpanMappingService.TryGetLinePositionSpan(span, await document.GetTextAsync(), generated, out var mapped);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(new LinePositionSpan(new LinePosition(2, 22), new LinePosition(2, 34)), mapped);
+        }
+
+        [Fact]
+        public async Task TryGetLinePositionSpan_SpanOutsideSourceMapping_ReturnsFalse()
+        {
+            // Arrange
+            var sourceText = SourceText.From(@"
+@{
+    var x = SomeClass.SomeProperty;
+}
+");
+
+            var project = new DefaultProjectSnapshot(
+                ProjectState.Create(Workspace.Services, HostProject)
+                .WithAddedHostDocument(HostDocument, () =>
+                {
+                    return Task.FromResult(TextAndVersion.Create(sourceText, VersionStamp.Create()));
+                }));
+
+            var document = project.GetDocument(HostDocument.FilePath);
+            var service = new RazorSpanMappingService(document);
+
+            var output = await document.GetGeneratedOutputAsync();
+            var generated = output.GetCSharpDocument();
+
+            var symbol = "ExecuteAsync";
+            var span = new TextSpan(generated.GeneratedCode.IndexOf(symbol), symbol.Length);
+
+            // Act
+            var result = RazorSpanMappingService.TryGetLinePositionSpan(span, await document.GetTextAsync(), generated, out var mapped);
+
+            // Assert
+            Assert.False(result);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestImportProjectFeature.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestImportProjectFeature.cs
new file mode 100644
index 0000000000..3a00772223
--- /dev/null
+++ b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestImportProjectFeature.cs
@@ -0,0 +1,32 @@
+// 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;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class TestImportProjectFeature : RazorProjectEngineFeatureBase, IImportProjectFeature
+    {
+        public IReadOnlyList<RazorProjectItem> GetImports(RazorProjectItem projectItem)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            var imports = new List<RazorProjectItem>();
+            AddHierarchicalImports(projectItem, imports);
+
+            return imports;
+        }
+
+        private void AddHierarchicalImports(RazorProjectItem projectItem, List<RazorProjectItem> imports)
+        {
+            // We want items in descending order. FindHierarchicalItems returns items in ascending order.
+            var importProjectItems = ProjectEngine.FileSystem.FindHierarchicalItems(projectItem.FilePath, "_Imports.cshtml").Reverse();
+            imports.AddRange(importProjectItems);
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestProjectData.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestProjectData.cs
new file mode 100644
index 0000000000..1f7182900a
--- /dev/null
+++ b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestProjectData.cs
@@ -0,0 +1,56 @@
+// 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.IO;
+using System.Runtime.InteropServices;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    // Used to abstract away platform-specific file/directory path information.
+    //
+    // The System.IO.Path methods don't processes Windows paths in a Windows way 
+    // on *nix (rightly so), so we need to use platform-specific paths.
+    //
+    // Target paths are always Windows style.
+    internal static class TestProjectData
+    {
+        static TestProjectData()
+        {
+            var baseDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "c:\\users\\example\\src" : "/home/example";
+
+            SomeProject = new HostProject(Path.Combine(baseDirectory, "SomeProject", "SomeProject.csproj"), RazorConfiguration.Default);
+            SomeProjectFile1 = new HostDocument(Path.Combine(baseDirectory, "SomeProject", "File1.cshtml"), "File1.cshtml");
+            SomeProjectFile2 = new HostDocument(Path.Combine(baseDirectory, "SomeProject", "File2.cshtml"), "File2.cshtml");
+            SomeProjectImportFile = new HostDocument(Path.Combine(baseDirectory, "SomeProject", "_Imports.cshtml"), "_Imports.cshtml");
+            SomeProjectNestedFile3 = new HostDocument(Path.Combine(baseDirectory, "SomeProject", "Nested", "File3.cshtml"), "Nested\\File1.cshtml");
+            SomeProjectNestedFile4 = new HostDocument(Path.Combine(baseDirectory, "SomeProject", "Nested", "File4.cshtml"), "Nested\\File2.cshtml");
+            SomeProjectNestedImportFile = new HostDocument(Path.Combine(baseDirectory, "SomeProject", "Nested", "_Imports.cshtml"), "Nested\\_Imports.cshtml");
+
+            AnotherProject = new HostProject(Path.Combine(baseDirectory, "AnotherProject", "AnotherProject.csproj"), RazorConfiguration.Default);
+            AnotherProjectFile1 = new HostDocument(Path.Combine(baseDirectory, "AnotherProject", "File1.cshtml"), "File1.cshtml");
+            AnotherProjectFile2 = new HostDocument(Path.Combine(baseDirectory, "AnotherProject", "File2.cshtml"), "File2.cshtml");
+            AnotherProjectImportFile = new HostDocument(Path.Combine(baseDirectory, "AnotherProject", "_Imports.cshtml"), "_Imports.cshtml");
+            AnotherProjectNestedFile3 = new HostDocument(Path.Combine(baseDirectory, "AnotherProject", "Nested", "File3.cshtml"), "Nested\\File1.cshtml");
+            AnotherProjectNestedFile4 = new HostDocument(Path.Combine(baseDirectory, "AnotherProject", "Nested", "File4.cshtml"), "Nested\\File2.cshtml");
+            AnotherProjectNestedImportFile = new HostDocument(Path.Combine(baseDirectory, "AnotherProject", "Nested", "_Imports.cshtml"), "Nested\\_Imports.cshtml");
+        }
+
+        public static readonly HostProject SomeProject;
+        public static readonly HostDocument SomeProjectFile1;
+        public static readonly HostDocument SomeProjectFile2;
+        public static readonly HostDocument SomeProjectImportFile;
+        public static readonly HostDocument SomeProjectNestedFile3;
+        public static readonly HostDocument SomeProjectNestedFile4;
+        public static readonly HostDocument SomeProjectNestedImportFile;
+
+        public static readonly HostProject AnotherProject;
+        public static readonly HostDocument AnotherProjectFile1;
+        public static readonly HostDocument AnotherProjectFile2;
+        public static readonly HostDocument AnotherProjectImportFile;
+        public static readonly HostDocument AnotherProjectNestedFile3;
+        public static readonly HostDocument AnotherProjectNestedFile4;
+        public static readonly HostDocument AnotherProjectNestedImportFile;
+    }
+}
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestProjectSnapshotProjectEngineFactory.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestProjectSnapshotProjectEngineFactory.cs
index fcbb5fbc3a..61d923062f 100644
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestProjectSnapshotProjectEngineFactory.cs
+++ b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestProjectSnapshotProjectEngineFactory.cs
@@ -8,11 +8,13 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 {
     internal class TestProjectSnapshotProjectEngineFactory : ProjectSnapshotProjectEngineFactory
     {
+        public Action<RazorProjectEngineBuilder> Configure { get; set; }
+
         public RazorProjectEngine Engine { get; set; }
 
-        public override RazorProjectEngine Create(ProjectSnapshot project, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure)
+        public override RazorProjectEngine Create(RazorConfiguration configuration, RazorProjectFileSystem fileSystem, Action<RazorProjectEngineBuilder> configure)
         {
-            return Engine ?? RazorProjectEngine.Create(project.Configuration, fileSystem, configure);
+            return Engine ?? RazorProjectEngine.Create(configuration, fileSystem, configure ?? Configure);
         }
 
         public override IProjectEngineFactory FindFactory(ProjectSnapshot project)
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestTagHelperResolver.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestTagHelperResolver.cs
index bc623a7163..82fccb653b 100644
--- a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestTagHelperResolver.cs
+++ b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/TestTagHelperResolver.cs
@@ -15,7 +15,7 @@ namespace Microsoft.CodeAnalysis.Razor
     {
         public TaskCompletionSource<TagHelperResolutionResult> CompletionSource { get; set; }
 
-        public IList<TagHelperDescriptor> TagHelpers { get; } = new List<TagHelperDescriptor>();
+        public IList<TagHelperDescriptor> TagHelpers { get; set; } = new List<TagHelperDescriptor>();
 
         public override Task<TagHelperResolutionResult> GetTagHelpersAsync(ProjectSnapshot project, CancellationToken cancellationToken = default)
         {
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/WorkspaceTestBase.cs b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/WorkspaceTestBase.cs
new file mode 100644
index 0000000000..0608261af0
--- /dev/null
+++ b/src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Shared/WorkspaceTestBase.cs
@@ -0,0 +1,79 @@
+// 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.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    public abstract class WorkspaceTestBase
+    {
+        private bool _initialized;
+        private HostServices _hostServices;
+        private Workspace _workspace;
+
+        protected WorkspaceTestBase()
+        {
+        }
+
+        protected HostServices HostServices
+        {
+            get
+            {
+                EnsureInitialized();
+                return _hostServices;
+            }
+        }
+
+        protected Workspace Workspace
+        {
+            get
+            {
+                EnsureInitialized();
+                return _workspace;
+            }
+        }
+        
+        protected virtual void ConfigureWorkspaceServices(List<IWorkspaceService> services)
+        {
+        }
+
+        protected virtual void ConfigureLanguageServices(List<ILanguageService> services)
+        {
+        }
+
+        protected virtual void ConfigureWorkspace(AdhocWorkspace workspace)
+        {
+        }
+
+        protected virtual void ConfigureProjectEngine(RazorProjectEngineBuilder builder)
+        {
+        }
+
+        private void EnsureInitialized()
+        {
+            if (_initialized)
+            {
+                return;
+            }
+
+            var workspaceServices = new List<IWorkspaceService>()
+            {
+                new TestProjectSnapshotProjectEngineFactory()
+                {
+                    Configure = ConfigureProjectEngine,
+                },
+            };
+            ConfigureWorkspaceServices(workspaceServices);
+
+            var languageServices = new List<ILanguageService>();
+            ConfigureLanguageServices(languageServices);
+
+            _hostServices = TestServices.Create(workspaceServices, languageServices);
+            _workspace = TestWorkspace.Create(_hostServices, ConfigureWorkspace);
+            _initialized = true;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/BuildVariables.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/BuildVariables.cs
similarity index 65%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/BuildVariables.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/BuildVariables.cs
index 7c6900f9b5..00e8491e1f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/BuildVariables.cs
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/BuildVariables.cs
@@ -6,8 +6,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
     internal static partial class BuildVariables
     {
         private static string _msBuildPath = string.Empty;
-        private static string _microsoftNETCoreAppPackageVersion = string.Empty;
-        private static string _netStandardLibraryPackageVersion = string.Empty;
+        private static string _microsoftNETCoreApp30PackageVersion = string.Empty;
+        private static string _netStandardLibrary20PackageVersion = string.Empty;
 
         static partial void InitializeVariables();
 
@@ -20,21 +20,21 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
-        public static string MicrosoftNETCoreAppPackageVersion
+        public static string MicrosoftNETCoreApp30PackageVersion
         {
             get
             {
                 InitializeVariables();
-                return _microsoftNETCoreAppPackageVersion;
+                return _microsoftNETCoreApp30PackageVersion;
             }
         }
 
-        public static string NETStandardLibraryPackageVersion
+        public static string NETStandardLibrary20PackageVersion
         {
             get
             {
                 InitializeVariables();
-                return _netStandardLibraryPackageVersion;
+                return _netStandardLibrary20PackageVersion;
             }
         }
     }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/BuildVariables.cs.template b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/BuildVariables.cs.template
similarity index 69%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/BuildVariables.cs.template
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/BuildVariables.cs.template
index 128f1c90bd..4b0b995bc6 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/BuildVariables.cs.template
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/BuildVariables.cs.template
@@ -8,8 +8,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         static partial void InitializeVariables()
         {
             _msBuildPath = @"${MSBuildLocation}";
-            _microsoftNETCoreAppPackageVersion = "${MicrosoftNETCoreAppPackageVersion}";
-            _netStandardLibraryPackageVersion = "${NETStandardLibraryPackageVersion}";
+            _microsoftNETCoreApp30PackageVersion = "${MicrosoftNETCoreApp30PackageVersion}";
+            _netStandardLibrary20PackageVersion = "${NETStandardLibrary20PackageVersion}";
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/Assert.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/Assert.cs
similarity index 95%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/Assert.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/Assert.cs
index 4d3d035e3b..273c90ddda 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/Assert.cs
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/Assert.cs
@@ -4,6 +4,9 @@
 using System;
 using System.IO;
 using System.IO.Compression;
+using System.Linq;
+using System.Reflection.Metadata;
+using System.Reflection.PortableExecutable;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -186,7 +189,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             filePath = Path.Combine(result.Project.DirectoryPath, filePath);
             FileExists(result, filePath);
-            
+
             var lines = File.ReadAllLines(filePath);
             for (var i = 0; i < lines.Length; i++)
             {
@@ -373,6 +376,28 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
+        public static void AssemblyContainsType(MSBuildResult result, string assemblyPath, string fullTypeName)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            assemblyPath = Path.Combine(result.Project.DirectoryPath, Path.Combine(assemblyPath));
+            using (var file = File.OpenRead(assemblyPath))
+            {
+                var peReader = new PEReader(file);
+                var metadataReader = peReader.GetMetadataReader();
+                var typeNames = metadataReader.TypeDefinitions.Where(t => !t.IsNil).Select(t =>
+                {
+                    var type = metadataReader.GetTypeDefinition(t);
+                    return metadataReader.GetString(type.Namespace) + "." + metadataReader.GetString(type.Name);
+                });
+
+                Assert.Contains(fullTypeName, typeNames);
+            }
+        }
+
         private abstract class MSBuildXunitException : Xunit.Sdk.XunitException
         {
             protected MSBuildXunitException(MSBuildResult result)
@@ -651,7 +676,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             {
                 get
                 {
-                    return 
+                    return
                         $"nuspec: '{FilePath}' did not contain the expected content." + Environment.NewLine +
                         Environment.NewLine +
                         $"expected: {Expected}" + Environment.NewLine +
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildIncrementalismTest.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildIncrementalismTest.cs
similarity index 59%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildIncrementalismTest.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildIncrementalismTest.cs
index 4e7bc9f8e5..074e3083e4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildIncrementalismTest.cs
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildIncrementalismTest.cs
@@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var result = await DotnetMSBuild("Build");
             var file = Path.Combine(Project.DirectoryPath, "SimpleTagHelper.cs");
             var tagHelperOutputCache = Path.Combine(IntermediateOutputPath, "SimpleMvc.TagHelpers.output.cache");
-            var generatedFile = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.g.cshtml.cs");
+            var generatedFile = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
 
             // Assert - 1
             Assert.BuildPassed(result);
@@ -133,6 +133,152 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
+        [Fact]
+        [InitializeTestProject("MvcWithComponents")]
+        public async Task BuildComponents_ErrorInGeneratedCode_ReportsMSBuildError_OnIncrementalBuild()
+        {
+            // Introducing a Razor semantic error
+            ReplaceContent("@{ // Unterminated code block", "Views", "Shared", "NavMenu.razor");
+
+            // Regular build
+            await VerifyError();
+
+            // Incremental build
+            await VerifyError();
+
+            async Task VerifyError()
+            {
+                var result = await DotnetMSBuild("Build");
+
+                Assert.BuildFailed(result);
+
+                // This needs to be relative path. Tracked by https://github.com/aspnet/Razor/issues/2187.
+                var filePath = Path.Combine(Project.DirectoryPath, "Views", "Shared", "NavMenu.razor");
+                var location = filePath + "(1,2)";
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                {
+                    // Absolute paths on OSX don't work well.
+                    location = null;
+                }
+
+                Assert.BuildError(result, "RZ1006", location: location);
+
+                // Compilation failed without creating the views assembly
+                Assert.FileDoesNotExist(result, IntermediateOutputPath, "MvcWithComponents.dll");
+                Assert.FileDoesNotExist(result, IntermediateOutputPath, "MvcWithComponents.Views.dll");
+
+                // File with error does not get written to disk.
+                Assert.FileDoesNotExist(result, IntermediateOutputPath, "RazorComponents", "Views", "Shared", "NavMenu.razor.g.cs");
+            }
+        }
+
+        [Fact]
+        [InitializeTestProject("MvcWithComponents")]
+        public async Task BuildComponents_RegeneratesComponentDefinition_WhenFilesChange()
+        {
+            // Act - 1
+            var tagHelperOutputCache = Path.Combine(IntermediateOutputPath, "MvcWithComponents.TagHelpers.output.cache");
+
+            var generatedFile = Path.Combine(RazorIntermediateOutputPath, "Views", "Shared", "NavMenu.razor.g.cs");
+            var generatedDefinitionFile = Path.Combine(RazorComponentIntermediateOutputPath, "Views", "Shared", "NavMenu.razor.g.cs");
+
+            // Assert - 1
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+            var outputFile = Path.Combine(OutputPath, "MvcWithComponents.dll");
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.dll");
+            var outputAssemblyThumbprint = GetThumbPrint(outputFile);
+
+            Assert.FileExists(result, generatedDefinitionFile);
+            var generatedDefinitionThumbprint = GetThumbPrint(generatedDefinitionFile);
+            Assert.FileExists(result, generatedFile);
+            var generatedFileThumbprint = GetThumbPrint(generatedFile);
+
+            Assert.FileExists(result, tagHelperOutputCache);
+            Assert.FileContains(
+                result,
+                tagHelperOutputCache,
+                @"""Name"":""MvcWithComponents.Views.Shared.NavMenu""");
+
+            var definitionThumbprint = GetThumbPrint(tagHelperOutputCache);
+
+            // Act - 2
+            ReplaceContent("Different things", "Views", "Shared", "NavMenu.razor");
+            result = await DotnetMSBuild("Build");
+
+            // Assert - 2
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.dll");
+            Assert.NotEqual(outputAssemblyThumbprint, GetThumbPrint(outputFile));
+
+            Assert.FileExists(result, generatedDefinitionFile);
+            Assert.NotEqual(generatedDefinitionThumbprint, GetThumbPrint(generatedDefinitionFile));
+            Assert.FileExists(result, generatedFile);
+            Assert.NotEqual(generatedFileThumbprint, GetThumbPrint(generatedFile));
+
+            Assert.FileExists(result, tagHelperOutputCache);
+            Assert.FileContains(
+                result,
+                tagHelperOutputCache,
+                @"""Name"":""MvcWithComponents.Views.Shared.NavMenu""");
+
+            // TODO:
+            Assert.Equal(definitionThumbprint, GetThumbPrint(tagHelperOutputCache));
+        }
+
+        [Fact]
+        [InitializeTestProject("MvcWithComponents")]
+        public async Task BuildComponents_DoesNotModifyFiles_IfFilesDoNotChange()
+        {
+            // Act - 1
+            var tagHelperOutputCache = Path.Combine(IntermediateOutputPath, "MvcWithComponents.TagHelpers.output.cache");
+
+            var file = Path.Combine(Project.DirectoryPath, "Views", "Shared", "NavMenu.razor.g.cs");
+            var generatedFile = Path.Combine(RazorIntermediateOutputPath, "Views", "Shared", "NavMenu.razor.g.cs");
+            var generatedDefinitionFile = Path.Combine(RazorComponentIntermediateOutputPath, "Views", "Shared", "NavMenu.razor.g.cs");
+
+            // Assert - 1
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+            var outputFile = Path.Combine(OutputPath, "MvcWithComponents.dll");
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.dll");
+            var outputAssemblyThumbprint = GetThumbPrint(outputFile);
+
+            Assert.FileExists(result, generatedDefinitionFile);
+            var generatedDefinitionThumbprint = GetThumbPrint(generatedDefinitionFile);
+            Assert.FileExists(result, generatedFile);
+            var generatedFileThumbprint = GetThumbPrint(generatedFile);
+
+            Assert.FileExists(result, tagHelperOutputCache);
+            Assert.FileContains(
+                result,
+                tagHelperOutputCache,
+                @"""Name"":""MvcWithComponents.Views.Shared.NavMenu""");
+
+            var definitionThumbprint = GetThumbPrint(tagHelperOutputCache);
+
+            // Act - 2
+            result = await DotnetMSBuild("Build");
+
+            // Assert - 2
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.dll");
+            Assert.Equal(outputAssemblyThumbprint, GetThumbPrint(outputFile));
+
+            Assert.FileExists(result, generatedDefinitionFile);
+            Assert.Equal(generatedDefinitionThumbprint, GetThumbPrint(generatedDefinitionFile));
+            Assert.FileExists(result, generatedFile);
+            Assert.Equal(generatedFileThumbprint, GetThumbPrint(generatedFile));
+
+            Assert.FileExists(result, tagHelperOutputCache);
+            Assert.FileContains(
+                result,
+                tagHelperOutputCache,
+                @"""Name"":""MvcWithComponents.Views.Shared.NavMenu""");
+
+            Assert.Equal(definitionThumbprint, GetThumbPrint(tagHelperOutputCache));
+        }
+
         [Fact]
         [InitializeTestProject("AppWithP2PReference", additionalProjects: "ClassLibrary")]
         public async Task IncrementalBuild_WithP2P_WorksWhenBuildProjectReferencesIsDisabled()
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildIntegrationTest.cs
similarity index 93%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildIntegrationTest.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildIntegrationTest.cs
index 66603a31b1..564b8b2745 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildIntegrationTest.cs
@@ -6,6 +6,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.DependencyModel;
 using Xunit;
@@ -614,6 +615,63 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.Equal(firstAssemblyBytes, secondAssemblyBytes);
         }
 
+        [Fact]
+        [InitializeTestProject("SimpleMvc21")]
+        public async Task Building_NETCoreApp21TargetingProject()
+        {
+            TargetFramework = "netcoreapp2.1";
+
+            // Build
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.pdb");
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc21")]
+        public async Task Building_WorksWhenMultipleRazorConfigurationsArePresent()
+        {
+            TargetFramework = "netcoreapp2.1";
+            AddProjectFileContent(@"
+<ItemGroup>
+    <RazorConfiguration Include=""MVC-2.1"">
+      <Extensions>MVC-2.1;$(CustomRazorExtension)</Extensions>
+    </RazorConfiguration>
+</ItemGroup>");
+
+            // Build
+            var result = await DotnetMSBuild("Build");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.pdb");
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.dll");
+            Assert.FileExists(result, OutputPath, "SimpleMvc21.Views.pdb");
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task Build_WithoutServer_ErrorDuringBuild_DisplaysErrorInMsBuildOutput()
+        {
+            var result = await DotnetMSBuild(
+                "Build",
+                "/p:UseRazorBuildServer=false /p:RazorLangVersion=5.0",
+                suppressBuildServer: true);
+
+            Assert.BuildFailed(result);
+            Assert.BuildOutputContainsLine(
+                result,
+                $"Invalid option 5.0 for Razor language version --version; must be Latest or a valid version in range {RazorLanguageVersion.Version_1_0} to {RazorLanguageVersion.Latest}.");
+
+            // Compilation failed without creating the views assembly
+            Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.dll");
+            Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
+        }
+
         private static DependencyContext ReadDependencyContext(string depsFilePath)
         {
             var reader = new DependencyContextJsonReader();
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildIntrospectionTest.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildIntrospectionTest.cs
similarity index 99%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildIntrospectionTest.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildIntrospectionTest.cs
index f19401a140..2c676fd8fe 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildIntrospectionTest.cs
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildIntrospectionTest.cs
@@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var result = await DotnetMSBuild("Build", "/t:_IntrospectRazorCompileItems");
 
             Assert.BuildPassed(result);
-            Assert.BuildOutputContainsLine(result, $"RazorCompile: {Path.Combine(IntermediateOutputPath, "Razor", "Views", "Home", "Index.g.cshtml.cs")}");
+            Assert.BuildOutputContainsLine(result, $"RazorCompile: {Path.Combine(IntermediateOutputPath, "Razor", "Views", "Home", "Index.cshtml.g.cs")}");
             Assert.BuildOutputContainsLine(result, $"RazorCompile: {Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorTargetAssemblyInfo.cs")}");
         }
 
diff --git a/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildPerformanceTest.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildPerformanceTest.cs
new file mode 100644
index 0000000000..67462d9c4c
--- /dev/null
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildPerformanceTest.cs
@@ -0,0 +1,109 @@
+// 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;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class BuildPerformanceTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
+    {
+        public BuildPerformanceTest(BuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        [Fact]
+        [InitializeTestProject("SimpleMvc")]
+        public async Task BuildMvcApp()
+        {
+            var result = await DotnetMSBuild(target: default, args: "/clp:PerformanceSummary");
+
+            Assert.BuildPassed(result);
+            var summary = ParseTaskPerformanceSummary(result.Output);
+
+            Assert.Equal(1, summary.First(f => f.Name == "RazorGenerate").Calls);
+            Assert.Equal(1, summary.First(f => f.Name == "RazorTagHelper").Calls);
+
+            // Incremental builds
+            for (var i = 0; i < 2; i++)
+            {
+                result = await DotnetMSBuild(target: default, args: "/clp:PerformanceSummary");
+
+                Assert.BuildPassed(result);
+                summary = ParseTaskPerformanceSummary(result.Output);
+
+                Assert.DoesNotContain(summary, item => item.Name == "RazorGenerate");
+                Assert.DoesNotContain(summary, item => item.Name == "RazorTagHelper");
+            }
+        }
+
+        [Fact]
+        [InitializeTestProject("MvcWithComponents")]
+        public async Task BuildMvcAppWithComponents()
+        {
+            var result = await DotnetMSBuild(target: default, args: "/clp:PerformanceSummary");
+
+            Assert.BuildPassed(result);
+            var summary = ParseTaskPerformanceSummary(result.Output);
+
+            // One for declaration build, one for the "real" code gen
+            Assert.Equal(2, summary.First(f => f.Name == "RazorGenerate").Calls);
+            Assert.Equal(1, summary.First(f => f.Name == "RazorTagHelper").Calls);
+
+            // Incremental builds
+            for (var i = 0; i < 2; i++)
+            {
+                result = await DotnetMSBuild(target: default, args: "/clp:PerformanceSummary");
+
+                Assert.BuildPassed(result);
+                summary = ParseTaskPerformanceSummary(result.Output);
+
+                Assert.DoesNotContain(summary, item => item.Name == "RazorGenerate");
+                Assert.DoesNotContain(summary, item => item.Name == "RazorTagHelper");
+            }
+        }
+
+        private List<PerformanceSummaryEntry> ParseTaskPerformanceSummary(string output)
+        {
+            const string Header = "Task Performance Summary:";
+            var lines = output.Split(Environment.NewLine);
+            var taskSection = Array.LastIndexOf(lines, Header);
+            Assert.True(taskSection != -1, $"Could not find line ${Header} in {output}");
+
+            var entries = new List<PerformanceSummaryEntry>();
+            // 6 ms  FindAppConfigFile                          4 calls
+            var matcher = new Regex(@"\s+(?<time>\w+) ms\s+(?<name>\w+)\s+(?<calls>\d+) calls");
+            for (var i = taskSection + 1; i < lines.Length; i++)
+            {
+                if (string.IsNullOrWhiteSpace(lines[i]))
+                {
+                    continue;
+                }
+
+                var match = matcher.Match(lines[i]);
+                Assert.True(match.Success, $"Line {lines[i]} did not match.");
+
+                var entry = new PerformanceSummaryEntry
+                {
+                    Name = match.Groups["name"].Value,
+                    Calls = int.Parse(match.Groups["calls"].Value),
+                };
+                entries.Add(entry);
+            }
+
+            return entries;
+        }
+
+        private class PerformanceSummaryEntry
+        {
+            public string Name { get; set; }
+
+            public int Calls { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildServerIntegrationTest.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildServerIntegrationTest.cs
similarity index 88%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildServerIntegrationTest.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildServerIntegrationTest.cs
index 4de9dfca4b..30330b0a5f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildServerIntegrationTest.cs
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildServerIntegrationTest.cs
@@ -1,17 +1,12 @@
 // 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;
 using System.Diagnostics;
 using System.IO;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Tools;
 using Microsoft.AspNetCore.Testing;
 using Microsoft.AspNetCore.Testing.xunit;
-using Microsoft.CodeAnalysis;
-using Moq;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
@@ -40,7 +35,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         private async Task Build_SimpleMvc_CanBuildSuccessfully(MSBuildProcessKind msBuildProcessKind)
         {
             var result = await DotnetMSBuild(
-                "Build", 
+                "Build",
                 "/p:_RazorForceBuildServer=true",
                 msBuildProcessKind: msBuildProcessKind);
 
@@ -93,7 +88,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.FileExists(result, IntermediateOutputPath, "Whitespace in name.Views.dll");
             Assert.FileExists(result, IntermediateOutputPath, "Whitespace in name.RazorCoreGenerate.cache");
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "Index.g.cshtml.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
         }
 
         [Fact]
@@ -114,7 +109,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/Razor/issues/2723")]
         [InitializeTestProject("SimpleMvc")]
         public async Task Build_ServerConnectionMutexCreationFails_FallsBackToInProcessRzc()
         {
@@ -231,6 +226,35 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
+        [Fact]
+        [InitializeTestProject("MvcWithComponents")]
+        public async Task Build_MvcWithComponents()
+        {
+            var tagHelperOutputCacheFile = Path.Combine(IntermediateOutputPath, "MvcWithComponents.TagHelpers.output.cache");
+
+            var result = await DotnetMSBuild(
+                "Build",
+                "/p:_RazorForceBuildServer=true");
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.dll");
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.pdb");
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.Views.dll");
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.Views.pdb");
+
+            // Verify tag helper discovery from components work
+            Assert.FileExists(result, tagHelperOutputCacheFile);
+            Assert.FileContains(
+                result,
+                tagHelperOutputCacheFile,
+                @"""Name"":""MvcWithComponents.TestComponent""");
+
+            Assert.FileContains(
+                result,
+                tagHelperOutputCacheFile,
+                @"""Name"":""MvcWithComponents.Views.Shared.NavMenu""");
+        }
+
         private class TestProjectDirectory : ProjectDirectory
         {
             public TestProjectDirectory(string solutionPath, string directoryPath, string projectFilePath)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildServerTestFixture.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildServerTestFixture.cs
similarity index 100%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildServerTestFixture.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildServerTestFixture.cs
diff --git a/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildWithComponentsIntegrationTest.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
new file mode 100644
index 0000000000..a12945f1f0
--- /dev/null
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
@@ -0,0 +1,41 @@
+// 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.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
+{
+    public class BuildWithComponentsIntegrationTest : MSBuildIntegrationTestBase, IClassFixture<BuildServerTestFixture>
+    {
+        public BuildWithComponentsIntegrationTest(BuildServerTestFixture buildServer)
+            : base(buildServer)
+        {
+        }
+
+        [Fact]
+        [InitializeTestProject("MvcWithComponents")]
+        public Task Build_Components_WithDotNetCoreMSBuild_Works() => Build_ComponentsWorks(MSBuildProcessKind.Dotnet);
+
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
+        [InitializeTestProject("MvcWithComponents")]
+        public Task Build_Components_WithDesktopMSBuild_Works() => Build_ComponentsWorks(MSBuildProcessKind.Desktop);
+
+        private async Task Build_ComponentsWorks(MSBuildProcessKind msBuildProcessKind)
+        {
+            var result = await DotnetMSBuild("Build", msBuildProcessKind: msBuildProcessKind);
+
+            Assert.BuildPassed(result);
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.dll");
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.pdb");
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.Views.dll");
+            Assert.FileExists(result, OutputPath, "MvcWithComponents.Views.pdb");
+
+            Assert.AssemblyContainsType(result, Path.Combine(OutputPath, "MvcWithComponents.dll"), "MvcWithComponents.TestComponent");
+            Assert.AssemblyContainsType(result, Path.Combine(OutputPath, "MvcWithComponents.dll"), "MvcWithComponents.Views.Shared.NavMenu");
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs
similarity index 90%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs
index f16fd78289..183627bd2c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs
@@ -30,15 +30,15 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileContainsLine(
                 result,
                 razorAssemblyInfo,
-                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorLanguageVersionAttribute(\"2.1\")]");
+                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorLanguageVersionAttribute(\"3.0\")]");
             Assert.FileContainsLine(
                 result,
                 razorAssemblyInfo,
-                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute(\"MVC-2.1\")]");
+                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute(\"MVC-3.0\")]");
             Assert.FileContainsLine(
                 result,
                 razorAssemblyInfo,
-                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorExtensionAssemblyNameAttribute(\"MVC-2.1\", \"Microsoft.AspNetCore.Mvc.Razor.Extensions\")]");
+                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorExtensionAssemblyNameAttribute(\"MVC-3.0\", \"Microsoft.AspNetCore.Mvc.Razor.Extensions\")]");
         }
 
         [Fact]
@@ -57,15 +57,15 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotContainLine(
                 result,
                 razorAssemblyInfo,
-                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorLanguageVersionAttribute(\"2.1\")]");
+                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorLanguageVersionAttribute(\"3.0\")]");
             Assert.FileDoesNotContainLine(
                 result,
                 razorAssemblyInfo,
-                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute(\"MVC-2.1\")]");
+                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute(\"MVC-3.0\")]");
             Assert.FileDoesNotContainLine(
                 result,
                 razorAssemblyInfo,
-                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorExtensionAssemblyNameAttribute(\"MVC-2.1\", \"Microsoft.AspNetCore.Razor.Extensions\")]");
+                "[assembly: Microsoft.AspNetCore.Razor.Hosting.RazorExtensionAssemblyNameAttribute(\"MVC-3.0\", \"Microsoft.AspNetCore.Razor.Extensions\")]");
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/DesignTimeBuildIntegrationTest.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
similarity index 94%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
index c8fce36363..6514e73057 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
@@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.pdb");
             Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.Views.dll");
             Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.Views.pdb");
-            
+
             // This target should be part of the design time build.
             Assert.Contains("RazorGetAssemblyAttributes", result.Output);
 
@@ -56,12 +56,12 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Path.Combine("Views", "_ViewImports.cshtml"),
                 Path.Combine("Views", "_ViewStart.cshtml"),
             };
-            
+
             foreach (var filePath in filePaths)
             {
                 Assert.BuildOutputContainsLine(
-                    result, 
-                    $@"RazorGenerateWithTargetPath: {filePath} {filePath} {Path.Combine(RazorIntermediateOutputPath, Path.ChangeExtension(filePath, ".g.cshtml.cs"))}");
+                    result,
+                    $@"RazorGenerateWithTargetPath: {filePath} {filePath} {Path.Combine(RazorIntermediateOutputPath, filePath + ".g.cs")}");
             }
         }
     }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/FIleThumbPrint.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/FIleThumbPrint.cs
similarity index 98%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/FIleThumbPrint.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/FIleThumbPrint.cs
index 36e204de0e..0266ecdd1b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/FIleThumbPrint.cs
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/FIleThumbPrint.cs
@@ -38,7 +38,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
         public bool Equals(FileThumbPrint other)
         {
-            return 
+            return
                 string.Equals(Path, other.Path, StringComparison.Ordinal) &&
                 LastWriteTimeUtc == other.LastWriteTimeUtc &&
                 string.Equals(Hash, other.Hash, StringComparison.Ordinal);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/InitializeTestProjectAttribute.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/InitializeTestProjectAttribute.cs
similarity index 99%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/InitializeTestProjectAttribute.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/InitializeTestProjectAttribute.cs
index bcd954bb55..f04a14c449 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/InitializeTestProjectAttribute.cs
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/InitializeTestProjectAttribute.cs
@@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
 
             MSBuildIntegrationTestBase.Project = ProjectDirectory.Create(_originalProjectName, _testProjectName, _baseDirectory, _additionalProjects, _language);
-            MSBuildIntegrationTestBase.TargetFramework = _originalProjectName.StartsWith("ClassLibrary") ? "netstandard2.0" : "netcoreapp2.2";
+            MSBuildIntegrationTestBase.TargetFramework = _originalProjectName.StartsWith("ClassLibrary") ? "netstandard2.0" : "netcoreapp3.0";
         }
 
         public override void After(MethodInfo methodUnderTest)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildIntegrationTestBase.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/MSBuildIntegrationTestBase.cs
similarity index 94%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildIntegrationTestBase.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/MSBuildIntegrationTestBase.cs
index 1d44f27d4b..07ffd2aa9d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildIntegrationTestBase.cs
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/MSBuildIntegrationTestBase.cs
@@ -44,6 +44,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
         protected string RazorIntermediateOutputPath => Path.Combine(IntermediateOutputPath, "Razor");
 
+        protected string RazorComponentIntermediateOutputPath => Path.Combine(IntermediateOutputPath, "RazorDeclaration");
+
         internal static string TargetFramework
         {
             get => _projectTfm.Value;
@@ -71,8 +73,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 // Let the test app know it is running as part of a test.
                 "/p:RunningAsTest=true",
 
-                $"/p:MicrosoftNETCoreAppVersion={BuildVariables.MicrosoftNETCoreAppPackageVersion}",
-                $"/p:NETStandardLibraryPackageVersion={BuildVariables.NETStandardLibraryPackageVersion}",
+                $"/p:MicrosoftNETCoreApp30PackageVersion={BuildVariables.MicrosoftNETCoreApp30PackageVersion}",
+                $"/p:NETStandardLibrary20PackageVersion={BuildVariables.NETStandardLibrary20PackageVersion}",
             };
 
             if (!suppressRestore)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildProcessKind.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/MSBuildProcessKind.cs
similarity index 100%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildProcessKind.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/MSBuildProcessKind.cs
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildProcessManager.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/MSBuildProcessManager.cs
similarity index 100%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildProcessManager.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/MSBuildProcessManager.cs
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildResult.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/MSBuildResult.cs
similarity index 98%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildResult.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/MSBuildResult.cs
index a409c06e47..d26bed720b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildResult.cs
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/MSBuildResult.cs
@@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         public string FileName { get; }
 
         public int ExitCode { get; }
-        
+
         public string Output { get; }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/PackIntegrationTest.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/PackIntegrationTest.cs
similarity index 99%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/PackIntegrationTest.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/PackIntegrationTest.cs
index e0d7b86678..3037ba3171 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/PackIntegrationTest.cs
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/PackIntegrationTest.cs
@@ -86,7 +86,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.FileExists(result, OutputPath, "ClassLibrary.dll");
             Assert.FileExists(result, OutputPath, "ClassLibrary.Views.dll");
-            
+
             if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
                 // Travis on OSX produces different full paths in C# and MSBuild
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/ProjectDirectory.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/ProjectDirectory.cs
similarity index 99%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/ProjectDirectory.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/ProjectDirectory.cs
index 7a80ce4c31..3cdb16592a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/ProjectDirectory.cs
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/ProjectDirectory.cs
@@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 CopyGlobalJson(solutionRoot, destinationPath);
 
                 return new ProjectDirectory(
-                    destinationPath, 
+                    destinationPath,
                     directoryPath,
                     newProjectFilePath);
             }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/PublishIntegrationTest.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/PublishIntegrationTest.cs
similarity index 99%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/PublishIntegrationTest.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/PublishIntegrationTest.cs
index 7e9eb1f797..7734f7dc16 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/PublishIntegrationTest.cs
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/PublishIntegrationTest.cs
@@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.BuildPassed(result);
 
-            // Everything we do should noop - including building the app. 
+            // Everything we do should noop - including building the app.
             Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
             Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
             Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.dll");
@@ -160,7 +160,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.BuildPassed(result);
 
-            // Everything we do should noop - including building the app. 
+            // Everything we do should noop - including building the app.
             Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
             Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
             Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.dll");
@@ -177,7 +177,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.BuildPassed(result);
 
-            // Everything we do should noop - including building the app. 
+            // Everything we do should noop - including building the app.
             Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll");
             Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb");
             Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.dll");
@@ -411,7 +411,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var result = await DotnetMSBuild("Publish", "/p:NoBuild=true");
 
             Assert.BuildFailed(result);
-            Assert.BuildError(result, "MSB3030"); // Could not copy the file "obj/Debug/netcoreapp2.2/SimpleMvc.dll because it couldn't be found.
+            Assert.BuildError(result, "MSB3030"); // Could not copy the file "obj/Debug/netcoreapp3.0/SimpleMvc.dll because it couldn't be found.
 
             Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.dll");
             Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.Views.dll");
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/RazorCompileIntegrationTest.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/RazorCompileIntegrationTest.cs
similarity index 98%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/RazorCompileIntegrationTest.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/RazorCompileIntegrationTest.cs
index c375b99354..c5398f0a13 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/RazorCompileIntegrationTest.cs
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/RazorCompileIntegrationTest.cs
@@ -41,7 +41,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.BuildPassed(result);
 
-            // Everything we do should noop - including building the app. 
+            // Everything we do should noop - including building the app.
             Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.dll");
             Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.pdb");
             Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
@@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         }
 
         [Fact]
-        [InitializeTestProject("SimpleMvc")] 
+        [InitializeTestProject("SimpleMvc")]
         public async Task RazorCompile_EmbedRazorGenerateSources_EmbedsCshtmlFiles()
         {
             var result = await DotnetMSBuild("RazorCompile", "/p:EmbedRazorGenerateSources=true");
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/RazorGenerateIntegrationTest.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/RazorGenerateIntegrationTest.cs
similarity index 89%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/RazorGenerateIntegrationTest.cs
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/RazorGenerateIntegrationTest.cs
index e146e9c0d0..646c21cc77 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/RazorGenerateIntegrationTest.cs
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/RazorGenerateIntegrationTest.cs
@@ -1,12 +1,10 @@
 // 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;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
@@ -40,15 +38,15 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 Path.Combine(IntermediateOutputPath, "SimpleMvc.TagHelpers.output.cache"),
                 @"""Name"":""SimpleMvc.SimpleTagHelper""");
 
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "_ViewImports.g.cshtml.cs");
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "_ViewStart.g.cshtml.cs");
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "About.g.cshtml.cs");
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "Contact.g.cshtml.cs");
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "Index.g.cshtml.cs");
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Shared", "_Layout.g.cshtml.cs");
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Shared", "_ValidationScriptsPartial.g.cshtml.cs");
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Shared", "Error.g.cshtml.cs");
-            Assert.FileCountEquals(result, 8, RazorIntermediateOutputPath, "*.g.cshtml.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "_ViewImports.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "_ViewStart.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "About.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "Contact.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Shared", "_Layout.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Shared", "_ValidationScriptsPartial.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Shared", "Error.cshtml.g.cs");
+            Assert.FileCountEquals(result, 8, RazorIntermediateOutputPath, "*.cshtml.g.cs");
         }
 
         [Fact]
@@ -70,7 +68,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
 
             // If there's a parser error, the generated file contents is likely incorrect. The file should not be written to disk.
-            Assert.FileDoesNotExist(result, RazorIntermediateOutputPath, "Views", "Home", "Index.g.cshtml.cs");
+            Assert.FileDoesNotExist(result, RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
         }
 
         [Fact]
@@ -98,7 +96,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         {
             // Act - 1
             var result = await DotnetMSBuild(RazorGenerateTarget);
-            var generatedFile = Path.Combine(Project.DirectoryPath, RazorIntermediateOutputPath, "Views", "Home", "About.g.cshtml.cs");
+            var generatedFile = Path.Combine(Project.DirectoryPath, RazorIntermediateOutputPath, "Views", "Home", "About.cshtml.g.cs");
 
             // Assert - 1
             Assert.BuildPassed(result);
@@ -125,7 +123,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             // Act - 1
             var result = await DotnetMSBuild(RazorGenerateTarget);
             var file = Path.Combine(Project.DirectoryPath, "Views", "Home", "Contact.cshtml");
-            var generatedFile = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Contact.g.cshtml.cs");
+            var generatedFile = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Contact.cshtml.g.cs");
 
             // Assert - 1
             Assert.BuildPassed(result);
@@ -148,7 +146,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         {
             // Act - 1
             var result = await DotnetMSBuild(RazorGenerateTarget);
-            var file = Path.Combine(Project.DirectoryPath, RazorIntermediateOutputPath, "Views", "Home", "About.g.cshtml.cs");
+            var file = Path.Combine(Project.DirectoryPath, RazorIntermediateOutputPath, "Views", "Home", "About.cshtml.g.cs");
 
             // Assert - 1
             Assert.BuildPassed(result);
@@ -171,7 +169,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var result = await DotnetMSBuild(RazorGenerateTarget);
             var file = Path.Combine(Project.DirectoryPath, "Views", "Home", "Index.cshtml");
             var renamed = Path.Combine(Project.DirectoryPath, "Views", "Home", "NewIndex.cshtml");
-            var generated = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.g.cshtml.cs");
+            var generated = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
 
             // Assert - 1
             Assert.BuildPassed(result);
@@ -184,7 +182,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             // Assert - 2
             Assert.BuildPassed(result);
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "NewIndex.g.cshtml.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "NewIndex.cshtml.g.cs");
             Assert.FileDoesNotExist(result, generated);
         }
 
@@ -195,7 +193,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             // Act - 1
             var result = await DotnetMSBuild(RazorGenerateTarget);
             var file = Path.Combine(Project.DirectoryPath, "Views", "Home", "Index.cshtml");
-            var generatedFile = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.g.cshtml.cs");
+            var generatedFile = Path.Combine(RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
 
             // Assert - 1
             Assert.BuildPassed(result);
@@ -227,7 +225,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             // We shouldn't need to hash the files
             Assert.FileDoesNotExist(result, Path.Combine(IntermediateOutputPath, "SimpleMvc.RazorCoreGenerate.cache"));
 
-            Assert.FileCountEquals(result, 0, RazorIntermediateOutputPath, "*.g.cshtml.cs");
+            Assert.FileCountEquals(result, 0, RazorIntermediateOutputPath, "*.cshtml.g.cs");
         }
 
         [Fact]
@@ -245,8 +243,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.BuildPassed(result);
 
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "About.g.cshtml.cs");
-            Assert.FileCountEquals(result, 1, RazorIntermediateOutputPath, "*.g.cshtml.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "About.cshtml.g.cs");
+            Assert.FileCountEquals(result, 1, RazorIntermediateOutputPath, "*.cshtml.g.cs");
         }
 
         [Fact]
@@ -267,8 +265,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.BuildPassed(result);
 
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "About.g.cshtml.cs");
-            Assert.FileCountEquals(result, 1, RazorIntermediateOutputPath, "*.g.cshtml.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "About.cshtml.g.cs");
+            Assert.FileCountEquals(result, 1, RazorIntermediateOutputPath, "*.cshtml.g.cs");
         }
 
         [Fact]
@@ -289,13 +287,13 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.BuildPassed(result);
 
-            Assert.FileExists(result, RazorIntermediateOutputPath, "LinkedFile.g.cshtml.cs");
-            Assert.FileExists(result, RazorIntermediateOutputPath, "LinkedFileOut", "LinkedFile2.g.cshtml.cs");
-            Assert.FileExists(result, RazorIntermediateOutputPath, "LinkedFileOut", "LinkedFileWithRename.g.cshtml.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "LinkedFile.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "LinkedFileOut", "LinkedFile2.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "LinkedFileOut", "LinkedFileWithRename.cshtml.g.cs");
 
-            Assert.BuildOutputContainsLine(result, $@"RazorGenerateWithTargetPath: {Path.Combine("..", "LinkedDir", "LinkedFile.cshtml")} LinkedFile.cshtml {Path.Combine(RazorIntermediateOutputPath, "LinkedFile.g.cshtml.cs")}");
-            Assert.BuildOutputContainsLine(result, $@"RazorGenerateWithTargetPath: {Path.Combine("..", "LinkedDir", "LinkedFile2.cshtml")} LinkedFileOut\LinkedFile2.cshtml {Path.Combine(RazorIntermediateOutputPath, "LinkedFileOut", "LinkedFile2.g.cshtml.cs")}");
-            Assert.BuildOutputContainsLine(result, $@"RazorGenerateWithTargetPath: {Path.Combine("..", "LinkedDir", "LinkedFile3.cshtml")} LinkedFileOut\LinkedFileWithRename.cshtml {Path.Combine(RazorIntermediateOutputPath, "LinkedFileOut", "LinkedFileWithRename.g.cshtml.cs")}");
+            Assert.BuildOutputContainsLine(result, $@"RazorGenerateWithTargetPath: {Path.Combine("..", "LinkedDir", "LinkedFile.cshtml")} LinkedFile.cshtml {Path.Combine(RazorIntermediateOutputPath, "LinkedFile.cshtml.g.cs")}");
+            Assert.BuildOutputContainsLine(result, $@"RazorGenerateWithTargetPath: {Path.Combine("..", "LinkedDir", "LinkedFile2.cshtml")} LinkedFileOut\LinkedFile2.cshtml {Path.Combine(RazorIntermediateOutputPath, "LinkedFileOut", "LinkedFile2.cshtml.g.cs")}");
+            Assert.BuildOutputContainsLine(result, $@"RazorGenerateWithTargetPath: {Path.Combine("..", "LinkedDir", "LinkedFile3.cshtml")} LinkedFileOut\LinkedFileWithRename.cshtml {Path.Combine(RazorIntermediateOutputPath, "LinkedFileOut", "LinkedFileWithRename.cshtml.g.cs")}");
         }
 
         [Fact]
@@ -344,17 +342,17 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.dll");
             Assert.FileDoesNotExist(result, IntermediateOutputPath, "SimpleMvc.Views.dll");
 
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "_ViewImports.g.cshtml.cs");
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "_ViewStart.g.cshtml.cs");
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "About.g.cshtml.cs");
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "Contact.g.cshtml.cs");
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "Index.g.cshtml.cs");
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Shared", "_Layout.g.cshtml.cs");
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Shared", "_ValidationScriptsPartial.g.cshtml.cs");
-            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Shared", "Error.g.cshtml.cs");
-            Assert.FileExists(result, RazorIntermediateOutputPath, "temp.g.cshtml.cs");
-            Assert.FileCountEquals(result, 9, RazorIntermediateOutputPath, "*.g.cshtml.cs");
-            Assert.BuildOutputContainsLine(result, $@"RazorGenerateWithTargetPath: {filePath} temp.cshtml {Path.Combine(RazorIntermediateOutputPath, "temp.g.cshtml.cs")}");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "_ViewImports.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "_ViewStart.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "About.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "Contact.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Home", "Index.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Shared", "_Layout.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Shared", "_ValidationScriptsPartial.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "Views", "Shared", "Error.cshtml.g.cs");
+            Assert.FileExists(result, RazorIntermediateOutputPath, "temp.cshtml.g.cs");
+            Assert.FileCountEquals(result, 9, RazorIntermediateOutputPath, "*.cshtml.g.cs");
+            Assert.BuildOutputContainsLine(result, $@"RazorGenerateWithTargetPath: {filePath} temp.cshtml {Path.Combine(RazorIntermediateOutputPath, "temp.cshtml.g.cs")}");
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/Microsoft.AspNetCore.Razor.Design.Test.csproj b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/Microsoft.NET.Sdk.Razor.Test.csproj
similarity index 89%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/Microsoft.AspNetCore.Razor.Design.Test.csproj
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/Microsoft.NET.Sdk.Razor.Test.csproj
index 576f355f9a..7cabd6927a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/Microsoft.AspNetCore.Razor.Design.Test.csproj
+++ b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <!-- 
+    <!--
       There's not much value in multi-targeting here, this doesn't run much .NET code, it tests MSBuild.
-      
+
       This is also a partial workaround for https://github.com/Microsoft/msbuild/issues/2661 - this project
-      has netcoreapp2.0 dependencies that need to be built first.
-    --> 
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+      has netcoreapp dependencies that need to be built first.
+    -->
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <DefineConstants Condition="'$(PreserveWorkingDirectory)'=='true'">$(DefineConstants);PRESERVE_WORKING_DIRECTORY</DefineConstants>
     <!-- Copy references locally so that we can use them in the test. -->
@@ -33,14 +33,10 @@
   <ItemGroup>
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(MicrosoftAspNetCoreHtmlAbstractionsPackageVersion)" />
-
   </ItemGroup>
 
   <ItemGroup>
     <!-- We don't need anything in this assembly, we just want to make sure it's built -->
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Design\Microsoft.AspNetCore.Razor.Design.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\Microsoft.NET.Sdk.Razor\Microsoft.NET.Sdk.Razor.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
@@ -54,5 +50,5 @@
   <Target Name="EnsureBuildVariablesGeneratedFile">
     <Error Text="BuildVariables.generated.cs was not found. Run .\build /t:Prepare from the root of the repository to generate it." Condition="!Exists('$(BuildVariablesGeneratedFile)')" />
   </Target>
-  
+
 </Project>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/xunit.runner.json b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/xunit.runner.json
similarity index 100%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.Design.Test/xunit.runner.json
rename to src/Razor/test/Microsoft.NET.Sdk.Razor.Test/xunit.runner.json
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj
index 18327289a4..e165062bc5 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46</TargetFrameworks>
+    <TargetFramework>net472</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,4 +17,8 @@
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' ">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssemblies)" PrivateAssets="All" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/PartialParserTestBase.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/PartialParserTestBase.cs
new file mode 100644
index 0000000000..ffbc4a4171
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/PartialParserTestBase.cs
@@ -0,0 +1,16 @@
+// 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.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Razor.Language.Legacy
+{
+    public class PartialParserTestBase : ParserTestBase
+    {
+        internal override RazorSyntaxTree ParseBlock(RazorLanguageVersion version, string document, IEnumerable<DirectiveDescriptor> directives, bool designTime)
+        {
+            // Unused
+            return null;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Properties/AssemblyInfo.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Properties/AssemblyInfo.cs
index e3c5250b76..e318eeac93 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Properties/AssemblyInfo.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Properties/AssemblyInfo.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Runtime.CompilerServices;
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: InternalsVisibleTo("Microsoft.VisualStudio.Editor.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/SingleThreadedForegroundDispatcher.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/SingleThreadedForegroundDispatcher.cs
new file mode 100644
index 0000000000..7c76826397
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/SingleThreadedForegroundDispatcher.cs
@@ -0,0 +1,47 @@
+// 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;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Razor
+{
+    internal class SingleThreadedForegroundDispatcher : ForegroundDispatcher
+    {
+        public SingleThreadedForegroundDispatcher()
+        {
+            ForegroundScheduler = SynchronizationContext.Current == null ? new ThrowingTaskScheduler() : TaskScheduler.FromCurrentSynchronizationContext();
+            BackgroundScheduler = TaskScheduler.Default;
+        }
+
+        public override TaskScheduler ForegroundScheduler { get; }
+
+        public override TaskScheduler BackgroundScheduler { get; }
+
+        private Thread Thread { get; } = Thread.CurrentThread;
+
+        public override bool IsForegroundThread => Thread.CurrentThread == Thread;
+
+        private class ThrowingTaskScheduler : TaskScheduler
+        {
+            protected override IEnumerable<Task> GetScheduledTasks()
+            {
+                return Enumerable.Empty<Task>();
+            }
+
+            protected override void QueueTask(Task task)
+            {
+                throw new InvalidOperationException($"Use [{nameof(ForegroundFactAttribute)}]");
+            }
+
+            protected override bool TryExecuteTaskInline(Task task, bool taskWasPreviouslyQueued)
+            {
+                throw new InvalidOperationException($"Use [{nameof(ForegroundFactAttribute)}]");
+            }
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundDispatcherTestBase.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundDispatcherTestBase.cs
index 0bcbb7b697..407a842658 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundDispatcherTestBase.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test.Common/Xunit/ForegroundDispatcherTestBase.cs
@@ -1,52 +1,13 @@
 // 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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Microsoft.CodeAnalysis.Razor;
 
 namespace Xunit
 {
-    public abstract class ForegroundDispatcherTestBase
+    public abstract class ForegroundDispatcherTestBase : PartialParserTestBase
     {
         internal ForegroundDispatcher Dispatcher { get; } = new SingleThreadedForegroundDispatcher();
-
-        private class SingleThreadedForegroundDispatcher : ForegroundDispatcher
-        {
-            public SingleThreadedForegroundDispatcher()
-            {
-                ForegroundScheduler = SynchronizationContext.Current == null ? new ThrowingTaskScheduler() : TaskScheduler.FromCurrentSynchronizationContext();
-                BackgroundScheduler = TaskScheduler.Default;
-            }
-
-            public override TaskScheduler ForegroundScheduler { get; }
-
-            public override TaskScheduler BackgroundScheduler { get; }
-
-            private Thread Thread { get; } = Thread.CurrentThread;
-
-            public override bool IsForegroundThread => Thread.CurrentThread == Thread;
-        }
-
-        private class ThrowingTaskScheduler : TaskScheduler
-        {
-            protected override IEnumerable<Task> GetScheduledTasks()
-            {
-                return Enumerable.Empty<Task>();
-            }
-
-            protected override void QueueTask(Task task)
-            {
-                throw new InvalidOperationException($"Use [{nameof(ForegroundFactAttribute)}]");
-            }
-
-            protected override bool TryExecuteTaskInline(Task task, bool taskWasPreviouslyQueued)
-            {
-                throw new InvalidOperationException($"Use [{nameof(ForegroundFactAttribute)}]");
-            }
-        }
     }
 }
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/BraceSmartIndenterTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/BraceSmartIndenterTest.cs
index 270165997d..5d7a1ef492 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/BraceSmartIndenterTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/BraceSmartIndenterTest.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Microsoft.VisualStudio.Test;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
@@ -13,7 +14,6 @@ using Microsoft.VisualStudio.Text.Operations;
 using Moq;
 using Xunit;
 using ITextBuffer = Microsoft.VisualStudio.Text.ITextBuffer;
-using Span = Microsoft.AspNetCore.Razor.Language.Legacy.Span;
 
 namespace Microsoft.VisualStudio.Editor.Razor
 {
@@ -153,7 +153,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
         public void IsUnlinkedSpan_NullOwner_ReturnsTrue()
         {
             // Arrange
-            Span owner = null;
+            SyntaxNode owner = null;
 
             // Act
             var result = BraceSmartIndenter.IsUnlinkedSpan(owner);
@@ -533,12 +533,11 @@ namespace Microsoft.VisualStudio.Editor.Razor
                     options.Directives.Add(FunctionsDirective.Directive);
                     options.Directives.Add(SectionDirective.Directive);
                 }));
-            syntaxTree.Root.LinkNodes();
 
             return syntaxTree;
         }
 
-        private static Span ExtractSpan(int spanLocation, string content)
+        private static SyntaxNode ExtractSpan(int spanLocation, string content)
         {
             var syntaxTree = GetSyntaxTree(content);
             var span = syntaxTree.Root.LocateOwner(new SourceChange(new SourceSpan(spanLocation, 0), string.Empty));
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultImportDocumentManagerIntegrationTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultImportDocumentManagerIntegrationTest.cs
index 9fd3cf04ea..8a4086b294 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultImportDocumentManagerIntegrationTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultImportDocumentManagerIntegrationTest.cs
@@ -14,7 +14,8 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
     {
         public DefaultImportDocumentManagerIntegrationTest()
         {
-            ProjectPath = "C:\\path\\to\\project\\project.csproj";
+            ProjectPath = TestProjectData.SomeProject.FilePath;
+            DirectoryPath = Path.GetDirectoryName(ProjectPath);
 
             FileSystem = RazorProjectFileSystem.Create(Path.GetDirectoryName(ProjectPath));
             ProjectEngine = RazorProjectEngine.Create(FallbackRazorConfiguration.MVC_2_1, FileSystem, b =>
@@ -24,7 +25,7 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
             });
         }
 
-        private string FilePath { get; }
+        private string DirectoryPath { get; }
 
         private string ProjectPath { get; }
 
@@ -36,15 +37,15 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
         public void Changed_TrackerChanged_ResultsInChangedHavingCorrectArgs()
         {
             // Arrange
-            var testImportsPath = "C:\\path\\to\\project\\_ViewImports.cshtml";
-
+            var testImportsPath = Path.Combine(DirectoryPath, "_ViewImports.cshtml");
+            
             var tracker = Mock.Of<VisualStudioDocumentTracker>(
-                t => t.FilePath == "C:\\path\\to\\project\\Views\\Home\\file.cshtml" &&
+                t => t.FilePath == Path.Combine(DirectoryPath, "Views", "Home", "_ViewImports.cshtml") &&
                 t.ProjectPath == ProjectPath &&
                 t.ProjectSnapshot == Mock.Of<ProjectSnapshot>(p => p.GetProjectEngine() == ProjectEngine));
 
             var anotherTracker = Mock.Of<VisualStudioDocumentTracker>(
-                t => t.FilePath == "C:\\path\\to\\project\\anotherFile.cshtml" &&
+                t => t.FilePath == Path.Combine(DirectoryPath, "anotherFile.cshtml") &&
                 t.ProjectPath == ProjectPath &&
                 t.ProjectSnapshot == Mock.Of<ProjectSnapshot>(p => p.GetProjectEngine() == ProjectEngine));
 
@@ -56,12 +57,12 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
             fileChangeTrackerFactory
                 .Setup(f => f.Create(testImportsPath))
                 .Returns(fileChangeTracker.Object);
-
+            
             fileChangeTrackerFactory
-                .Setup(f => f.Create("C:\\path\\to\\project\\Views\\_ViewImports.cshtml"))
+                .Setup(f => f.Create(Path.Combine(DirectoryPath, "Views", "_ViewImports.cshtml")))
                 .Returns(Mock.Of<FileChangeTracker>());
             fileChangeTrackerFactory
-                .Setup(f => f.Create("C:\\path\\to\\project\\Views\\Home\\_ViewImports.cshtml"))
+                .Setup(f => f.Create(Path.Combine(DirectoryPath, "Views", "Home", "_ViewImports.cshtml")))
                 .Returns(Mock.Of<FileChangeTracker>());
 
             var called = false;
@@ -76,8 +77,8 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
                 Assert.Equal(FileChangeKind.Changed, args.Kind);
                 Assert.Collection(
                     args.AssociatedDocuments,
-                    f => Assert.Equal("C:\\path\\to\\project\\Views\\Home\\file.cshtml", f),
-                    f => Assert.Equal("C:\\path\\to\\project\\anotherFile.cshtml", f));
+                    f => Assert.Equal(Path.Combine(DirectoryPath, "Views", "Home", "_ViewImports.cshtml"), f),
+                    f => Assert.Equal(Path.Combine(DirectoryPath, "anotherFile.cshtml"), f));
             };
 
             // Act
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultImportDocumentManagerTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultImportDocumentManagerTest.cs
index a84a26fb04..77c4e8cbaf 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultImportDocumentManagerTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultImportDocumentManagerTest.cs
@@ -16,7 +16,8 @@ namespace Microsoft.VisualStudio.Editor.Razor
     {
         public DefaultImportDocumentManagerTest()
         {
-            ProjectPath = "C:\\path\\to\\project\\project.csproj";
+            ProjectPath = TestProjectData.SomeProject.FilePath;
+            DirectoryPath = Path.GetDirectoryName(ProjectPath);
 
             FileSystem = RazorProjectFileSystem.Create(Path.GetDirectoryName(ProjectPath));
             ProjectEngine = RazorProjectEngine.Create(FallbackRazorConfiguration.MVC_2_1, FileSystem, b =>
@@ -26,10 +27,10 @@ namespace Microsoft.VisualStudio.Editor.Razor
             });
         }
 
-        private string FilePath { get; }
-
         private string ProjectPath { get; }
 
+        private string DirectoryPath { get; }
+
         private RazorProjectFileSystem FileSystem { get; }
 
         private RazorProjectEngine ProjectEngine { get; }
@@ -39,17 +40,17 @@ namespace Microsoft.VisualStudio.Editor.Razor
         {
             // Arrange
             var tracker = Mock.Of<VisualStudioDocumentTracker>(
-                t => t.FilePath == "C:\\path\\to\\project\\Views\\Home\\file.cshtml" && 
+                t => t.FilePath == Path.Combine(DirectoryPath, "Views", "Home", "file.cshtml") && 
                 t.ProjectPath == ProjectPath &&
                 t.ProjectSnapshot == Mock.Of<ProjectSnapshot>(p => p.GetProjectEngine() == ProjectEngine));
-
+            
             var fileChangeTrackerFactory = new Mock<FileChangeTrackerFactory>();
             var fileChangeTracker1 = new Mock<FileChangeTracker>();
             fileChangeTracker1
                 .Setup(f => f.StartListening())
                 .Verifiable();
             fileChangeTrackerFactory
-                .Setup(f => f.Create("C:\\path\\to\\project\\Views\\Home\\_ViewImports.cshtml"))
+                .Setup(f => f.Create(Path.Combine(DirectoryPath, "Views", "Home", "_ViewImports.cshtml")))
                 .Returns(fileChangeTracker1.Object)
                 .Verifiable();
             var fileChangeTracker2 = new Mock<FileChangeTracker>();
@@ -57,13 +58,13 @@ namespace Microsoft.VisualStudio.Editor.Razor
                 .Setup(f => f.StartListening())
                 .Verifiable();
             fileChangeTrackerFactory
-                .Setup(f => f.Create("C:\\path\\to\\project\\Views\\_ViewImports.cshtml"))
+                .Setup(f => f.Create(Path.Combine(DirectoryPath, "Views", "_ViewImports.cshtml")))
                 .Returns(fileChangeTracker2.Object)
                 .Verifiable();
             var fileChangeTracker3 = new Mock<FileChangeTracker>();
             fileChangeTracker3.Setup(f => f.StartListening()).Verifiable();
             fileChangeTrackerFactory
-                .Setup(f => f.Create("C:\\path\\to\\project\\_ViewImports.cshtml"))
+                .Setup(f => f.Create(Path.Combine(DirectoryPath, "_ViewImports.cshtml")))
                 .Returns(fileChangeTracker3.Object)
                 .Verifiable();
 
@@ -84,12 +85,12 @@ namespace Microsoft.VisualStudio.Editor.Razor
         {
             // Arrange
             var tracker = Mock.Of<VisualStudioDocumentTracker>(
-                t => t.FilePath == "C:\\path\\to\\project\\file.cshtml" &&
+                t => t.FilePath == Path.Combine(DirectoryPath, "file.cshtml") &&
                 t.ProjectPath == ProjectPath &&
                 t.ProjectSnapshot == Mock.Of<ProjectSnapshot>(p => p.GetProjectEngine() == ProjectEngine));
 
             var anotherTracker = Mock.Of<VisualStudioDocumentTracker>(
-                t => t.FilePath == "C:\\path\\to\\project\\anotherFile.cshtml" && 
+                t => t.FilePath == Path.Combine(DirectoryPath, "anotherFile.cshtml") && 
                 t.ProjectPath == ProjectPath &&
                 t.ProjectSnapshot == Mock.Of<ProjectSnapshot>(p => p.GetProjectEngine() == ProjectEngine));
 
@@ -115,7 +116,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
         {
             // Arrange
             var tracker = Mock.Of<VisualStudioDocumentTracker>(
-                t => t.FilePath == "C:\\path\\to\\project\\file.cshtml" &&
+                t => t.FilePath == Path.Combine(DirectoryPath, "file.cshtml") &&
                 t.ProjectPath == ProjectPath &&
                 t.ProjectSnapshot == Mock.Of<ProjectSnapshot>(p => p.GetProjectEngine() == ProjectEngine));
 
@@ -125,7 +126,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
                 .Setup(f => f.StopListening())
                 .Verifiable();
             fileChangeTrackerFactory
-                .Setup(f => f.Create("C:\\path\\to\\project\\_ViewImports.cshtml"))
+                .Setup(f => f.Create(Path.Combine(DirectoryPath, "_ViewImports.cshtml")))
                 .Returns(fileChangeTracker.Object)
                 .Verifiable();
 
@@ -145,12 +146,12 @@ namespace Microsoft.VisualStudio.Editor.Razor
         {
             // Arrange
             var tracker = Mock.Of<VisualStudioDocumentTracker>(
-                t => t.FilePath == "C:\\path\\to\\project\\file.cshtml" && 
+                t => t.FilePath == Path.Combine(DirectoryPath, "file.cshtml") && 
                 t.ProjectPath == ProjectPath &&
                 t.ProjectSnapshot == Mock.Of<ProjectSnapshot>(p => p.GetProjectEngine() == ProjectEngine));
 
             var anotherTracker = Mock.Of<VisualStudioDocumentTracker>(
-                t => t.FilePath == "C:\\path\\to\\project\\anotherFile.cshtml" &&
+                t => t.FilePath == Path.Combine(DirectoryPath, "anotherFile.cshtml") &&
                 t.ProjectPath == ProjectPath &&
                 t.ProjectSnapshot == Mock.Of<ProjectSnapshot>(p => p.GetProjectEngine() == ProjectEngine));
 
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultProjectSnapshotProjectEngineFactoryTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultProjectSnapshotProjectEngineFactoryTest.cs
index 581d61602c..c4eb90c2a4 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultProjectSnapshotProjectEngineFactoryTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultProjectSnapshotProjectEngineFactoryTest.cs
@@ -10,6 +10,7 @@ using Microsoft.VisualStudio.Editor.Razor;
 using Xunit;
 
 using Mvc1_X = Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X;
+using Mvc2_X = Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X;
 using MvcLatest = Microsoft.AspNetCore.Mvc.Razor.Extensions;
 
 namespace Microsoft.CodeAnalysis.Razor
@@ -36,6 +37,11 @@ namespace Microsoft.CodeAnalysis.Razor
             HostProject_For_2_1 = new HostProject(
                 "/TestPath/SomePath/Test.csproj",
                 new ProjectSystemRazorConfiguration(RazorLanguageVersion.Version_2_1, "MVC-2.1", Array.Empty<RazorExtension>()));
+
+            HostProject_For_3_0 = new HostProject(
+                "/TestPath/SomePath/Test.csproj",
+                new ProjectSystemRazorConfiguration(RazorLanguageVersion.Version_3_0, "MVC-3.0", Array.Empty<RazorExtension>()));
+
             HostProject_For_UnknownConfiguration = new HostProject(
                 "/TestPath/SomePath/Test.csproj",
                 new ProjectSystemRazorConfiguration(RazorLanguageVersion.Version_2_1, "Blazor-0.1", Array.Empty<RazorExtension>()));
@@ -44,6 +50,7 @@ namespace Microsoft.CodeAnalysis.Razor
             Snapshot_For_1_1 = new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, HostProject_For_1_1, WorkspaceProject));
             Snapshot_For_2_0 = new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, HostProject_For_2_0, WorkspaceProject));
             Snapshot_For_2_1 = new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, HostProject_For_2_1, WorkspaceProject));
+            Snapshot_For_3_0 = new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, HostProject_For_3_0, WorkspaceProject));
             Snapshot_For_UnknownConfiguration = new DefaultProjectSnapshot(ProjectState.Create(Workspace.Services, HostProject_For_UnknownConfiguration, WorkspaceProject));
 
             CustomFactories = new Lazy<IProjectEngineFactory, ICustomProjectEngineFactoryMetadata>[]
@@ -60,6 +67,9 @@ namespace Microsoft.CodeAnalysis.Razor
                 new Lazy<IProjectEngineFactory, ICustomProjectEngineFactoryMetadata>(
                     () => new LegacyProjectEngineFactory_2_1(),
                     typeof(LegacyProjectEngineFactory_2_1).GetCustomAttribute<ExportCustomProjectEngineFactoryAttribute>()),
+                new Lazy<IProjectEngineFactory, ICustomProjectEngineFactoryMetadata>(
+                    () => new LegacyProjectEngineFactory_3_0(),
+                    typeof(LegacyProjectEngineFactory_3_0).GetCustomAttribute<ExportCustomProjectEngineFactoryAttribute>()),
             };
 
             FallbackFactory = new FallbackProjectEngineFactory();
@@ -77,6 +87,8 @@ namespace Microsoft.CodeAnalysis.Razor
 
         private HostProject HostProject_For_2_1 { get; }
 
+        private HostProject HostProject_For_3_0 { get; }
+
         private HostProject HostProject_For_UnknownConfiguration { get; }
 
         private ProjectSnapshot Snapshot_For_1_0 { get; }
@@ -87,12 +99,35 @@ namespace Microsoft.CodeAnalysis.Razor
 
         private ProjectSnapshot Snapshot_For_2_1 { get; }
 
+        private ProjectSnapshot Snapshot_For_3_0 { get; }
+
         private ProjectSnapshot Snapshot_For_UnknownConfiguration { get; }
         
         private Project WorkspaceProject { get; }
 
         private Workspace Workspace { get; }
 
+        [Fact]
+        public void Create_CreatesDesignTimeTemplateEngine_ForVersion3_0()
+        {
+            // Arrange
+            var snapshot = Snapshot_For_3_0;
+
+            var factory = new DefaultProjectSnapshotProjectEngineFactory(FallbackFactory, CustomFactories);
+
+            // Act
+            var engine = factory.Create(snapshot, b =>
+            {
+                b.Features.Add(new MyCoolNewFeature());
+            });
+
+            // Assert
+            Assert.Single(engine.Engine.Features.OfType<MyCoolNewFeature>());
+            Assert.Single(engine.Engine.Features.OfType<MvcLatest.ViewComponentTagHelperDescriptorProvider>());
+            Assert.Single(engine.Engine.Features.OfType<MvcLatest.MvcViewDocumentClassifierPass>());
+            Assert.Single(engine.Engine.Features.OfType<MvcLatest.ViewComponentTagHelperPass>());
+        }
+
         [Fact]
         public void Create_CreatesDesignTimeTemplateEngine_ForVersion2_1()
         {
@@ -109,9 +144,11 @@ namespace Microsoft.CodeAnalysis.Razor
 
             // Assert
             Assert.Single(engine.Engine.Features.OfType<MyCoolNewFeature>());
-            Assert.Single(engine.Engine.Features.OfType<MvcLatest.ViewComponentTagHelperDescriptorProvider>());
-            Assert.Single(engine.Engine.Features.OfType<MvcLatest.MvcViewDocumentClassifierPass>());
-            Assert.Single(engine.Engine.Features.OfType<MvcLatest.ViewComponentTagHelperPass>());
+            Assert.Empty(engine.Engine.Features.OfType<MvcLatest.MvcViewDocumentClassifierPass>());
+
+            Assert.Single(engine.Engine.Features.OfType<Mvc2_X.ViewComponentTagHelperDescriptorProvider>());
+            Assert.Single(engine.Engine.Features.OfType<Mvc2_X.MvcViewDocumentClassifierPass>());
+            Assert.Single(engine.Engine.Features.OfType<Mvc2_X.ViewComponentTagHelperPass>());
         }
 
         [Fact]
@@ -130,9 +167,9 @@ namespace Microsoft.CodeAnalysis.Razor
 
             // Assert
             Assert.Single(engine.Engine.Features.OfType<MyCoolNewFeature>());
-            Assert.Single(engine.Engine.Features.OfType<MvcLatest.ViewComponentTagHelperDescriptorProvider>());
-            Assert.Single(engine.Engine.Features.OfType<MvcLatest.MvcViewDocumentClassifierPass>());
-            Assert.Single(engine.Engine.Features.OfType<MvcLatest.ViewComponentTagHelperPass>());
+            Assert.Single(engine.Engine.Features.OfType<Mvc2_X.ViewComponentTagHelperDescriptorProvider>());
+            Assert.Single(engine.Engine.Features.OfType<Mvc2_X.MvcViewDocumentClassifierPass>());
+            Assert.Single(engine.Engine.Features.OfType<Mvc2_X.ViewComponentTagHelperPass>());
         }
 
         [Fact]
@@ -172,9 +209,18 @@ namespace Microsoft.CodeAnalysis.Razor
 
             // Assert
             Assert.Single(engine.Engine.Features.OfType<MyCoolNewFeature>());
+            Assert.Single(engine.Engine.Features.OfType<Mvc1_X.MvcViewDocumentClassifierPass>());
+
             Assert.Empty(engine.Engine.Features.OfType<MvcLatest.ViewComponentTagHelperDescriptorProvider>());
             Assert.Empty(engine.Engine.Features.OfType<MvcLatest.MvcViewDocumentClassifierPass>());
             Assert.Empty(engine.Engine.Features.OfType<MvcLatest.ViewComponentTagHelperPass>());
+
+            Assert.Empty(engine.Engine.Features.OfType<Mvc2_X.ViewComponentTagHelperDescriptorProvider>());
+            Assert.Empty(engine.Engine.Features.OfType<Mvc2_X.MvcViewDocumentClassifierPass>());
+            Assert.Empty(engine.Engine.Features.OfType<Mvc2_X.ViewComponentTagHelperPass>());
+
+            Assert.Empty(engine.Engine.Features.OfType<Mvc1_X.ViewComponentTagHelperDescriptorProvider>());
+            Assert.Empty(engine.Engine.Features.OfType<Mvc1_X.ViewComponentTagHelperPass>());
         }
 
         [Fact]
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorIndentationFactsServiceTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorIndentationFactsServiceTest.cs
index dcc7c8cadc..9be9e6f910 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorIndentationFactsServiceTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorIndentationFactsServiceTest.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Microsoft.VisualStudio.Text;
 using Xunit;
 
@@ -33,9 +33,9 @@ namespace Microsoft.VisualStudio.Editor.Razor
         public void IsCSharpOpenCurlyBrace_SpanWithLeftBrace_ReturnTrue()
         {
             // Arrange
-            var childBuilder = new SpanBuilder(SourceLocation.Zero);
-            childBuilder.Accept(new CSharpToken("{", CSharpTokenType.LeftBrace));
-            var child = childBuilder.Build();
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
+            builder.Add(SyntaxFactory.Token(SyntaxKind.LeftBrace, "{"));
+            var child = SyntaxFactory.RazorMetaCode(builder.ToList());
 
             // Act
             var result = DefaultRazorIndentationFactsService.IsCSharpOpenCurlyBrace(child);
@@ -45,17 +45,17 @@ namespace Microsoft.VisualStudio.Editor.Razor
         }
 
         [Theory]
-        [InlineData("if", CSharpTokenType.Keyword)]
-        [InlineData("}", CSharpTokenType.RightBrace)]
-        [InlineData("++", CSharpTokenType.Increment)]
-        [InlineData("text", CSharpTokenType.Identifier)]
+        [InlineData("if", SyntaxKind.Keyword)]
+        [InlineData("}", SyntaxKind.RightBrace)]
+        [InlineData("++", SyntaxKind.Increment)]
+        [InlineData("text", SyntaxKind.Identifier)]
         public void IsCSharpOpenCurlyBrace_SpanWithUnsupportedSymbolType_ReturnFalse(string content, object symbolTypeObject)
         {
             // Arrange
-            var symbolType = (CSharpTokenType)symbolTypeObject;
-            var childBuilder = new SpanBuilder(SourceLocation.Zero);
-            childBuilder.Accept(new CSharpToken(content, symbolType));
-            var child = childBuilder.Build();
+            var symbolType = (SyntaxKind)symbolTypeObject;
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
+            builder.Add(SyntaxFactory.Token(symbolType, content));
+            var child = SyntaxFactory.MarkupTextLiteral(builder.ToList());
 
             // Act
             var result = DefaultRazorIndentationFactsService.IsCSharpOpenCurlyBrace(child);
@@ -68,10 +68,10 @@ namespace Microsoft.VisualStudio.Editor.Razor
         public void IsCSharpOpenCurlyBrace_MultipleSymbols_ReturnFalse()
         {
             // Arrange
-            var childBuilder = new SpanBuilder(SourceLocation.Zero);
-            childBuilder.Accept(new CSharpToken("hello", CSharpTokenType.Identifier));
-            childBuilder.Accept(new CSharpToken(",", CSharpTokenType.Comma));
-            var child = childBuilder.Build();
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Identifier, "hello"));
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Comma, ","));
+            var child = SyntaxFactory.MarkupTextLiteral(builder.ToList());
 
             // Act
             var result = DefaultRazorIndentationFactsService.IsCSharpOpenCurlyBrace(child);
@@ -84,9 +84,9 @@ namespace Microsoft.VisualStudio.Editor.Razor
         public void IsCSharpOpenCurlyBrace_SpanWithHtmlSymbol_ReturnFalse()
         {
             // Arrange
-            var childBuilder = new SpanBuilder(SourceLocation.Zero);
-            childBuilder.Accept(new HtmlToken("hello", HtmlTokenType.Text));
-            var child = childBuilder.Build();
+            var builder = SyntaxListBuilder<SyntaxToken>.Create();
+            builder.Add(SyntaxFactory.Token(SyntaxKind.Text, "hello"));
+            var child = SyntaxFactory.MarkupTextLiteral(builder.ToList());
 
             // Act
             var result = DefaultRazorIndentationFactsService.IsCSharpOpenCurlyBrace(child);
@@ -99,10 +99,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
         public void IsCSharpOpenCurlyBrace_Blocks_ReturnFalse()
         {
             // Arrange
-            var child = new BlockBuilder()
-            {
-                Type = BlockKindInternal.Markup,
-            }.Build();
+            var child = SyntaxFactory.MarkupBlock();
 
             // Act
             var result = DefaultRazorIndentationFactsService.IsCSharpOpenCurlyBrace(child);
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorSyntaxFactsServiceTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorSyntaxFactsServiceTest.cs
index 7888cb39a3..8327e2856a 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorSyntaxFactsServiceTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorSyntaxFactsServiceTest.cs
@@ -1,6 +1,7 @@
 // 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;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Language;
 using Xunit;
@@ -88,33 +89,14 @@ namespace Microsoft.VisualStudio.Editor.Razor
                 .TagMatchingRuleDescriptor(rule => rule.RequireTagName("taghelper"))
                 .TypeName("TestTagHelper")
                 .Build();
-            var engine = RazorProjectEngine.Create(builder =>
-            {
-                builder.AddTagHelpers(taghelper);
-                builder.SetImportFeature(new TestImportProjectFeature());
-            });
+            var engine = RazorProjectEngine.Create();
 
-            var sourceProjectItem = new TestRazorProjectItem("test.cshtml")
-            {
-                Content = source
-            };
+            var sourceDocument = TestRazorSourceDocument.Create(source, normalizeNewLines: true);
+            var importDocument = TestRazorSourceDocument.Create("@addTagHelper *, TestAssembly", filePath: "import.cshtml", relativePath: "import.cshtml");
 
-            var codeDocument = engine.ProcessDesignTime(sourceProjectItem);
+            var codeDocument = engine.ProcessDesignTime(sourceDocument, importSources: new []{ importDocument }, new []{ taghelper });
 
             return codeDocument;
         }
-
-        private class TestImportProjectFeature : RazorProjectEngineFeatureBase, IImportProjectFeature
-        {
-            public IReadOnlyList<RazorProjectItem> GetImports(RazorProjectItem projectItem)
-            {
-                var importProjectItem = new TestRazorProjectItem("import.cshtml")
-                {
-                    Content = "@addTagHelper *, TestAssembly"
-                };
-
-                return new[] { importProjectItem };
-            }
-        }
     }
 }
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioDocumentTrackerTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioDocumentTrackerTest.cs
index 352c49ecc3..b5d63b1b34 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioDocumentTrackerTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioDocumentTrackerTest.cs
@@ -19,44 +19,29 @@ using Xunit;
 
 namespace Microsoft.VisualStudio.Editor.Razor
 {
-    public class DefaultVisualStudioDocumentTrackerTest : ForegroundDispatcherTestBase
+    public class DefaultVisualStudioDocumentTrackerTest : ForegroundDispatcherWorkspaceTestBase
     {
         public DefaultVisualStudioDocumentTrackerTest()
         {
             RazorCoreContentType = Mock.Of<IContentType>(c => c.IsOfType(RazorLanguage.ContentType) == true);
             TextBuffer = Mock.Of<ITextBuffer>(b => b.ContentType == RazorCoreContentType);
 
-            FilePath = "C:/Some/Path/TestDocumentTracker.cshtml";
-            ProjectPath = "C:/Some/Path/TestProject.csproj";
+            FilePath = TestProjectData.SomeProjectFile1.FilePath;
+            ProjectPath = TestProjectData.SomeProject.FilePath;
 
             ImportDocumentManager = Mock.Of<ImportDocumentManager>();
             WorkspaceEditorSettings = new DefaultWorkspaceEditorSettings(Mock.Of<ForegroundDispatcher>(), Mock.Of<EditorSettingsManager>());
 
-            TagHelperResolver = new TestTagHelperResolver();
             SomeTagHelpers = new List<TagHelperDescriptor>()
             {
                 TagHelperDescriptorBuilder.Create("test", "test").Build(),
             };
-
-            HostServices = TestServices.Create(
-                new IWorkspaceService[] { },
-                new ILanguageService[] { TagHelperResolver, });
-
-            Workspace = TestWorkspace.Create(HostServices, w =>
-            {
-                WorkspaceProject = w.AddProject(ProjectInfo.Create(
-                    ProjectId.CreateNewId(),
-                    new VersionStamp(),
-                    "Test1",
-                    "TestAssembly",
-                    LanguageNames.CSharp,
-                    filePath: ProjectPath));
-            });
-
+            
             ProjectManager = new TestProjectSnapshotManager(Dispatcher, Workspace) { AllowNotifyListeners = true };
 
             HostProject = new HostProject(ProjectPath, FallbackRazorConfiguration.MVC_2_1);
-            OtherHostProject = new HostProject(ProjectPath, FallbackRazorConfiguration.MVC_2_0);
+            UpdatedHostProject = new HostProject(ProjectPath, FallbackRazorConfiguration.MVC_2_0);
+            OtherHostProject = new HostProject(TestProjectData.AnotherProject.FilePath, FallbackRazorConfiguration.MVC_2_0);
 
             DocumentTracker = new DefaultVisualStudioDocumentTracker(
                 Dispatcher,
@@ -79,6 +64,8 @@ namespace Microsoft.VisualStudio.Editor.Razor
 
         private HostProject HostProject { get; }
 
+        private HostProject UpdatedHostProject { get; }
+
         private HostProject OtherHostProject { get; }
 
         private Project WorkspaceProject { get; set; }
@@ -89,16 +76,29 @@ namespace Microsoft.VisualStudio.Editor.Razor
 
         private List<TagHelperDescriptor> SomeTagHelpers { get; }
 
-        private TestTagHelperResolver TagHelperResolver { get; }
+        private TestTagHelperResolver TagHelperResolver { get; set; }
 
         private ProjectSnapshotManagerBase ProjectManager { get; }
 
-        private HostServices HostServices { get; }
-
-        private Workspace Workspace { get; }
-
         private DefaultVisualStudioDocumentTracker DocumentTracker { get; }
 
+        protected override void ConfigureLanguageServices(List<ILanguageService> services)
+        {
+            TagHelperResolver = new TestTagHelperResolver();
+            services.Add(TagHelperResolver);
+        }
+
+        protected override void ConfigureWorkspace(AdhocWorkspace workspace)
+        {
+            WorkspaceProject = workspace.AddProject(ProjectInfo.Create(
+                ProjectId.CreateNewId(),
+                new VersionStamp(),
+                "Test1",
+                "TestAssembly",
+                LanguageNames.CSharp,
+                filePath: TestProjectData.SomeProject.FilePath));
+        }
+
         [ForegroundFact]
         public void Subscribe_NoopsIfAlreadySubscribed()
         {
@@ -191,7 +191,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
             ProjectManager.HostProjectAdded(HostProject);
             ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
 
-            var e = new ProjectChangeEventArgs(ProjectPath, ProjectChangeKind.ProjectAdded);
+            var e = new ProjectChangeEventArgs(null, ProjectManager.GetLoadedProject(HostProject.FilePath), ProjectChangeKind.ProjectAdded);
 
             var called = false;
             DocumentTracker.ContextChanged += (sender, args) =>
@@ -215,8 +215,8 @@ namespace Microsoft.VisualStudio.Editor.Razor
             // Arrange
             ProjectManager.HostProjectAdded(HostProject);
             ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
-
-            var e = new ProjectChangeEventArgs(ProjectPath, ProjectChangeKind.ProjectChanged);
+            
+            var e = new ProjectChangeEventArgs(null, ProjectManager.GetLoadedProject(HostProject.FilePath), ProjectChangeKind.ProjectChanged);
 
             var called = false;
             DocumentTracker.ContextChanged += (sender, args) =>
@@ -238,7 +238,13 @@ namespace Microsoft.VisualStudio.Editor.Razor
         public void ProjectManager_Changed_ProjectRemoved_TriggersContextChanged_WithEphemeralProject()
         {
             // Arrange
-            var e = new ProjectChangeEventArgs(ProjectPath, ProjectChangeKind.ProjectRemoved);
+            ProjectManager.HostProjectAdded(HostProject);
+            ProjectManager.WorkspaceProjectAdded(WorkspaceProject);
+
+            var project = ProjectManager.GetLoadedProject(HostProject.FilePath);
+            ProjectManager.HostProjectRemoved(HostProject);
+
+            var e = new ProjectChangeEventArgs(project, null, ProjectChangeKind.ProjectRemoved);
 
             var called = false;
             DocumentTracker.ContextChanged += (sender, args) =>
@@ -260,7 +266,9 @@ namespace Microsoft.VisualStudio.Editor.Razor
         public void ProjectManager_Changed_IgnoresUnknownProject()
         {
             // Arrange
-            var e = new ProjectChangeEventArgs("c:/OtherPath/OtherProject.csproj", ProjectChangeKind.ProjectChanged);
+            ProjectManager.HostProjectAdded(OtherHostProject);
+
+            var e = new ProjectChangeEventArgs(null, ProjectManager.GetLoadedProject(OtherHostProject.FilePath), ProjectChangeKind.ProjectChanged);
 
             var called = false;
             DocumentTracker.ContextChanged += (sender, args) =>
@@ -488,13 +496,13 @@ namespace Microsoft.VisualStudio.Editor.Razor
             DocumentTracker.ContextChanged += (sender, e) => { args.Add(e); };
             
             // Act
-            ProjectManager.HostProjectChanged(OtherHostProject);
+            ProjectManager.HostProjectChanged(UpdatedHostProject);
             await DocumentTracker.PendingTagHelperTask;
 
             // Assert
             var snapshot = Assert.IsType<DefaultProjectSnapshot>(DocumentTracker.ProjectSnapshot);
 
-            Assert.Same(OtherHostProject, snapshot.HostProject);
+            Assert.Same(UpdatedHostProject, snapshot.HostProject);
 
             Assert.Collection(
                 args,
@@ -550,7 +558,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
             await DocumentTracker.PendingTagHelperTask;
 
             // Assert
-            Assert.Same(DocumentTracker.TagHelpers, SomeTagHelpers);
+            Assert.Same(SomeTagHelpers, DocumentTracker.TagHelpers);
 
             Assert.Collection(
                 args,
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioRazorParserIntegrationTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioRazorParserIntegrationTest.cs
index 22bad6622c..8cb7f9ed7c 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioRazorParserIntegrationTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioRazorParserIntegrationTest.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Razor.Extensions;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
-using Microsoft.CodeAnalysis;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.VisualStudio.Test;
@@ -27,13 +27,13 @@ namespace Microsoft.VisualStudio.Editor.Razor
 
         public DefaultVisualStudioRazorParserIntegrationTest()
         {
-            Workspace = TestWorkspace.Create();
+            Workspace = CodeAnalysis.TestWorkspace.Create();
             ProjectSnapshot = new EphemeralProjectSnapshot(Workspace.Services, TestProjectPath);
         }
 
         private ProjectSnapshot ProjectSnapshot { get; }
 
-        private Workspace Workspace { get; }
+        private CodeAnalysis.Workspace Workspace { get; }
 
         [ForegroundFact]
         public async Task BufferChangeStartsFullReparseIfChangeOverlapsMultipleSpans()
@@ -70,7 +70,6 @@ namespace Microsoft.VisualStudio.Editor.Razor
             var original = new StringTextSnapshot("foo @await Html baz");
             using (var manager = CreateParserManager(original))
             {
-                var factory = new SpanFactory();
                 var changed = new StringTextSnapshot("foo @await Html. baz");
                 var edit = new TestEdit(15, 0, original, 1, changed, ".");
                 await manager.InitializeWithDocumentAsync(edit.OldSnapshot);
@@ -80,19 +79,14 @@ namespace Microsoft.VisualStudio.Editor.Razor
 
                 // Assert
                 Assert.Equal(2, manager.ParseCount);
-                ParserTestBase.EvaluateParseTree(manager.CurrentSyntaxTree.Root, new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("await Html").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.WhiteSpace | AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(". baz")));
+                VerifyCurrentSyntaxTree(manager);
             }
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionAcceptsDotlessCommitInsertionsInStatementBlockAfterIdentifiers()
+        public async Task ImpExprAcceptsDCIInStmtBlkAfterIdentifiers()
         {
-            var factory = new SpanFactory();
+            // ImplicitExpressionAcceptsDotlessCommitInsertionsInStatementBlockAfterIdentifiers
             var changed = new StringTextSnapshot("@{" + Environment.NewLine
                                                 + "    @DateTime." + Environment.NewLine
                                                 + "}");
@@ -107,22 +101,8 @@ namespace Microsoft.VisualStudio.Editor.Razor
                 {
                     manager.ApplyEdit(testEdit);
                     Assert.Equal(1, manager.ParseCount);
-                    ParserTestBase.EvaluateParseTree(manager.PartialParsingSyntaxTreeRoot, new MarkupBlock(
-                        factory.EmptyHtml(),
-                        new StatementBlock(
-                            factory.CodeTransition(),
-                            factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                            factory.Code(Environment.NewLine + "    ")
-                                .AsStatement()
-                                .AutoCompleteWith(autoCompleteString: null),
-                            new ExpressionBlock(
-                                factory.CodeTransition(),
-                                factory.Code(expectedCode)
-                                       .AsImplicitExpression(CSharpCodeParser.DefaultKeywords, acceptTrailingDot: true)
-                                       .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                            factory.Code(Environment.NewLine).AsStatement(),
-                            factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)),
-                        factory.EmptyHtml()));
+
+                    VerifyPartialParseTree(manager, changed.GetText(), expectedCode);
                 };
 
                 await manager.InitializeWithDocumentAsync(edit.OldSnapshot);
@@ -149,9 +129,9 @@ namespace Microsoft.VisualStudio.Editor.Razor
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionAcceptsDotlessCommitInsertionsInStatementBlock()
+        public async Task ImpExprAcceptsDCIInStatementBlock()
         {
-            var factory = new SpanFactory();
+            // ImpExprAcceptsDotlessCommitInsertionsInStatementBlock
             var changed = new StringTextSnapshot("@{" + Environment.NewLine
                                                     + "    @DateT." + Environment.NewLine
                                                     + "}");
@@ -166,22 +146,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
                 {
                     manager.ApplyEdit(testEdit);
                     Assert.Equal(1, manager.ParseCount);
-                    ParserTestBase.EvaluateParseTree(manager.PartialParsingSyntaxTreeRoot, new MarkupBlock(
-                        factory.EmptyHtml(),
-                        new StatementBlock(
-                            factory.CodeTransition(),
-                            factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                            factory.Code(Environment.NewLine + "    ")
-                                .AsStatement()
-                                .AutoCompleteWith(autoCompleteString: null),
-                            new ExpressionBlock(
-                                factory.CodeTransition(),
-                                factory.Code(expectedCode)
-                                       .AsImplicitExpression(CSharpCodeParser.DefaultKeywords, acceptTrailingDot: true)
-                                       .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                            factory.Code(Environment.NewLine).AsStatement(),
-                            factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)),
-                        factory.EmptyHtml()));
+                    VerifyPartialParseTree(manager, changed.GetText(), expectedCode);
                 };
 
                 await manager.InitializeWithDocumentAsync(edit.OldSnapshot);
@@ -200,9 +165,9 @@ namespace Microsoft.VisualStudio.Editor.Razor
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionProvisionallyAcceptsDotlessCommitInsertions()
+        public async Task ImpExprProvisionallyAcceptsDCI()
         {
-            var factory = new SpanFactory();
+            // ImpExprProvisionallyAcceptsDotlessCommitInsertions
             var changed = new StringTextSnapshot("foo @DateT. baz");
             var original = new StringTextSnapshot("foo @DateT baz");
             var edit = new TestEdit(10, 0, original, 1, changed, ".");
@@ -213,12 +178,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
                     manager.ApplyEdit(testEdit);
                     Assert.Equal(1, manager.ParseCount);
 
-                    ParserTestBase.EvaluateParseTree(manager.PartialParsingSyntaxTreeRoot, new MarkupBlock(
-                        factory.Markup("foo "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code(expectedCode).AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Markup(" baz")));
+                    VerifyPartialParseTree(manager, testEdit.NewSnapshot.GetText(), expectedCode);
                 };
 
                 await manager.InitializeWithDocumentAsync(edit.OldSnapshot);
@@ -236,19 +196,14 @@ namespace Microsoft.VisualStudio.Editor.Razor
                 await manager.WaitForReparseAsync();
 
                 Assert.Equal(2, manager.ParseCount);
-                ParserTestBase.EvaluateParseTree(manager.CurrentSyntaxTree.Root, new MarkupBlock(
-                        factory.Markup("foo "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("DateTime").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Markup(". baz")));
+                VerifyCurrentSyntaxTree(manager);
             }
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionProvisionallyAcceptsDotlessCommitInsertionsAfterIdentifiers()
+        public async Task ImpExprProvisionallyAcceptsDCIAfterIdentifiers()
         {
-            var factory = new SpanFactory();
+            // ImplicitExpressionProvisionallyAcceptsDotlessCommitInsertionsAfterIdentifiers
             var changed = new StringTextSnapshot("foo @DateTime. baz");
             var original = new StringTextSnapshot("foo @DateTime baz");
             var edit = new TestEdit(13, 0, original, 1, changed, ".");
@@ -259,12 +214,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
                     manager.ApplyEdit(testEdit);
                     Assert.Equal(1, manager.ParseCount);
 
-                    ParserTestBase.EvaluateParseTree(manager.PartialParsingSyntaxTreeRoot, new MarkupBlock(
-                        factory.Markup("foo "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code(expectedCode).AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Markup(" baz")));
+                    VerifyPartialParseTree(manager, testEdit.NewSnapshot.GetText(), expectedCode);
                 };
 
                 await manager.InitializeWithDocumentAsync(edit.OldSnapshot);
@@ -288,19 +238,14 @@ namespace Microsoft.VisualStudio.Editor.Razor
                 await manager.WaitForReparseAsync();
 
                 Assert.Equal(2, manager.ParseCount);
-                ParserTestBase.EvaluateParseTree(manager.CurrentSyntaxTree.Root, new MarkupBlock(
-                        factory.Markup("foo "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("DateTime.Now").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Markup(". baz")));
+                VerifyCurrentSyntaxTree(manager);
             }
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionProvisionallyAcceptsCaseInsensitiveDotlessCommitInsertions_NewRoslynIntegration()
+        public async Task ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration()
         {
-            var factory = new SpanFactory();
+            // ImplicitExpressionProvisionallyAcceptsCaseInsensitiveDotlessCommitInsertions_NewRoslynIntegration
             var original = new StringTextSnapshot("foo @date baz");
             var changed = new StringTextSnapshot("foo @date. baz");
             var edit = new TestEdit(9, 0, original, 1, changed, ".");
@@ -311,12 +256,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
                     applyEdit();
                     Assert.Equal(1, manager.ParseCount);
 
-                    ParserTestBase.EvaluateParseTree(manager.PartialParsingSyntaxTreeRoot, new MarkupBlock(
-                        factory.Markup("foo "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code(expectedCode).AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Markup(" baz")));
+                    VerifyPartialParseTree(manager, changed.GetText(), expectedCode);
                 };
 
                 await manager.InitializeWithDocumentAsync(edit.OldSnapshot);
@@ -351,20 +291,15 @@ namespace Microsoft.VisualStudio.Editor.Razor
                 await manager.WaitForReparseAsync();
 
                 Assert.Equal(2, manager.ParseCount);
-                ParserTestBase.EvaluateParseTree(manager.CurrentSyntaxTree.Root, new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("DateTime").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(". baz")));
+                VerifyCurrentSyntaxTree(manager);
             }
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionRejectsChangeWhichWouldHaveBeenAcceptedIfLastChangeWasProvisionallyAcceptedOnDifferentSpan()
+        public async Task ImpExprRejectsAcceptableChangeIfPrevWasProvisionallyAccepted()
         {
+            // ImplicitExpressionRejectsChangeWhichWouldHaveBeenAcceptedIfLastChangeWasProvisionallyAcceptedOnDifferentSpan
             // Arrange
-            var factory = new SpanFactory();
             var dotTyped = new TestEdit(8, 0, new StringTextSnapshot("foo @foo @bar"), 1, new StringTextSnapshot("foo @foo. @bar"), ".");
             var charTyped = new TestEdit(14, 0, new StringTextSnapshot("foo @foo. @bar"), 1, new StringTextSnapshot("foo @foo. @barb"), "b");
             using (var manager = CreateParserManager(dotTyped.OldSnapshot))
@@ -379,29 +314,15 @@ namespace Microsoft.VisualStudio.Editor.Razor
 
                 // Assert
                 Assert.Equal(2, manager.ParseCount);
-                ParserTestBase.EvaluateParseTree(manager.PartialParsingSyntaxTreeRoot,
-                    new MarkupBlock(
-                        factory.Markup("foo "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("foo")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Markup(". "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("barb")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.EmptyHtml()));
+                VerifyPartialParseTree(manager, charTyped.NewSnapshot.GetText());
             }
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionAcceptsIdentifierTypedAfterDotIfLastChangeWasProvisionalAcceptanceOfDot()
+        public async Task ImpExprAcceptsIdentifierTypedAfterDotIfLastChangeProvisional()
         {
+            // ImplicitExpressionAcceptsIdentifierTypedAfterDotIfLastChangeWasProvisionalAcceptanceOfDot
             // Arrange
-            var factory = new SpanFactory();
             var dotTyped = new TestEdit(8, 0, new StringTextSnapshot("foo @foo bar"), 1, new StringTextSnapshot("foo @foo. bar"), ".");
             var charTyped = new TestEdit(9, 0, new StringTextSnapshot("foo @foo. bar"), 1, new StringTextSnapshot("foo @foo.b bar"), "b");
             using (var manager = CreateParserManager(dotTyped.OldSnapshot))
@@ -416,23 +337,14 @@ namespace Microsoft.VisualStudio.Editor.Razor
 
                 // Assert
                 Assert.Equal(1, manager.ParseCount);
-                ParserTestBase.EvaluateParseTree(manager.PartialParsingSyntaxTreeRoot,
-                    new MarkupBlock(
-                        factory.Markup("foo "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("foo.b")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Markup(" bar")));
+                VerifyPartialParseTree(manager, charTyped.NewSnapshot.GetText());
             }
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpression_AcceptsParenthesisAtEnd_SingleEdit()
+        public async Task ImpExpr_AcceptsParenthesisAtEnd_SingleEdit()
         {
             // Arrange
-            var factory = new SpanFactory();
             var edit = new TestEdit(8, 0, new StringTextSnapshot("foo @foo bar"), 2, new StringTextSnapshot("foo @foo() bar"), "()");
 
             using (var manager = CreateParserManager(edit.OldSnapshot))
@@ -444,24 +356,14 @@ namespace Microsoft.VisualStudio.Editor.Razor
 
                 // Assert
                 Assert.Equal(1, manager.ParseCount);
-                ParserTestBase.EvaluateParseTree(
-                    manager.PartialParsingSyntaxTreeRoot,
-                    new MarkupBlock(
-                        factory.Markup("foo "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("foo()")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Markup(" bar")));
+                VerifyPartialParseTree(manager, edit.NewSnapshot.GetText());
             }
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpression_AcceptsParenthesisAtEnd_TwoEdits()
+        public async Task ImpExpr_AcceptsParenthesisAtEnd_TwoEdits()
         {
             // Arrange
-            var factory = new SpanFactory();
             var edit1 = new TestEdit(8, 0, new StringTextSnapshot("foo @foo bar"), 1, new StringTextSnapshot("foo @foo( bar"), "(");
             var edit2 = new TestEdit(9, 0, new StringTextSnapshot("foo @foo( bar"), 1, new StringTextSnapshot("foo @foo() bar"), ")");
             using (var manager = CreateParserManager(edit1.OldSnapshot))
@@ -476,33 +378,24 @@ namespace Microsoft.VisualStudio.Editor.Razor
 
                 // Assert
                 Assert.Equal(1, manager.ParseCount);
-                ParserTestBase.EvaluateParseTree(
-                    manager.PartialParsingSyntaxTreeRoot,
-                    new MarkupBlock(
-                        factory.Markup("foo "),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("foo()")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Markup(" bar")));
+                VerifyPartialParseTree(manager, edit2.NewSnapshot.GetText());
             }
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfIfKeywordTyped()
+        public async Task ImpExprCorrectlyTriggersReparseIfIfKeywordTyped()
         {
             await RunTypeKeywordTestAsync("if");
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfDoKeywordTyped()
+        public async Task ImpExprCorrectlyTriggersReparseIfDoKeywordTyped()
         {
             await RunTypeKeywordTestAsync("do");
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfTryKeywordTyped()
+        public async Task ImpExprCorrectlyTriggersReparseIfTryKeywordTyped()
         {
             await RunTypeKeywordTestAsync("try");
         }
@@ -514,65 +407,84 @@ namespace Microsoft.VisualStudio.Editor.Razor
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfForEachKeywordTyped()
+        public async Task ImpExprCorrectlyTriggersReparseIfForEachKeywordTyped()
         {
             await RunTypeKeywordTestAsync("foreach");
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfWhileKeywordTyped()
+        public async Task ImpExprCorrectlyTriggersReparseIfWhileKeywordTyped()
         {
             await RunTypeKeywordTestAsync("while");
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfSwitchKeywordTyped()
+        public async Task ImpExprCorrectlyTriggersReparseIfSwitchKeywordTyped()
         {
             await RunTypeKeywordTestAsync("switch");
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfLockKeywordTyped()
+        public async Task ImpExprCorrectlyTriggersReparseIfLockKeywordTyped()
         {
             await RunTypeKeywordTestAsync("lock");
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfUsingKeywordTyped()
+        public async Task ImpExprCorrectlyTriggersReparseIfUsingKeywordTyped()
         {
             await RunTypeKeywordTestAsync("using");
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfSectionKeywordTyped()
+        public async Task ImpExprCorrectlyTriggersReparseIfSectionKeywordTyped()
         {
             await RunTypeKeywordTestAsync("section");
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfInheritsKeywordTyped()
+        public async Task ImpExprCorrectlyTriggersReparseIfInheritsKeywordTyped()
         {
             await RunTypeKeywordTestAsync("inherits");
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfFunctionsKeywordTyped()
+        public async Task ImpExprCorrectlyTriggersReparseIfFunctionsKeywordTyped()
         {
             await RunTypeKeywordTestAsync("functions");
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfNamespaceKeywordTyped()
+        public async Task ImpExprCorrectlyTriggersReparseIfNamespaceKeywordTyped()
         {
             await RunTypeKeywordTestAsync("namespace");
         }
 
         [ForegroundFact]
-        public async Task ImplicitExpressionCorrectlyTriggersReparseIfClassKeywordTyped()
+        public async Task ImpExprCorrectlyTriggersReparseIfClassKeywordTyped()
         {
             await RunTypeKeywordTestAsync("class");
         }
 
+        private void VerifyPartialParseTree(TestParserManager manager, string content, string expectedCode = null)
+        {
+            if (expectedCode != null)
+            {
+                // Verify if the syntax tree represents the expected input.
+                var syntaxTreeContent = manager.PartialParsingSyntaxTreeRoot.ToFullString();
+                Assert.Contains(expectedCode, syntaxTreeContent);
+            }
+
+            var sourceDocument = TestRazorSourceDocument.Create(content);
+            var syntaxTree = RazorSyntaxTree.Create(manager.PartialParsingSyntaxTreeRoot, sourceDocument, manager.CurrentSyntaxTree.Diagnostics, manager.CurrentSyntaxTree.Options);
+            BaselineTest(syntaxTree);
+        }
+
+        private void VerifyCurrentSyntaxTree(TestParserManager manager)
+        {
+            BaselineTest(manager.CurrentSyntaxTree);
+        }
+
         private TestParserManager CreateParserManager(ITextSnapshot originalSnapshot)
         {
             var textBuffer = new TestTextBuffer(originalSnapshot);
@@ -707,7 +619,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
 
             public RazorSyntaxTree CurrentSyntaxTree { get; private set; }
 
-            public Block PartialParsingSyntaxTreeRoot => _parser._partialParser.SyntaxTreeRoot;
+            public SyntaxNode PartialParsingSyntaxTreeRoot => _parser._partialParser.ModifiedSyntaxTreeRoot;
 
             public async Task InitializeWithDocumentAsync(ITextSnapshot snapshot)
             {
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioRazorParserTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioRazorParserTest.cs
index 3df48c553f..70c4072528 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioRazorParserTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultVisualStudioRazorParserTest.cs
@@ -24,7 +24,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
             var engine = RazorProjectEngine.Create(RazorConfiguration.Default, RazorProjectFileSystem.Empty);
             ProjectEngineFactory = Mock.Of<ProjectSnapshotProjectEngineFactory>(
                 f => f.Create(
-                    It.IsAny<ProjectSnapshot>(),
+                    It.IsAny<RazorConfiguration>(),
                     It.IsAny<RazorProjectFileSystem>(),
                     It.IsAny<Action<RazorProjectEngineBuilder>>()) == engine);
         }
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentManagerBaseTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentManagerBaseTest.cs
index e11fd055a3..bd81fa59de 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentManagerBaseTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentManagerBaseTest.cs
@@ -21,13 +21,13 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
 
         private TestEditorDocumentManager Manager { get; }
 
-        public string Project1 => "c:\\Project1";
+        public string Project1 => TestProjectData.SomeProject.FilePath;
 
-        public string Project2 => "c:\\Project2";
+        public string Project2 => TestProjectData.AnotherProject.FilePath;
 
-        public string File1 => "c:\\Project1\\File1.cshtml";
+        public string File1 => TestProjectData.SomeProjectFile1.FilePath;
 
-        public string File2 => "c:\\Project2\\File2.cshtml";
+        public string File2 => TestProjectData.AnotherProjectFile2.FilePath;
 
         public TestTextBuffer TextBuffer => new TestTextBuffer(new StringTextSnapshot("HI"));
 
@@ -113,8 +113,8 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
             // Assert
             Assert.Collection(
                 documents.OrderBy(d => d.ProjectFilePath),
-                d => Assert.Same(document1, d),
-                d => Assert.Same(document2, d));
+                d => Assert.Same(document2, d),
+                d => Assert.Same(document1, d));
         }
 
         [ForegroundFact]
@@ -147,8 +147,8 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
             // Assert
             Assert.Collection(
                 Manager.Opened.OrderBy(d => d.ProjectFilePath),
-                d => Assert.Same(document1, d),
-                d => Assert.Same(document2, d));
+                d => Assert.Same(document2, d),
+                d => Assert.Same(document1, d));
         }
 
         [ForegroundFact]
@@ -165,8 +165,8 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
             // Assert
             Assert.Collection(
                 Manager.Closed.OrderBy(d => d.ProjectFilePath),
-                d => Assert.Same(document1, d),
-                d => Assert.Same(document2, d));
+                d => Assert.Same(document2, d),
+                d => Assert.Same(document1, d));
         }
 
         private class TestEditorDocumentManager : EditorDocumentManagerBase
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentManagerListenerTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentManagerListenerTest.cs
index 6d1eddacee..7a1e6122de 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentManagerListenerTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentManagerListenerTest.cs
@@ -17,8 +17,8 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
     {
         public EditorDocumentManagerListenerTest()
         {
-            ProjectFilePath = "C:\\project1\\project.csproj";
-            DocumentFilePath = "c:\\project1\\file1.cshtml";
+            ProjectFilePath = TestProjectData.SomeProject.FilePath;
+            DocumentFilePath = TestProjectData.SomeProjectFile1.FilePath;
             TextLoader = TextLoader.From(TextAndVersion.Create(SourceText.From("FILE"), VersionStamp.Default));
             FileChangeTracker = new DefaultFileChangeTracker(DocumentFilePath);
 
@@ -58,8 +58,10 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
 
             var listener = new EditorDocumentManagerListener(editorDocumentManger.Object, changedOnDisk, changedInEditor, opened, closed);
 
+            var project = Mock.Of<ProjectSnapshot>(p => p.FilePath == "/Path/to/project.csproj");
+
             // Act & Assert
-            listener.ProjectManager_Changed(null, new ProjectChangeEventArgs("/Path/to/project.csproj", ProjectChangeKind.DocumentAdded));
+            listener.ProjectManager_Changed(null, new ProjectChangeEventArgs(project, project, ProjectChangeKind.DocumentAdded));
         }
 
         [Fact]
@@ -76,8 +78,10 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
 
             var listener = new EditorDocumentManagerListener(editorDocumentManger.Object, onChangedOnDisk: null, onChangedInEditor: null, onOpened: opened, onClosed: null);
 
+            var project = Mock.Of<ProjectSnapshot>(p => p.FilePath == "/Path/to/project.csproj");
+
             // Act
-            listener.ProjectManager_Changed(null, new ProjectChangeEventArgs("/Path/to/project.csproj", ProjectChangeKind.DocumentAdded));
+            listener.ProjectManager_Changed(null, new ProjectChangeEventArgs(project, project, ProjectChangeKind.DocumentAdded));
 
             // Assert
             Assert.True(called);
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentTest.cs
index 7173be6d15..491e69dd60 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Documents/EditorDocumentTest.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Test;
 using Microsoft.VisualStudio.Text;
@@ -16,8 +17,8 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
         public EditorDocumentTest()
         {
             DocumentManager = Mock.Of<EditorDocumentManager>();
-            ProjectFilePath = "C:\\project1\\project.csproj";
-            DocumentFilePath = "c:\\project1\\file1.cshtml";
+            ProjectFilePath = TestProjectData.SomeProject.FilePath;
+            DocumentFilePath = TestProjectData.SomeProjectFile1.FilePath;
             TextLoader = TextLoader.From(TextAndVersion.Create(SourceText.From("FILE"), VersionStamp.Default));
             FileChangeTracker = new DefaultFileChangeTracker(DocumentFilePath);
 
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj
index bf005a9478..112e736480 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
@@ -12,6 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="TestFiles\**\*" />
     <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
   
@@ -23,6 +24,7 @@
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj" />
     <ProjectReference Include="..\Microsoft.VisualStudio.Editor.Razor.Test.Common\Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj" />
   </ItemGroup>
 
@@ -34,4 +36,8 @@
     <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' ">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssemblies)" PrivateAssets="All" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionProviderTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionProviderTest.cs
index 1b76f772b6..7fccf44a9d 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionProviderTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionProviderTest.cs
@@ -4,51 +4,43 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.ComponentModel.Composition;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Extensions;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Completion;
 using Microsoft.CodeAnalysis.Options;
-using Microsoft.CodeAnalysis.Tags;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Text;
+using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion;
 using Microsoft.VisualStudio.Text;
+using Microsoft.VisualStudio.Utilities;
 using Moq;
 using Xunit;
+using ITextBuffer = Microsoft.VisualStudio.Text.ITextBuffer;
 
 namespace Microsoft.VisualStudio.Editor.Razor
 {
     public class RazorDirectiveCompletionProviderTest
     {
-        private static readonly IReadOnlyList<DirectiveDescriptor> DefaultDirectives = new[]
+        public RazorDirectiveCompletionProviderTest()
         {
-            CSharpCodeParser.AddTagHelperDirectiveDescriptor,
-            CSharpCodeParser.RemoveTagHelperDirectiveDescriptor,
-            CSharpCodeParser.TagHelperPrefixDirectiveDescriptor,
-        };
-
-        [Fact]
-        public void AtDirectiveCompletionPoint_ReturnsFalseIfChangeHasNoOwner()
-        {
-            // Arrange
-            var codeDocumentProvider = CreateCodeDocumentProvider("@", Enumerable.Empty<DirectiveDescriptor>());
-            var completionProvider = new FailOnGetCompletionsProvider(codeDocumentProvider);
-            var document = CreateDocument();
-            codeDocumentProvider.Value.TryGetFromDocument(document, out var codeDocument);
-            var syntaxTree = codeDocument.GetSyntaxTree();
-            var completionContext = CreateContext(2, completionProvider, document);
-
-            // Act
-            var result = completionProvider.AtDirectiveCompletionPoint(syntaxTree, completionContext);
-
-            // Assert
-            Assert.False(result);
+            CompletionBroker = Mock.Of<IAsyncCompletionBroker>(broker => broker.IsCompletionSupported(It.IsAny<IContentType>()) == true);
+            var razorBuffer = Mock.Of<ITextBuffer>(buffer => buffer.ContentType == Mock.Of<IContentType>());
+            TextBufferProvider = Mock.Of<RazorTextBufferProvider>(provider => provider.TryGetFromDocument(It.IsAny<TextDocument>(), out razorBuffer) == true);
+            CompletionFactsService = new DefaultRazorCompletionFactsService();
+            CompletionProviderDependencies = new Lazy<CompletionProviderDependencies>(() => new DefaultCompletionProviderDependencies(CompletionFactsService, CompletionBroker));
         }
 
+        private Lazy<CompletionProviderDependencies> CompletionProviderDependencies { get; }
+
+        private IAsyncCompletionBroker CompletionBroker { get; }
+
+        private RazorTextBufferProvider TextBufferProvider { get; }
+
+        private RazorCompletionFactsService CompletionFactsService { get; }
+
         [Fact]
         public async Task GetDescriptionAsync_AddsDirectiveDescriptionIfPropertyExists()
         {
@@ -61,7 +53,10 @@ namespace Microsoft.VisualStudio.Editor.Razor
                     [RazorDirectiveCompletionProvider.DescriptionKey] = expectedDescription,
                 }).ToImmutableDictionary());
             var codeDocumentProvider = new Mock<RazorCodeDocumentProvider>();
-            var completionProvider = new RazorDirectiveCompletionProvider(new Lazy<RazorCodeDocumentProvider>(() => codeDocumentProvider.Object));
+            var completionProvider = new RazorDirectiveCompletionProvider(
+                new Lazy<RazorCodeDocumentProvider>(() => codeDocumentProvider.Object),
+                CompletionProviderDependencies,
+                TextBufferProvider);
 
             // Act
             var description = await completionProvider.GetDescriptionAsync(document, item, CancellationToken.None);
@@ -80,7 +75,10 @@ namespace Microsoft.VisualStudio.Editor.Razor
             var document = CreateDocument();
             var item = CompletionItem.Create("TestDirective");
             var codeDocumentProvider = new Mock<RazorCodeDocumentProvider>();
-            var completionProvider = new RazorDirectiveCompletionProvider(new Lazy<RazorCodeDocumentProvider>(() => codeDocumentProvider.Object));
+            var completionProvider = new RazorDirectiveCompletionProvider(
+                new Lazy<RazorCodeDocumentProvider>(() => codeDocumentProvider.Object),
+                CompletionProviderDependencies,
+                TextBufferProvider);
 
             // Act
             var description = await completionProvider.GetDescriptionAsync(document, item, CancellationToken.None);
@@ -95,7 +93,10 @@ namespace Microsoft.VisualStudio.Editor.Razor
         {
             // Arrange
             var codeDocumentProvider = new Mock<RazorCodeDocumentProvider>(MockBehavior.Strict);
-            var completionProvider = new FailOnGetCompletionsProvider(new Lazy<RazorCodeDocumentProvider>(() => codeDocumentProvider.Object));
+            var completionProvider = new FailOnGetCompletionsProvider(
+                new Lazy<RazorCodeDocumentProvider>(() => codeDocumentProvider.Object),
+                CompletionProviderDependencies,
+                TextBufferProvider);
             var document = CreateDocument();
             document = document.WithFilePath("NotRazor.cs");
             var context = CreateContext(1, completionProvider, document);
@@ -104,7 +105,6 @@ namespace Microsoft.VisualStudio.Editor.Razor
             await completionProvider.ProvideCompletionsAsync(context);
         }
 
-
         [Fact]
         public async Task ProvideCompletionAsync_DoesNotProvideCompletionsForDocumentWithoutPath()
         {
@@ -121,7 +121,10 @@ namespace Microsoft.VisualStudio.Editor.Razor
             });
 
             var codeDocumentProvider = new Mock<RazorCodeDocumentProvider>(MockBehavior.Strict);
-            var completionProvider = new FailOnGetCompletionsProvider(new Lazy<RazorCodeDocumentProvider>(() => codeDocumentProvider.Object));
+            var completionProvider = new FailOnGetCompletionsProvider(
+                new Lazy<RazorCodeDocumentProvider>(() => codeDocumentProvider.Object),
+                CompletionProviderDependencies,
+                TextBufferProvider);
             var context = CreateContext(1, completionProvider, document);
 
             // Act & Assert
@@ -136,7 +139,10 @@ namespace Microsoft.VisualStudio.Editor.Razor
             var codeDocumentProvider = new Mock<RazorCodeDocumentProvider>();
             codeDocumentProvider.Setup(provider => provider.TryGetFromDocument(It.IsAny<TextDocument>(), out codeDocument))
                 .Returns(false);
-            var completionProvider = new FailOnGetCompletionsProvider(new Lazy<RazorCodeDocumentProvider>(() => codeDocumentProvider.Object));
+            var completionProvider = new FailOnGetCompletionsProvider(
+                new Lazy<RazorCodeDocumentProvider>(() => codeDocumentProvider.Object),
+                CompletionProviderDependencies,
+                TextBufferProvider);
             var document = CreateDocument();
             var context = CreateContext(1, completionProvider, document);
 
@@ -149,7 +155,11 @@ namespace Microsoft.VisualStudio.Editor.Razor
         {
             // Arrange
             var codeDocumentProvider = CreateCodeDocumentProvider("@", Enumerable.Empty<DirectiveDescriptor>());
-            var completionProvider = new FailOnGetCompletionsProvider(codeDocumentProvider, false);
+            var completionProvider = new FailOnGetCompletionsProvider(
+                codeDocumentProvider,
+                CompletionProviderDependencies,
+                TextBufferProvider,
+                canGetSnapshotPoint: false);
             var document = CreateDocument();
             var context = CreateContext(0, completionProvider, document);
 
@@ -157,142 +167,6 @@ namespace Microsoft.VisualStudio.Editor.Razor
             await completionProvider.ProvideCompletionsAsync(context);
         }
 
-        [Fact]
-        public async Task ProvideCompletionAsync_DoesNotProvideCompletionsWhenNotAtCompletionPoint()
-        {
-            // Arrange
-            var codeDocumentProvider = CreateCodeDocumentProvider("@", Enumerable.Empty<DirectiveDescriptor>());
-            var completionProvider = new FailOnGetCompletionsProvider(codeDocumentProvider);
-            var document = CreateDocument();
-            var context = CreateContext(0, completionProvider, document);
-
-            // Act & Assert
-            await completionProvider.ProvideCompletionsAsync(context);
-        }
-
-        [Theory]
-        [InlineData("DateTime.Now")]
-        [InlineData("SomeMethod()")]
-        public async Task ProvideCompletionAsync_DoesNotProvideCompletionsWhenAtComplexExpressions(string content)
-        {
-            // Arrange
-            var codeDocumentProvider = CreateCodeDocumentProvider("@" + content, Enumerable.Empty<DirectiveDescriptor>());
-            var completionProvider = new FailOnGetCompletionsProvider(codeDocumentProvider);
-            var document = CreateDocument();
-            var context = CreateContext(1, completionProvider, document);
-
-            // Act & Assert
-            await completionProvider.ProvideCompletionsAsync(context);
-        }
-
-        [Fact]
-        public async Task ProvideCompletionAsync_DoesNotProvideCompletionsForExplicitExpressions()
-        {
-            // Arrange
-            var codeDocumentProvider = CreateCodeDocumentProvider("@()", Enumerable.Empty<DirectiveDescriptor>());
-            var completionProvider = new FailOnGetCompletionsProvider(codeDocumentProvider);
-            var document = CreateDocument();
-            var context = CreateContext(2, completionProvider, document);
-
-            // Act & Assert
-            await completionProvider.ProvideCompletionsAsync(context);
-        }
-
-        [Fact]
-        public async Task ProvideCompletionAsync_DoesNotProvideCompletionsForCodeDocumentWithoutSyntaxTree()
-        {
-            // Arrange
-            var codeDocumentProvider = new Mock<RazorCodeDocumentProvider>();
-            var codeDocument = TestRazorCodeDocument.CreateEmpty();
-            codeDocumentProvider.Setup(provider => provider.TryGetFromDocument(It.IsAny<TextDocument>(), out codeDocument))
-                .Returns(true);
-            var completionProvider = new FailOnGetCompletionsProvider(new Lazy<RazorCodeDocumentProvider>(() => codeDocumentProvider.Object));
-            var document = CreateDocument();
-            var context = CreateContext(2, completionProvider, document);
-
-            // Act & Assert
-            await completionProvider.ProvideCompletionsAsync(context);
-        }
-
-        [Fact]
-        public void GetCompletionItems_ProvidesCompletionsForDefaultDirectives()
-        {
-            // Arrange
-            var codeDocumentProvider = CreateCodeDocumentProvider("@", Enumerable.Empty<DirectiveDescriptor>());
-            var completionProvider = new RazorDirectiveCompletionProvider(codeDocumentProvider);
-            var document = CreateDocument();
-            codeDocumentProvider.Value.TryGetFromDocument(document, out var codeDocument);
-            var syntaxTree = codeDocument.GetSyntaxTree();
-
-            // Act
-            var completionItems = completionProvider.GetCompletionItems(syntaxTree);
-
-            // Assert
-            Assert.Collection(
-                completionItems,
-                item => AssertRazorCompletionItem(DefaultDirectives[0].Description, item),
-                item => AssertRazorCompletionItem(DefaultDirectives[1].Description, item),
-                item => AssertRazorCompletionItem(DefaultDirectives[2].Description, item));
-        }
-
-        [Fact]
-        public void GetCompletionItems_ProvidesCompletionsForDefaultAndExtensibleDirectives()
-        {
-            // Arrange
-            var codeDocumentProvider = CreateCodeDocumentProvider("@", new[] { SectionDirective.Directive });
-            var completionProvider = new RazorDirectiveCompletionProvider(codeDocumentProvider);
-            var document = CreateDocument();
-            codeDocumentProvider.Value.TryGetFromDocument(document, out var codeDocument);
-            var syntaxTree = codeDocument.GetSyntaxTree();
-
-            // Act
-            var completionItems = completionProvider.GetCompletionItems(syntaxTree);
-
-            // Assert
-            Assert.Collection(
-                completionItems,
-                item => AssertRazorCompletionItem(SectionDirective.Directive.Description, item),
-                item => AssertRazorCompletionItem(DefaultDirectives[0].Description, item),
-                item => AssertRazorCompletionItem(DefaultDirectives[1].Description, item),
-                item => AssertRazorCompletionItem(DefaultDirectives[2].Description, item));
-        }
-
-        [Fact]
-        public void GetCompletionItems_ProvidesCompletionsForDirectivesWithoutDescription()
-        {
-            // Arrange
-            var customDirective = DirectiveDescriptor.CreateSingleLineDirective("custom");
-            var codeDocumentProvider = CreateCodeDocumentProvider("@", new[] { customDirective });
-            var completionProvider = new RazorDirectiveCompletionProvider(codeDocumentProvider);
-            var document = CreateDocument();
-            codeDocumentProvider.Value.TryGetFromDocument(document, out var codeDocument);
-            var syntaxTree = codeDocument.GetSyntaxTree();
-
-            // Act
-            var completionItems = completionProvider.GetCompletionItems(syntaxTree);
-
-            // Assert
-            var customDirectiveCompletion = Assert.Single(completionItems, item => item.DisplayText == customDirective.Directive);
-            AssertRazorCompletionItemDefaults(customDirectiveCompletion);
-            Assert.DoesNotContain(customDirectiveCompletion.Properties, property => property.Key == RazorDirectiveCompletionProvider.DescriptionKey);
-        }
-
-        private static void AssertRazorCompletionItem(string expectedDescription, CompletionItem item)
-        {
-            Assert.True(item.Properties.TryGetValue(RazorDirectiveCompletionProvider.DescriptionKey, out var actualDescription));
-            Assert.Equal(expectedDescription, actualDescription);
-
-            AssertRazorCompletionItemDefaults(item);
-        }
-
-        private static void AssertRazorCompletionItemDefaults(CompletionItem item)
-        {
-            Assert.Equal("_RazorDirective_", item.SortText);
-            Assert.False(item.Rules.FormatOnCommit);
-            var tag = Assert.Single(item.Tags);
-            Assert.Equal(WellKnownTags.Intrinsic, tag);
-        }
-
         private static Lazy<RazorCodeDocumentProvider> CreateCodeDocumentProvider(string text, IEnumerable<DirectiveDescriptor> directives)
         {
             var codeDocumentProvider = new Mock<RazorCodeDocumentProvider>();
@@ -348,18 +222,16 @@ namespace Microsoft.VisualStudio.Editor.Razor
         {
             private readonly bool _canGetSnapshotPoint;
 
-            public FailOnGetCompletionsProvider(Lazy<RazorCodeDocumentProvider> codeDocumentProvider, bool canGetSnapshotPoint = true)
-                : base(codeDocumentProvider)
+            public FailOnGetCompletionsProvider(
+                Lazy<RazorCodeDocumentProvider> codeDocumentProvider,
+                Lazy<CompletionProviderDependencies> completionProviderDependencies,
+                RazorTextBufferProvider textBufferProvider,
+                bool canGetSnapshotPoint = true)
+                : base(codeDocumentProvider, completionProviderDependencies, textBufferProvider)
             {
                 _canGetSnapshotPoint = canGetSnapshotPoint;
             }
 
-            internal override IEnumerable<CompletionItem> GetCompletionItems(RazorSyntaxTree syntaxTree)
-            {
-                Assert.False(true, "Completions should not have been attempted.");
-                return null;
-            }
-
             protected override bool TryGetRazorSnapshotPoint(CompletionContext context, out SnapshotPoint snapshotPoint)
             {
                 if (!_canGetSnapshotPoint)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionSourceProviderTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionSourceProviderTest.cs
new file mode 100644
index 0000000000..ac8dba7e3c
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionSourceProviderTest.cs
@@ -0,0 +1,101 @@
+// 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;
+using System.Collections.ObjectModel;
+using Microsoft.CodeAnalysis.Razor;
+using Microsoft.VisualStudio.Text;
+using Microsoft.VisualStudio.Text.Editor;
+using Microsoft.VisualStudio.Text.Projection;
+using Microsoft.VisualStudio.Utilities;
+using Moq;
+using Xunit;
+
+namespace Microsoft.VisualStudio.Editor.Razor
+{
+    public class RazorDirectiveCompletionSourceProviderTest : ForegroundDispatcherTestBase
+    {
+        private IContentType RazorContentType { get; } = Mock.Of<IContentType>(c => c.IsOfType(RazorLanguage.ContentType) == true);
+
+        private IContentType NonRazorContentType { get; } = Mock.Of<IContentType>(c => c.IsOfType(It.IsAny<string>()) == false);
+
+        private RazorCompletionFactsService CompletionFactsService { get; } = Mock.Of<RazorCompletionFactsService>();
+
+        [Fact]
+        public void CreateCompletionSource_ReturnsNullIfParserHasNotBeenAssocitedWithRazorBuffer()
+        {
+            // Arrange
+            var expectedParser = Mock.Of<VisualStudioRazorParser>();
+            var properties = new PropertyCollection();
+            properties.AddProperty(typeof(VisualStudioRazorParser), expectedParser);
+            var razorBuffer = Mock.Of<ITextBuffer>(buffer => buffer.ContentType == RazorContentType && buffer.Properties == properties);
+            var completionSourceProvider = new RazorDirectiveCompletionSourceProvider(Dispatcher, CompletionFactsService);
+
+            // Act
+            var completionSource = completionSourceProvider.CreateCompletionSource(razorBuffer);
+
+            // Assert
+            var completionSourceImpl = Assert.IsType<RazorDirectiveCompletionSource>(completionSource);
+            Assert.Same(expectedParser, completionSourceImpl._parser);
+        }
+
+        [Fact]
+        public void CreateCompletionSource_CreatesACompletionSourceWithTextBuffersParser()
+        {
+            // Arrange
+            var razorBuffer = Mock.Of<ITextBuffer>(buffer => buffer.ContentType == RazorContentType && buffer.Properties == new PropertyCollection());
+            var completionSourceProvider = new RazorDirectiveCompletionSourceProvider(Dispatcher, CompletionFactsService);
+
+            // Act
+            var completionSource = completionSourceProvider.CreateCompletionSource(razorBuffer);
+
+            // Assert
+            Assert.Null(completionSource);
+        }
+
+        [Fact]
+        public void GetOrCreate_ReturnsNullIfRazorBufferHasNotBeenAssociatedWithTextView()
+        {
+            // Arrange
+            var textView = CreateTextView(NonRazorContentType, new PropertyCollection());
+            var completionSourceProvider = new RazorDirectiveCompletionSourceProvider(Dispatcher, CompletionFactsService);
+
+            // Act
+            var completionSource = completionSourceProvider.GetOrCreate(textView);
+
+            // Assert
+            Assert.Null(completionSource);
+        }
+
+        [Fact]
+        public void GetOrCreate_CachesCompletionSource()
+        {
+            // Arrange
+            var expectedParser = Mock.Of<VisualStudioRazorParser>();
+            var properties = new PropertyCollection();
+            properties.AddProperty(typeof(VisualStudioRazorParser), expectedParser);
+            var textView = CreateTextView(RazorContentType, properties);
+            var completionSourceProvider = new RazorDirectiveCompletionSourceProvider(Dispatcher, CompletionFactsService);
+
+            // Act
+            var completionSource1 = completionSourceProvider.GetOrCreate(textView);
+            var completionSource2 = completionSourceProvider.GetOrCreate(textView);
+
+            // Assert
+            Assert.Same(completionSource1, completionSource2);
+        }
+
+        private static ITextView CreateTextView(IContentType contentType, PropertyCollection properties)
+        {
+            var bufferGraph = new Mock<IBufferGraph>();
+            bufferGraph.Setup(graph => graph.GetTextBuffers(It.IsAny<Predicate<ITextBuffer>>()))
+                .Returns(new Collection<ITextBuffer>()
+                {
+                    Mock.Of<ITextBuffer>(buffer => buffer.ContentType == contentType && buffer.Properties == properties)
+                });
+            var textView = Mock.Of<ITextView>(view => view.BufferGraph == bufferGraph.Object);
+
+            return textView;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionSourceTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionSourceTest.cs
new file mode 100644
index 0000000000..6050dfece3
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionSourceTest.cs
@@ -0,0 +1,175 @@
+// 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.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Extensions;
+using Microsoft.AspNetCore.Razor.Language.Legacy;
+using Microsoft.CodeAnalysis.Razor;
+using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion;
+using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion.Data;
+using Microsoft.VisualStudio.Text;
+using Moq;
+using Xunit;
+using Span = Microsoft.VisualStudio.Text.Span;
+
+namespace Microsoft.VisualStudio.Editor.Razor
+{
+    public class RazorDirectiveCompletionSourceTest : ForegroundDispatcherTestBase
+    {
+        private static readonly IReadOnlyList<DirectiveDescriptor> DefaultDirectives = new[]
+        {
+            CSharpCodeParser.AddTagHelperDirectiveDescriptor,
+            CSharpCodeParser.RemoveTagHelperDirectiveDescriptor,
+            CSharpCodeParser.TagHelperPrefixDirectiveDescriptor,
+        };
+
+        private RazorCompletionFactsService CompletionFactsService { get; } = new DefaultRazorCompletionFactsService();
+
+        [ForegroundFact]
+        public async Task GetCompletionContextAsync_DoesNotProvideCompletionsPriorToParseResults()
+        {
+            // Arrange
+            var text = "@validCompletion";
+            var parser = Mock.Of<VisualStudioRazorParser>(); // CodeDocument will be null faking a parser without a parse.
+            var completionSource = new RazorDirectiveCompletionSource(Dispatcher, parser, CompletionFactsService);
+            var documentSnapshot = new StringTextSnapshot(text);
+            var triggerLocation = new SnapshotPoint(documentSnapshot, 4);
+            var applicableSpan = new SnapshotSpan(documentSnapshot, new Span(1, text.Length - 1 /* validCompletion */));
+
+            // Act
+            var completionContext = await Task.Run(
+                async () => await completionSource.GetCompletionContextAsync(null, new CompletionTrigger(CompletionTriggerReason.Invoke, triggerLocation.Snapshot), triggerLocation, applicableSpan, CancellationToken.None));
+
+            // Assert
+            Assert.Empty(completionContext.Items);
+        }
+
+        [ForegroundFact]
+        public async Task GetCompletionContextAsync_DoesNotProvideCompletionsWhenNotAtCompletionPoint()
+        {
+            // Arrange
+            var text = "@(NotValidCompletionLocation)";
+            var parser = CreateParser(text);
+            var completionSource = new RazorDirectiveCompletionSource(Dispatcher, parser, CompletionFactsService);
+            var documentSnapshot = new StringTextSnapshot(text);
+            var triggerLocation = new SnapshotPoint(documentSnapshot, 4);
+            var applicableSpan = new SnapshotSpan(documentSnapshot, new Span(2, text.Length - 3 /* @() */));
+
+            // Act
+            var completionContext = await Task.Run(
+                async () => await completionSource.GetCompletionContextAsync(null, new CompletionTrigger(CompletionTriggerReason.Invoke, triggerLocation.Snapshot), triggerLocation, applicableSpan, CancellationToken.None));
+
+            // Assert
+            Assert.Empty(completionContext.Items);
+        }
+
+        // This is more of an integration level test validating the end-to-end completion flow.
+        [ForegroundFact]
+        public async Task GetCompletionContextAsync_ProvidesCompletionsWhenAtCompletionPoint()
+        {
+            // Arrange
+            var text = "@addTag";
+            var parser = CreateParser(text, SectionDirective.Directive);
+            var completionSource = new RazorDirectiveCompletionSource(Dispatcher, parser, CompletionFactsService);
+            var documentSnapshot = new StringTextSnapshot(text);
+            var triggerLocation = new SnapshotPoint(documentSnapshot, 4);
+            var applicableSpan = new SnapshotSpan(documentSnapshot, new Span(1, 6 /* addTag */));
+
+            // Act
+            var completionContext = await Task.Run(
+                async () => await completionSource.GetCompletionContextAsync(null, new CompletionTrigger(CompletionTriggerReason.Invoke, triggerLocation.Snapshot), triggerLocation, applicableSpan, CancellationToken.None));
+
+            // Assert
+            Assert.Collection(
+                completionContext.Items,
+                item => AssertRazorCompletionItem(SectionDirective.Directive, item, completionSource),
+                item => AssertRazorCompletionItem(DefaultDirectives[0], item, completionSource),
+                item => AssertRazorCompletionItem(DefaultDirectives[1], item, completionSource),
+                item => AssertRazorCompletionItem(DefaultDirectives[2], item, completionSource));
+        }
+
+        [Fact]
+        public async Task GetDescriptionAsync_AddsDirectiveDescriptionIfPropertyExists()
+        {
+            // Arrange
+            var completionItem = new CompletionItem("TestDirective", Mock.Of<IAsyncCompletionSource>());
+            var expectedDescription = "The expected description";
+            completionItem.Properties.AddProperty(RazorDirectiveCompletionSource.DescriptionKey, expectedDescription);
+            var completionSource = new RazorDirectiveCompletionSource(Dispatcher, Mock.Of<VisualStudioRazorParser>(), CompletionFactsService);
+
+            // Act
+            var descriptionObject = await completionSource.GetDescriptionAsync(null, completionItem, CancellationToken.None);
+
+            // Assert
+            var description = Assert.IsType<string>(descriptionObject);
+            Assert.Equal(expectedDescription, descriptionObject);
+        }
+
+        [Fact]
+        public async Task GetDescriptionAsync_DoesNotAddDescriptionWhenPropertyAbsent()
+        {
+            // Arrange
+            var completionItem = new CompletionItem("TestDirective", Mock.Of<IAsyncCompletionSource>());
+            var completionSource = new RazorDirectiveCompletionSource(Dispatcher, Mock.Of<VisualStudioRazorParser>(), CompletionFactsService);
+
+            // Act
+            var descriptionObject = await completionSource.GetDescriptionAsync(null, completionItem, CancellationToken.None);
+
+            // Assert
+            var description = Assert.IsType<string>(descriptionObject);
+            Assert.Equal(string.Empty, description);
+        }
+
+        private static void AssertRazorCompletionItem(string completionDisplayText, DirectiveDescriptor directive, CompletionItem item, IAsyncCompletionSource source)
+        {
+            Assert.Equal(item.DisplayText, completionDisplayText);
+            Assert.Equal(item.FilterText, completionDisplayText);
+            Assert.Equal(item.InsertText, directive.Directive);
+            Assert.Same(item.Source, source);
+            Assert.True(item.Properties.TryGetProperty<string>(RazorDirectiveCompletionSource.DescriptionKey, out var actualDescription));
+            Assert.Equal(directive.Description, actualDescription);
+
+            AssertRazorCompletionItemDefaults(item);
+        }
+
+        private static void AssertRazorCompletionItem(DirectiveDescriptor directive, CompletionItem item, IAsyncCompletionSource source) =>
+            AssertRazorCompletionItem(directive.Directive, directive, item, source);
+
+        private static void AssertRazorCompletionItemDefaults(CompletionItem item)
+        {
+            Assert.Equal(item.Icon.ImageId.Guid, RazorDirectiveCompletionSource.DirectiveImageGlyph.ImageId.Guid);
+            var filter = Assert.Single(item.Filters);
+            Assert.Same(RazorDirectiveCompletionSource.DirectiveCompletionFilters[0], filter);
+            Assert.Equal(string.Empty, item.Suffix);
+            Assert.Equal(item.DisplayText, item.SortText);
+            Assert.Empty(item.AttributeIcons);
+        }
+
+        private static VisualStudioRazorParser CreateParser(string text, params DirectiveDescriptor[] directives)
+        {
+            var syntaxTree = CreateSyntaxTree(text, directives);
+            var codeDocument = TestRazorCodeDocument.Create(text);
+            codeDocument.SetSyntaxTree(syntaxTree);
+            var parser = Mock.Of<VisualStudioRazorParser>(p => p.CodeDocument == codeDocument);
+
+            return parser;
+        }
+
+        private static RazorSyntaxTree CreateSyntaxTree(string text, params DirectiveDescriptor[] directives)
+        {
+            var sourceDocument = TestRazorSourceDocument.Create(text);
+            var options = RazorParserOptions.Create(builder =>
+            {
+                foreach (var directive in directives)
+                {
+                    builder.Directives.Add(directive);
+                }
+            });
+            var syntaxTree = RazorSyntaxTree.Parse(sourceDocument, options);
+            return syntaxTree;
+        }
+    }
+}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorSyntaxTreePartialParserTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorSyntaxTreePartialParserTest.cs
index 8b5ee4ef5a..aede704a51 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorSyntaxTreePartialParserTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorSyntaxTreePartialParserTest.cs
@@ -1,7 +1,6 @@
 // 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;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc.Razor.Extensions;
 using Microsoft.AspNetCore.Razor.Language;
@@ -12,8 +11,10 @@ using Xunit;
 
 namespace Microsoft.VisualStudio.Editor.Razor
 {
-    public class RazorSyntaxTreePartialParserTest
+    public class RazorSyntaxTreePartialParserTest : PartialParserTestBase
     {
+        private const string NewLine = "\r\n";
+
         public static TheoryData TagHelperPartialParseRejectData
         {
             get
@@ -62,8 +63,6 @@ namespace Microsoft.VisualStudio.Editor.Razor
         {
             get
             {
-                var factory = new SpanFactory();
-
                 // change, (Block)expectedDocument, partialParseResult
                 return new TheoryData<TestEdit, PartialParseResultInternal>
                 {
@@ -131,75 +130,44 @@ namespace Microsoft.VisualStudio.Editor.Razor
         }
 
         [Fact]
-        public void ImplicitExpressionAcceptsInnerInsertionsInStatementBlock()
+        public void ImpExprAcceptsInnerInsertionsInStatementBlock()
         {
             // Arrange
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("@{" + Environment.NewLine
-                                                    + "    @DateTime..Now" + Environment.NewLine
+            var changed = new StringTextSnapshot("@{" + NewLine
+                                                    + "    @DateTime..Now" + NewLine
                                                     + "}");
-            var old = new StringTextSnapshot("@{" + Environment.NewLine
-                                                + "    @DateTime.Now" + Environment.NewLine
+            var old = new StringTextSnapshot("@{" + NewLine
+                                                + "    @DateTime.Now" + NewLine
                                                 + "}");
 
             // Act and Assert
-            RunPartialParseTest(new TestEdit(17, 0, old, 1, changed, "."),
-                new MarkupBlock(
-                    factory.EmptyHtml(),
-                    new StatementBlock(
-                        factory.CodeTransition(),
-                        factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                        factory.Code(Environment.NewLine + "    ")
-                            .AsStatement()
-                            .AutoCompleteWith(autoCompleteString: null),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("DateTime..Now")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords, acceptTrailingDot: true)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Code(Environment.NewLine).AsStatement(),
-                        factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)),
-                    factory.EmptyHtml()));
+            RunPartialParseTest(new TestEdit(17, 0, old, 1, changed, "."));
         }
 
         [Fact]
-        public void ImplicitExpressionAcceptsInnerInsertions()
+        public void ImpExprAcceptsInnerInsertions()
         {
             // Arrange
-            var factory = new SpanFactory();
             var changed = new StringTextSnapshot("foo @DateTime..Now baz");
             var old = new StringTextSnapshot("foo @DateTime.Now baz");
 
             // Act and Assert
-            RunPartialParseTest(new TestEdit(13, 0, old, 1, changed, "."),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("DateTime..Now").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")), additionalFlags: PartialParseResultInternal.Provisional);
+            RunPartialParseTest(new TestEdit(13, 0, old, 1, changed, "."), additionalFlags: PartialParseResultInternal.Provisional);
         }
 
         [Fact]
-        public void ImplicitExpressionAcceptsWholeIdentifierReplacement()
+        public void ImpExprAcceptsWholeIdentifierReplacement()
         {
             // Arrange
-            var factory = new SpanFactory();
             var old = new StringTextSnapshot("foo @date baz");
             var changed = new StringTextSnapshot("foo @DateTime baz");
 
             // Act and Assert
-            RunPartialParseTest(new TestEdit(5, 4, old, 8, changed, "DateTime"),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("DateTime").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")));
+            RunPartialParseTest(new TestEdit(5, 4, old, 8, changed, "DateTime"));
         }
 
         [Fact]
-        public void ImplicitExpressionRejectsWholeIdentifierReplacementToKeyword()
+        public void ImpExprRejectsWholeIdentifierReplacementToKeyword()
         {
             // Arrange
             var old = new StringTextSnapshot("foo @date baz");
@@ -211,7 +179,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
         }
 
         [Fact]
-        public void ImplicitExpressionRejectsWholeIdentifierReplacementToDirective()
+        public void ImpExprRejectsWholeIdentifierReplacementToDirective()
         {
             // Arrange
             var old = new StringTextSnapshot("foo @date baz");
@@ -223,327 +191,162 @@ namespace Microsoft.VisualStudio.Editor.Razor
         }
 
         [Fact]
-        public void ImplicitExpressionAcceptsPrefixIdentifierReplacements_SingleSymbol()
+        public void ImpExprAcceptsPrefixIdentifierReplacements_SingleSymbol()
         {
             // Arrange
-            var factory = new SpanFactory();
             var old = new StringTextSnapshot("foo @dTime baz");
             var changed = new StringTextSnapshot("foo @DateTime baz");
 
             // Act and Assert
-            RunPartialParseTest(new TestEdit(5, 1, old, 4, changed, "Date"),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("DateTime").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")));
+            RunPartialParseTest(new TestEdit(5, 1, old, 4, changed, "Date"));
         }
 
         [Fact]
-        public void ImplicitExpressionAcceptsPrefixIdentifierReplacements_MultipleSymbols()
+        public void ImpExprAcceptsPrefixIdentifierReplacements_MultipleSymbols()
         {
             // Arrange
-            var factory = new SpanFactory();
             var old = new StringTextSnapshot("foo @dTime.Now baz");
             var changed = new StringTextSnapshot("foo @DateTime.Now baz");
 
             // Act and Assert
-            RunPartialParseTest(new TestEdit(5, 1, old, 4, changed, "Date"),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("DateTime.Now").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")));
+            RunPartialParseTest(new TestEdit(5, 1, old, 4, changed, "Date"));
         }
 
         [Fact]
-        public void ImplicitExpressionAcceptsSuffixIdentifierReplacements_SingleSymbol()
+        public void ImpExprAcceptsSuffixIdentifierReplacements_SingleSymbol()
         {
             // Arrange
-            var factory = new SpanFactory();
             var old = new StringTextSnapshot("foo @Datet baz");
             var changed = new StringTextSnapshot("foo @DateTime baz");
 
             // Act and Assert
-            RunPartialParseTest(new TestEdit(9, 1, old, 4, changed, "Time"),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("DateTime").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")));
+            RunPartialParseTest(new TestEdit(9, 1, old, 4, changed, "Time"));
         }
 
         [Fact]
-        public void ImplicitExpressionAcceptsSuffixIdentifierReplacements_MultipleSymbols()
+        public void ImpExprAcceptsSuffixIdentifierReplacements_MultipleSymbols()
         {
             // Arrange
-            var factory = new SpanFactory();
             var old = new StringTextSnapshot("foo @DateTime.n baz");
             var changed = new StringTextSnapshot("foo @DateTime.Now baz");
 
             // Act and Assert
-            RunPartialParseTest(new TestEdit(14, 1, old, 3, changed, "Now"),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("DateTime.Now").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")));
+            RunPartialParseTest(new TestEdit(14, 1, old, 3, changed, "Now"));
         }
 
         [Fact]
-        public void ImplicitExpressionAcceptsSurroundedIdentifierReplacements()
+        public void ImpExprAcceptsSurroundedIdentifierReplacements()
         {
             // Arrange
-            var factory = new SpanFactory();
             var old = new StringTextSnapshot("foo @DateTime.n.ToString() baz");
             var changed = new StringTextSnapshot("foo @DateTime.Now.ToString() baz");
 
             // Act and Assert
-            RunPartialParseTest(new TestEdit(14, 1, old, 3, changed, "Now"),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("DateTime.Now.ToString()").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")));
+            RunPartialParseTest(new TestEdit(14, 1, old, 3, changed, "Now"));
         }
 
         [Fact]
-        public void ImplicitExpressionProvisionallyAcceptsDeleteOfIdentifierPartsIfDotRemains()
+        public void ImpExprProvisionallyAcceptsDeleteOfIdentifierPartsIfDotRemains()
         {
-            var factory = new SpanFactory();
             var changed = new StringTextSnapshot("foo @User. baz");
             var old = new StringTextSnapshot("foo @User.Name baz");
             RunPartialParseTest(new TestEdit(10, 4, old, 0, changed, string.Empty),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("User.").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")),
                 additionalFlags: PartialParseResultInternal.Provisional);
         }
 
         [Fact]
-        public void ImplicitExpressionAcceptsDeleteOfIdentifierPartsIfSomeOfIdentifierRemains()
+        public void ImpExprAcceptsDeleteOfIdentifierPartsIfSomeOfIdentifierRemains()
         {
-            var factory = new SpanFactory();
             var changed = new StringTextSnapshot("foo @Us baz");
             var old = new StringTextSnapshot("foo @User baz");
-            RunPartialParseTest(new TestEdit(7, 2, old, 0, changed, string.Empty),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("Us").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")));
+            RunPartialParseTest(new TestEdit(7, 2, old, 0, changed, string.Empty));
         }
 
         [Fact]
-        public void ImplicitExpressionProvisionallyAcceptsMultipleInsertionIfItCausesIdentifierExpansionAndTrailingDot()
+        public void ImpExprProvisionalForMultipleInsertionIfItCausesIdentifierExpansionAndTrailingDot()
         {
-            var factory = new SpanFactory();
+            // ImpExprProvisionallyAcceptsMultipleInsertionIfItCausesIdentifierExpansionAndTrailingDot
             var changed = new StringTextSnapshot("foo @User. baz");
             var old = new StringTextSnapshot("foo @U baz");
             RunPartialParseTest(new TestEdit(6, 0, old, 4, changed, "ser."),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("User.").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")),
                 additionalFlags: PartialParseResultInternal.Provisional);
         }
 
         [Fact]
-        public void ImplicitExpressionAcceptsMultipleInsertionIfItOnlyCausesIdentifierExpansion()
+        public void ImpExprAcceptsMultipleInsertionIfItOnlyCausesIdentifierExpansion()
         {
-            var factory = new SpanFactory();
             var changed = new StringTextSnapshot("foo @barbiz baz");
             var old = new StringTextSnapshot("foo @bar baz");
-            RunPartialParseTest(new TestEdit(8, 0, old, 3, changed, "biz"),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("barbiz").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" baz")));
+            RunPartialParseTest(new TestEdit(8, 0, old, 3, changed, "biz"));
         }
 
         [Fact]
-        public void ImplicitExpressionAcceptsIdentifierExpansionAtEndOfNonWhitespaceCharacters()
+        public void ImpExprAcceptsIdentifierExpansionAtEndOfNonWhitespaceCharacters()
         {
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("@{" + Environment.NewLine
-                                                    + "    @food" + Environment.NewLine
+            var changed = new StringTextSnapshot("@{" + NewLine
+                                                    + "    @food" + NewLine
                                                     + "}");
-            var old = new StringTextSnapshot("@{" + Environment.NewLine
-                                                + "    @foo" + Environment.NewLine
+            var old = new StringTextSnapshot("@{" + NewLine
+                                                + "    @foo" + NewLine
                                                 + "}");
-            RunPartialParseTest(new TestEdit(10 + Environment.NewLine.Length, 0, old, 1, changed, "d"),
-                new MarkupBlock(
-                    factory.EmptyHtml(),
-                    new StatementBlock(
-                        factory.CodeTransition(),
-                        factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                        factory.Code(Environment.NewLine + "    ")
-                            .AsStatement()
-                            .AutoCompleteWith(autoCompleteString: null),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("food")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords, acceptTrailingDot: true)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Code(Environment.NewLine).AsStatement(),
-                        factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)),
-                    factory.EmptyHtml()));
+            RunPartialParseTest(new TestEdit(10 + NewLine.Length, 0, old, 1, changed, "d"));
         }
 
         [Fact]
-        public void ImplicitExpressionAcceptsIdentifierAfterDotAtEndOfNonWhitespaceCharacters()
+        public void ImpExprAcceptsIdentifierAfterDotAtEndOfNonWhitespaceCharacters()
         {
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("@{" + Environment.NewLine
-                                                    + "    @foo.d" + Environment.NewLine
+            var changed = new StringTextSnapshot("@{" + NewLine
+                                                    + "    @foo.d" + NewLine
                                                     + "}");
-            var old = new StringTextSnapshot("@{" + Environment.NewLine
-                                                + "    @foo." + Environment.NewLine
+            var old = new StringTextSnapshot("@{" + NewLine
+                                                + "    @foo." + NewLine
                                                 + "}");
-            RunPartialParseTest(new TestEdit(11 + Environment.NewLine.Length, 0, old, 1, changed, "d"),
-                new MarkupBlock(
-                    factory.EmptyHtml(),
-                    new StatementBlock(
-                        factory.CodeTransition(),
-                        factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                        factory.Code(Environment.NewLine + "    ")
-                            .AsStatement()
-                            .AutoCompleteWith(autoCompleteString: null),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("foo.d")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords, acceptTrailingDot: true)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Code(Environment.NewLine).AsStatement(),
-                        factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)),
-                    factory.EmptyHtml()));
+            RunPartialParseTest(new TestEdit(11 + NewLine.Length, 0, old, 1, changed, "d"));
         }
 
         [Fact]
-        public void ImplicitExpressionAcceptsDotAtEndOfNonWhitespaceCharacters()
+        public void ImpExprAcceptsDotAtEndOfNonWhitespaceCharacters()
         {
-            var factory = new SpanFactory();
-            var changed = new StringTextSnapshot("@{" + Environment.NewLine
-                                                    + "    @foo." + Environment.NewLine
+            var changed = new StringTextSnapshot("@{" + NewLine
+                                                    + "    @foo." + NewLine
                                                     + "}");
-            var old = new StringTextSnapshot("@{" + Environment.NewLine
-                                                + "    @foo" + Environment.NewLine
+            var old = new StringTextSnapshot("@{" + NewLine
+                                                + "    @foo" + NewLine
                                                 + "}");
-            RunPartialParseTest(new TestEdit(10 + Environment.NewLine.Length, 0, old, 1, changed, "."),
-                new MarkupBlock(
-                    factory.EmptyHtml(),
-                    new StatementBlock(
-                        factory.CodeTransition(),
-                        factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                        factory.Code(Environment.NewLine + "    ")
-                            .AsStatement()
-                            .AutoCompleteWith(autoCompleteString: null),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code(@"foo.")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords, acceptTrailingDot: true)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.Code(Environment.NewLine).AsStatement(),
-                        factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)),
-                    factory.EmptyHtml()));
+            RunPartialParseTest(new TestEdit(10 + NewLine.Length, 0, old, 1, changed, "."));
         }
 
         [Fact]
-        public void ImplicitExpressionProvisionallyAcceptsDotAfterIdentifierInMarkup()
+        public void ImpExprProvisionallyAcceptsDotAfterIdentifierInMarkup()
         {
-            var factory = new SpanFactory();
             var changed = new StringTextSnapshot("foo @foo. bar");
             var old = new StringTextSnapshot("foo @foo bar");
             RunPartialParseTest(new TestEdit(8, 0, old, 1, changed, "."),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("foo.")
-                               .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                               .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" bar")),
                 additionalFlags: PartialParseResultInternal.Provisional);
         }
 
         [Fact]
-        public void ImplicitExpressionAcceptsAdditionalIdentifierCharactersIfEndOfSpanIsIdentifier()
+        public void ImpExprAcceptsAdditionalIdentifierCharactersIfEndOfSpanIsIdentifier()
         {
-            var factory = new SpanFactory();
             var changed = new StringTextSnapshot("foo @foob bar");
             var old = new StringTextSnapshot("foo @foo bar");
-            RunPartialParseTest(new TestEdit(8, 0, old, 1, changed, "b"),
-                new MarkupBlock(
-                    factory.Markup("foo "),
-                    new ExpressionBlock(
-                        factory.CodeTransition(),
-                        factory.Code("foob")
-                               .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                               .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                    factory.Markup(" bar")));
+            RunPartialParseTest(new TestEdit(8, 0, old, 1, changed, "b"));
         }
 
         [Fact]
-        public void ImplicitExpressionAcceptsAdditionalIdentifierStartCharactersIfEndOfSpanIsDot()
+        public void ImpExprAcceptsAdditionalIdentifierStartCharactersIfEndOfSpanIsDot()
         {
-            var factory = new SpanFactory();
             var changed = new StringTextSnapshot("@{@foo.b}");
             var old = new StringTextSnapshot("@{@foo.}");
-            RunPartialParseTest(new TestEdit(7, 0, old, 1, changed, "b"),
-                new MarkupBlock(
-                    factory.EmptyHtml(),
-                    new StatementBlock(
-                        factory.CodeTransition(),
-                        factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                        factory.EmptyCSharp()
-                            .AsStatement()
-                            .AutoCompleteWith(autoCompleteString: null),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("foo.b")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords, acceptTrailingDot: true)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.EmptyCSharp().AsStatement(),
-                        factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)),
-                    factory.EmptyHtml()));
+            RunPartialParseTest(new TestEdit(7, 0, old, 1, changed, "b"));
         }
 
         [Fact]
-        public void ImplicitExpressionAcceptsDotIfTrailingDotsAreAllowed()
+        public void ImpExprAcceptsDotIfTrailingDotsAreAllowed()
         {
-            var factory = new SpanFactory();
             var changed = new StringTextSnapshot("@{@foo.}");
             var old = new StringTextSnapshot("@{@foo}");
-            RunPartialParseTest(new TestEdit(6, 0, old, 1, changed, "."),
-                new MarkupBlock(
-                    factory.EmptyHtml(),
-                    new StatementBlock(
-                        factory.CodeTransition(),
-                        factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                        factory.EmptyCSharp()
-                            .AsStatement()
-                            .AutoCompleteWith(autoCompleteString: null),
-                        new ExpressionBlock(
-                            factory.CodeTransition(),
-                            factory.Code("foo.")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords, acceptTrailingDot: true)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)),
-                        factory.EmptyCSharp().AsStatement(),
-                        factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)),
-                    factory.EmptyHtml()));
+            RunPartialParseTest(new TestEdit(6, 0, old, 1, changed, "."));
         }
 
         private void RunPartialParseRejectionTest(TestEdit edit, PartialParseResultInternal additionalFlags = 0)
@@ -558,7 +361,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
             Assert.Equal(PartialParseResultInternal.Rejected | additionalFlags, result);
         }
 
-        private static void RunPartialParseTest(TestEdit edit, Block expectedTree, PartialParseResultInternal additionalFlags = 0)
+        private void RunPartialParseTest(TestEdit edit, PartialParseResultInternal additionalFlags = 0)
         {
             var templateEngine = CreateProjectEngine();
             var document = TestRazorCodeDocument.Create(edit.OldSnapshot.GetText());
@@ -568,7 +371,10 @@ namespace Microsoft.VisualStudio.Editor.Razor
 
             var result = parser.Parse(edit.Change);
             Assert.Equal(PartialParseResultInternal.Accepted | additionalFlags, result);
-            ParserTestBase.EvaluateParseTree(parser.SyntaxTreeRoot, expectedTree);
+
+            var newSource = TestRazorSourceDocument.Create(edit.NewSnapshot.GetText());
+            var newSyntaxTree = RazorSyntaxTree.Create(parser.ModifiedSyntaxTreeRoot, newSource, parser.OriginalSyntaxTree.Diagnostics, parser.OriginalSyntaxTree.Options);
+            BaselineTest(newSyntaxTree);
         }
 
         private static TestEdit CreateInsertionChange(string initialText, int insertionLocation, string insertionText)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Shared/ForegroundDispatcherWorkspaceTestBase.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Shared/ForegroundDispatcherWorkspaceTestBase.cs
new file mode 100644
index 0000000000..495b0ff172
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Shared/ForegroundDispatcherWorkspaceTestBase.cs
@@ -0,0 +1,12 @@
+// 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 Microsoft.CodeAnalysis.Razor;
+
+namespace Xunit
+{
+    public abstract class ForegroundDispatcherWorkspaceTestBase : WorkspaceTestBase
+    {
+        internal ForegroundDispatcher Dispatcher { get; } = new SingleThreadedForegroundDispatcher();
+    }
+}
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/AwaitPeriodInsertionAcceptedProvisionally.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/AwaitPeriodInsertionAcceptedProvisionally.cspans.txt
new file mode 100644
index 0000000000..bbc7c7dc72
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/AwaitPeriodInsertionAcceptedProvisionally.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml)
+Transition span at (4:0,4 [1] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [11] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml)
+Code span at (5:0,5 [10] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml) (Accepts:AnyExceptNewline) - Parent: Expression block at (4:0,4 [11] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml)
+Markup span at (15:0,15 [5] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [20] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/AwaitPeriodInsertionAcceptedProvisionally.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/AwaitPeriodInsertionAcceptedProvisionally.stree.txt
new file mode 100644
index 0000000000..121b1377a9
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/AwaitPeriodInsertionAcceptedProvisionally.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..20)::20 - [foo @await Html. baz]
+    MarkupBlock - [0..20)::20
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..15)::11
+            CSharpImplicitExpression - [4..15)::11
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..15)::10
+                    CSharpCodeBlock - [5..15)::10
+                        CSharpExpressionLiteral - [5..15)::10 - [await Html] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:AnyExceptNewline;ImplicitExpression[RTD];K20
+                            Keyword;[await];
+                            Whitespace;[ ];
+                            Identifier;[Html];
+        MarkupTextLiteral - [15..20)::5 - [. baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[.];
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStatementBlock.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStatementBlock.cspans.txt
new file mode 100644
index 0000000000..a4b12a97e6
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStatementBlock.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] test.cshtml)
+Transition span at (0:0,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [18] test.cshtml)
+MetaCode span at (1:0,1 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [18] test.cshtml)
+Code span at (2:0,2 [6] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [18] test.cshtml)
+Transition span at (8:1,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (8:1,4 [7] test.cshtml)
+Code span at (9:1,5 [6] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (8:1,4 [7] test.cshtml)
+Code span at (15:1,11 [2] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [18] test.cshtml)
+MetaCode span at (17:2,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [18] test.cshtml)
+Markup span at (18:2,1 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStatementBlock.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStatementBlock.stree.txt
new file mode 100644
index 0000000000..1160d352db
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStatementBlock.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..18)::18 - [@{LF    @DateT.LF}]
+    MarkupBlock - [0..18)::18
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..18)::18
+            CSharpStatement - [0..18)::18
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..18)::17
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..17)::15
+                        CSharpStatementLiteral - [2..8)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        CSharpCodeBlock - [8..15)::7
+                            CSharpImplicitExpression - [8..15)::7
+                                CSharpTransition - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [9..15)::6
+                                    CSharpCodeBlock - [9..15)::6
+                                        CSharpExpressionLiteral - [9..15)::6 - [DateT.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K20
+                                            Identifier;[DateT];
+                                            Dot;[.];
+                        CSharpStatementLiteral - [15..17)::2 - [LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                    RazorMetaCode - [17..18)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [18..18)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStatementBlock_1.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStatementBlock_1.cspans.txt
new file mode 100644
index 0000000000..b2646ea53b
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStatementBlock_1.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] test.cshtml)
+Transition span at (0:0,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [21] test.cshtml)
+MetaCode span at (1:0,1 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [21] test.cshtml)
+Code span at (2:0,2 [6] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [21] test.cshtml)
+Transition span at (8:1,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (8:1,4 [10] test.cshtml)
+Code span at (9:1,5 [9] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (8:1,4 [10] test.cshtml)
+Code span at (18:1,14 [2] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [21] test.cshtml)
+MetaCode span at (20:2,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [21] test.cshtml)
+Markup span at (21:2,1 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStatementBlock_1.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStatementBlock_1.stree.txt
new file mode 100644
index 0000000000..76908cbb40
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStatementBlock_1.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..21)::21 - [@{LF    @DateTime.LF}]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            CSharpStatement - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..21)::20
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..20)::18
+                        CSharpStatementLiteral - [2..8)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        CSharpCodeBlock - [8..18)::10
+                            CSharpImplicitExpression - [8..18)::10
+                                CSharpTransition - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [9..18)::9
+                                    CSharpCodeBlock - [9..18)::9
+                                        CSharpExpressionLiteral - [9..18)::9 - [DateTime.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K20
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                        CSharpStatementLiteral - [18..20)::2 - [LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                    RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStmtBlkAfterIdentifiers.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStmtBlkAfterIdentifiers.cspans.txt
new file mode 100644
index 0000000000..b2646ea53b
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStmtBlkAfterIdentifiers.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] test.cshtml)
+Transition span at (0:0,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [21] test.cshtml)
+MetaCode span at (1:0,1 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [21] test.cshtml)
+Code span at (2:0,2 [6] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [21] test.cshtml)
+Transition span at (8:1,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (8:1,4 [10] test.cshtml)
+Code span at (9:1,5 [9] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (8:1,4 [10] test.cshtml)
+Code span at (18:1,14 [2] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [21] test.cshtml)
+MetaCode span at (20:2,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [21] test.cshtml)
+Markup span at (21:2,1 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStmtBlkAfterIdentifiers.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStmtBlkAfterIdentifiers.stree.txt
new file mode 100644
index 0000000000..76908cbb40
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStmtBlkAfterIdentifiers.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..21)::21 - [@{LF    @DateTime.LF}]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..21)::21
+            CSharpStatement - [0..21)::21
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..21)::20
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..20)::18
+                        CSharpStatementLiteral - [2..8)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        CSharpCodeBlock - [8..18)::10
+                            CSharpImplicitExpression - [8..18)::10
+                                CSharpTransition - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [9..18)::9
+                                    CSharpCodeBlock - [9..18)::9
+                                        CSharpExpressionLiteral - [9..18)::9 - [DateTime.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K20
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                        CSharpStatementLiteral - [18..20)::2 - [LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                    RazorMetaCode - [20..21)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [21..21)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStmtBlkAfterIdentifiers_1.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStmtBlkAfterIdentifiers_1.cspans.txt
new file mode 100644
index 0000000000..7a8781a06c
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStmtBlkAfterIdentifiers_1.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] test.cshtml)
+Transition span at (0:0,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [22] test.cshtml)
+MetaCode span at (1:0,1 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [22] test.cshtml)
+Code span at (2:0,2 [6] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [22] test.cshtml)
+Transition span at (8:1,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (8:1,4 [11] test.cshtml)
+Code span at (9:1,5 [10] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (8:1,4 [11] test.cshtml)
+Code span at (19:1,15 [2] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [22] test.cshtml)
+MetaCode span at (21:2,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [22] test.cshtml)
+Markup span at (22:2,1 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStmtBlkAfterIdentifiers_1.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStmtBlkAfterIdentifiers_1.stree.txt
new file mode 100644
index 0000000000..c1c2a9d50a
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStmtBlkAfterIdentifiers_1.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..22)::22 - [@{LF    @DateTime..LF}]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..22)::22
+            CSharpStatement - [0..22)::22
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..22)::21
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..21)::19
+                        CSharpStatementLiteral - [2..8)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        CSharpCodeBlock - [8..19)::11
+                            CSharpImplicitExpression - [8..19)::11
+                                CSharpTransition - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [9..19)::10
+                                    CSharpCodeBlock - [9..19)::10
+                                        CSharpExpressionLiteral - [9..19)::10 - [DateTime..] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K20
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                                            Dot;[.];
+                        CSharpStatementLiteral - [19..21)::2 - [LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                    RazorMetaCode - [21..22)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [22..22)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStmtBlkAfterIdentifiers_2.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStmtBlkAfterIdentifiers_2.cspans.txt
new file mode 100644
index 0000000000..bf6002d7e6
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStmtBlkAfterIdentifiers_2.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] test.cshtml)
+Transition span at (0:0,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [25] test.cshtml)
+MetaCode span at (1:0,1 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [25] test.cshtml)
+Code span at (2:0,2 [6] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] test.cshtml)
+Transition span at (8:1,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (8:1,4 [14] test.cshtml)
+Code span at (9:1,5 [13] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (8:1,4 [14] test.cshtml)
+Code span at (22:1,18 [2] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] test.cshtml)
+MetaCode span at (24:2,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [25] test.cshtml)
+Markup span at (25:2,1 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStmtBlkAfterIdentifiers_2.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStmtBlkAfterIdentifiers_2.stree.txt
new file mode 100644
index 0000000000..735fc2ee9b
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsDCIInStmtBlkAfterIdentifiers_2.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..25)::25 - [@{LF    @DateTime.Now.LF}]
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..25)::25
+            CSharpStatement - [0..25)::25
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..25)::24
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..24)::22
+                        CSharpStatementLiteral - [2..8)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        CSharpCodeBlock - [8..22)::14
+                            CSharpImplicitExpression - [8..22)::14
+                                CSharpTransition - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [9..22)::13
+                                    CSharpCodeBlock - [9..22)::13
+                                        CSharpExpressionLiteral - [9..22)::13 - [DateTime.Now.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K20
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                                            Identifier;[Now];
+                                            Dot;[.];
+                        CSharpStatementLiteral - [22..24)::2 - [LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                    RazorMetaCode - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [25..25)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsIdentifierTypedAfterDotIfLastChangeProvisional.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsIdentifierTypedAfterDotIfLastChangeProvisional.cspans.txt
new file mode 100644
index 0000000000..5532c30c0e
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsIdentifierTypedAfterDotIfLastChangeProvisional.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [6] test.cshtml)
+Code span at (5:0,5 [5] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [6] test.cshtml)
+Markup span at (10:0,10 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsIdentifierTypedAfterDotIfLastChangeProvisional.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsIdentifierTypedAfterDotIfLastChangeProvisional.stree.txt
new file mode 100644
index 0000000000..4c67833b23
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprAcceptsIdentifierTypedAfterDotIfLastChangeProvisional.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..14)::14 - [foo @foo.b bar]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..10)::6
+            CSharpImplicitExpression - [4..10)::6
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..10)::5
+                    CSharpCodeBlock - [5..10)::5
+                        CSharpExpressionLiteral - [5..10)::5 - [foo.b] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[foo];
+                            Dot;[.];
+                            Identifier;[b];
+        MarkupTextLiteral - [10..14)::4 - [ bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[bar];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration.cspans.txt
new file mode 100644
index 0000000000..5532c30c0e
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [6] test.cshtml)
+Code span at (5:0,5 [5] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [6] test.cshtml)
+Markup span at (10:0,10 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration.stree.txt
new file mode 100644
index 0000000000..6d2c0d315b
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..14)::14 - [foo @date. baz]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..10)::6
+            CSharpImplicitExpression - [4..10)::6
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..10)::5
+                    CSharpCodeBlock - [5..10)::5
+                        CSharpExpressionLiteral - [5..10)::5 - [date.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[date];
+                            Dot;[.];
+        MarkupTextLiteral - [10..14)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_1.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_1.cspans.txt
new file mode 100644
index 0000000000..fde3c1b21c
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_1.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [5] test.cshtml)
+Code span at (5:0,5 [4] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [5] test.cshtml)
+Markup span at (9:0,9 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_1.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_1.stree.txt
new file mode 100644
index 0000000000..65c5dd90d8
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_1.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..13)::13 - [foo @date baz]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..9)::5
+            CSharpImplicitExpression - [4..9)::5
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..9)::4
+                    CSharpCodeBlock - [5..9)::4
+                        CSharpExpressionLiteral - [5..9)::4 - [date] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[date];
+        MarkupTextLiteral - [9..13)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_2.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_2.cspans.txt
new file mode 100644
index 0000000000..f507cc7988
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_2.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [9] test.cshtml)
+Code span at (5:0,5 [8] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [9] test.cshtml)
+Markup span at (13:0,13 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_2.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_2.stree.txt
new file mode 100644
index 0000000000..e3ca47e5be
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_2.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..17)::17 - [foo @DateTime baz]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..13)::9
+            CSharpImplicitExpression - [4..13)::9
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..13)::8
+                    CSharpCodeBlock - [5..13)::8
+                        CSharpExpressionLiteral - [5..13)::8 - [DateTime] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[DateTime];
+        MarkupTextLiteral - [13..17)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_3.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_3.cspans.txt
new file mode 100644
index 0000000000..1f69ba4ae4
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_3.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [10] test.cshtml)
+Code span at (5:0,5 [9] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [10] test.cshtml)
+Markup span at (14:0,14 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_3.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_3.stree.txt
new file mode 100644
index 0000000000..e0897aa139
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_3.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..18)::18 - [foo @DateTime. baz]
+    MarkupBlock - [0..18)::18
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..14)::10
+            CSharpImplicitExpression - [4..14)::10
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..14)::9
+                    CSharpCodeBlock - [5..14)::9
+                        CSharpExpressionLiteral - [5..14)::9 - [DateTime.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[DateTime];
+                            Dot;[.];
+        MarkupTextLiteral - [14..18)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_4.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_4.cspans.txt
new file mode 100644
index 0000000000..bb70fab58d
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_4.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml)
+Transition span at (4:0,4 [1] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [9] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml)
+Code span at (5:0,5 [8] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [9] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml)
+Markup span at (13:0,13 [5] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_4.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_4.stree.txt
new file mode 100644
index 0000000000..21b54b9a93
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAccCaseInsensitiveDCI_NewRoslynIntegration_4.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..18)::18 - [foo @DateTime. baz]
+    MarkupBlock - [0..18)::18
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..13)::9
+            CSharpImplicitExpression - [4..13)::9
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..13)::8
+                    CSharpCodeBlock - [5..13)::8
+                        CSharpExpressionLiteral - [5..13)::8 - [DateTime] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[DateTime];
+        MarkupTextLiteral - [13..18)::5 - [. baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[.];
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCI.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCI.cspans.txt
new file mode 100644
index 0000000000..ff044ef739
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCI.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [7] test.cshtml)
+Code span at (5:0,5 [6] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [7] test.cshtml)
+Markup span at (11:0,11 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCI.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCI.stree.txt
new file mode 100644
index 0000000000..6bf34481e7
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCI.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..15)::15 - [foo @DateT. baz]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..11)::7
+            CSharpImplicitExpression - [4..11)::7
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..11)::6
+                    CSharpCodeBlock - [5..11)::6
+                        CSharpExpressionLiteral - [5..11)::6 - [DateT.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[DateT];
+                            Dot;[.];
+        MarkupTextLiteral - [11..15)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers.cspans.txt
new file mode 100644
index 0000000000..1f69ba4ae4
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [10] test.cshtml)
+Code span at (5:0,5 [9] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [10] test.cshtml)
+Markup span at (14:0,14 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers.stree.txt
new file mode 100644
index 0000000000..e0897aa139
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..18)::18 - [foo @DateTime. baz]
+    MarkupBlock - [0..18)::18
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..14)::10
+            CSharpImplicitExpression - [4..14)::10
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..14)::9
+                    CSharpCodeBlock - [5..14)::9
+                        CSharpExpressionLiteral - [5..14)::9 - [DateTime.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[DateTime];
+                            Dot;[.];
+        MarkupTextLiteral - [14..18)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers_1.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers_1.cspans.txt
new file mode 100644
index 0000000000..dd485c7a79
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers_1.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [11] test.cshtml)
+Code span at (5:0,5 [10] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [11] test.cshtml)
+Markup span at (15:0,15 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [19] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers_1.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers_1.stree.txt
new file mode 100644
index 0000000000..45815be7ac
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers_1.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..19)::19 - [foo @DateTime.. baz]
+    MarkupBlock - [0..19)::19
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..15)::11
+            CSharpImplicitExpression - [4..15)::11
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..15)::10
+                    CSharpCodeBlock - [5..15)::10
+                        CSharpExpressionLiteral - [5..15)::10 - [DateTime..] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[DateTime];
+                            Dot;[.];
+                            Dot;[.];
+        MarkupTextLiteral - [15..19)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers_2.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers_2.cspans.txt
new file mode 100644
index 0000000000..a0fd607870
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers_2.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [14] test.cshtml)
+Code span at (5:0,5 [13] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [14] test.cshtml)
+Markup span at (18:0,18 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers_2.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers_2.stree.txt
new file mode 100644
index 0000000000..37580001fc
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers_2.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..22)::22 - [foo @DateTime.Now. baz]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..18)::14
+            CSharpImplicitExpression - [4..18)::14
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..18)::13
+                    CSharpCodeBlock - [5..18)::13
+                        CSharpExpressionLiteral - [5..18)::13 - [DateTime.Now.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[DateTime];
+                            Dot;[.];
+                            Identifier;[Now];
+                            Dot;[.];
+        MarkupTextLiteral - [18..22)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers_3.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers_3.cspans.txt
new file mode 100644
index 0000000000..9673812872
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers_3.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml)
+Transition span at (4:0,4 [1] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [13] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml)
+Code span at (5:0,5 [12] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [13] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml)
+Markup span at (17:0,17 [5] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers_3.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers_3.stree.txt
new file mode 100644
index 0000000000..f5b1f5ad90
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCIAfterIdentifiers_3.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..22)::22 - [foo @DateTime.Now. baz]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..17)::13
+            CSharpImplicitExpression - [4..17)::13
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..17)::12
+                    CSharpCodeBlock - [5..17)::12
+                        CSharpExpressionLiteral - [5..17)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[DateTime];
+                            Dot;[.];
+                            Identifier;[Now];
+        MarkupTextLiteral - [17..22)::5 - [. baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[.];
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCI_1.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCI_1.cspans.txt
new file mode 100644
index 0000000000..1f69ba4ae4
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCI_1.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [10] test.cshtml)
+Code span at (5:0,5 [9] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [10] test.cshtml)
+Markup span at (14:0,14 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCI_1.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCI_1.stree.txt
new file mode 100644
index 0000000000..e0897aa139
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCI_1.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..18)::18 - [foo @DateTime. baz]
+    MarkupBlock - [0..18)::18
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..14)::10
+            CSharpImplicitExpression - [4..14)::10
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..14)::9
+                    CSharpCodeBlock - [5..14)::9
+                        CSharpExpressionLiteral - [5..14)::9 - [DateTime.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[DateTime];
+                            Dot;[.];
+        MarkupTextLiteral - [14..18)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCI_2.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCI_2.cspans.txt
new file mode 100644
index 0000000000..bb70fab58d
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCI_2.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml)
+Transition span at (4:0,4 [1] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [9] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml)
+Code span at (5:0,5 [8] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [9] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml)
+Markup span at (13:0,13 [5] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [18] C:\This\Path\Is\Just\For\Line\Pragmas.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCI_2.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCI_2.stree.txt
new file mode 100644
index 0000000000..21b54b9a93
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprProvisionallyAcceptsDCI_2.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..18)::18 - [foo @DateTime. baz]
+    MarkupBlock - [0..18)::18
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..13)::9
+            CSharpImplicitExpression - [4..13)::9
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..13)::8
+                    CSharpCodeBlock - [5..13)::8
+                        CSharpExpressionLiteral - [5..13)::8 - [DateTime] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[DateTime];
+        MarkupTextLiteral - [13..18)::5 - [. baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[.];
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprRejectsAcceptableChangeIfPrevWasProvisionallyAccepted.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprRejectsAcceptableChangeIfPrevWasProvisionallyAccepted.cspans.txt
new file mode 100644
index 0000000000..1dcb39aed1
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprRejectsAcceptableChangeIfPrevWasProvisionallyAccepted.cspans.txt
@@ -0,0 +1,7 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [4] test.cshtml)
+Code span at (5:0,5 [3] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [4] test.cshtml)
+Markup span at (8:0,8 [2] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] test.cshtml)
+Transition span at (10:0,10 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (10:0,10 [5] test.cshtml)
+Code span at (11:0,11 [4] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (10:0,10 [5] test.cshtml)
+Markup span at (15:0,15 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprRejectsAcceptableChangeIfPrevWasProvisionallyAccepted.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprRejectsAcceptableChangeIfPrevWasProvisionallyAccepted.stree.txt
new file mode 100644
index 0000000000..0618c938ce
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExprRejectsAcceptableChangeIfPrevWasProvisionallyAccepted.stree.txt
@@ -0,0 +1,26 @@
+RazorDocument - [0..15)::15 - [foo @foo. @barb]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..8)::4
+            CSharpImplicitExpression - [4..8)::4
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..8)::3
+                    CSharpCodeBlock - [5..8)::3
+                        CSharpExpressionLiteral - [5..8)::3 - [foo] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[foo];
+        MarkupTextLiteral - [8..10)::2 - [. ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[.];
+            Whitespace;[ ];
+        CSharpCodeBlock - [10..15)::5
+            CSharpImplicitExpression - [10..15)::5
+                CSharpTransition - [10..11)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [11..15)::4
+                    CSharpCodeBlock - [11..15)::4
+                        CSharpExpressionLiteral - [11..15)::4 - [barb] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[barb];
+        MarkupTextLiteral - [15..15)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExpr_AcceptsParenthesisAtEnd_SingleEdit.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExpr_AcceptsParenthesisAtEnd_SingleEdit.cspans.txt
new file mode 100644
index 0000000000..5532c30c0e
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExpr_AcceptsParenthesisAtEnd_SingleEdit.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [6] test.cshtml)
+Code span at (5:0,5 [5] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [6] test.cshtml)
+Markup span at (10:0,10 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExpr_AcceptsParenthesisAtEnd_SingleEdit.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExpr_AcceptsParenthesisAtEnd_SingleEdit.stree.txt
new file mode 100644
index 0000000000..bd1f4a7947
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExpr_AcceptsParenthesisAtEnd_SingleEdit.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..14)::14 - [foo @foo() bar]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..10)::6
+            CSharpImplicitExpression - [4..10)::6
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..10)::5
+                    CSharpCodeBlock - [5..10)::5
+                        CSharpExpressionLiteral - [5..10)::5 - [foo()] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[foo];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+        MarkupTextLiteral - [10..14)::4 - [ bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[bar];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExpr_AcceptsParenthesisAtEnd_TwoEdits.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExpr_AcceptsParenthesisAtEnd_TwoEdits.cspans.txt
new file mode 100644
index 0000000000..5532c30c0e
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExpr_AcceptsParenthesisAtEnd_TwoEdits.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [6] test.cshtml)
+Code span at (5:0,5 [5] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [6] test.cshtml)
+Markup span at (10:0,10 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExpr_AcceptsParenthesisAtEnd_TwoEdits.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExpr_AcceptsParenthesisAtEnd_TwoEdits.stree.txt
new file mode 100644
index 0000000000..bd1f4a7947
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/DefaultVisualStudioRazorParserIntegrationTest/ImpExpr_AcceptsParenthesisAtEnd_TwoEdits.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..14)::14 - [foo @foo() bar]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..10)::6
+            CSharpImplicitExpression - [4..10)::6
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..10)::5
+                    CSharpCodeBlock - [5..10)::5
+                        CSharpExpressionLiteral - [5..10)::5 - [foo()] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[foo];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+        MarkupTextLiteral - [10..14)::4 - [ bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[bar];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsAdditionalIdentifierCharactersIfEndOfSpanIsIdentifier.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsAdditionalIdentifierCharactersIfEndOfSpanIsIdentifier.cspans.txt
new file mode 100644
index 0000000000..fde3c1b21c
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsAdditionalIdentifierCharactersIfEndOfSpanIsIdentifier.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [5] test.cshtml)
+Code span at (5:0,5 [4] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [5] test.cshtml)
+Markup span at (9:0,9 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsAdditionalIdentifierCharactersIfEndOfSpanIsIdentifier.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsAdditionalIdentifierCharactersIfEndOfSpanIsIdentifier.stree.txt
new file mode 100644
index 0000000000..aded3ab464
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsAdditionalIdentifierCharactersIfEndOfSpanIsIdentifier.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..13)::13 - [foo @foob bar]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..9)::5
+            CSharpImplicitExpression - [4..9)::5
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..9)::4
+                    CSharpCodeBlock - [5..9)::4
+                        CSharpExpressionLiteral - [5..9)::4 - [foob] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[foob];
+        MarkupTextLiteral - [9..13)::4 - [ bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[bar];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsAdditionalIdentifierStartCharactersIfEndOfSpanIsDot.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsAdditionalIdentifierStartCharactersIfEndOfSpanIsDot.cspans.txt
new file mode 100644
index 0000000000..896d435a91
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsAdditionalIdentifierStartCharactersIfEndOfSpanIsDot.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [9] test.cshtml)
+Transition span at (0:0,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [9] test.cshtml)
+MetaCode span at (1:0,1 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [9] test.cshtml)
+Code span at (2:0,2 [0] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [9] test.cshtml)
+Transition span at (2:0,2 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (2:0,2 [6] test.cshtml)
+Code span at (3:0,3 [5] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (2:0,2 [6] test.cshtml)
+Code span at (8:0,8 [0] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [9] test.cshtml)
+MetaCode span at (8:0,8 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [9] test.cshtml)
+Markup span at (9:0,9 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [9] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsAdditionalIdentifierStartCharactersIfEndOfSpanIsDot.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsAdditionalIdentifierStartCharactersIfEndOfSpanIsDot.stree.txt
new file mode 100644
index 0000000000..2e075cbec5
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsAdditionalIdentifierStartCharactersIfEndOfSpanIsDot.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..9)::9 - [@{@foo.b}]
+    MarkupBlock - [0..9)::9
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..9)::9
+            CSharpStatement - [0..9)::9
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..9)::8
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..8)::6
+                        CSharpStatementLiteral - [2..2)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Marker;[];
+                        CSharpCodeBlock - [2..8)::6
+                            CSharpImplicitExpression - [2..8)::6
+                                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [3..8)::5
+                                    CSharpCodeBlock - [3..8)::5
+                                        CSharpExpressionLiteral - [3..8)::5 - [foo.b] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K20
+                                            Identifier;[foo];
+                                            Dot;[.];
+                                            Identifier;[b];
+                        CSharpStatementLiteral - [8..8)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [9..9)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsDeleteOfIdentifierPartsIfSomeOfIdentifierRemains.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsDeleteOfIdentifierPartsIfSomeOfIdentifierRemains.cspans.txt
new file mode 100644
index 0000000000..b81086c307
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsDeleteOfIdentifierPartsIfSomeOfIdentifierRemains.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [3] test.cshtml)
+Code span at (5:0,5 [2] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [3] test.cshtml)
+Markup span at (7:0,7 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [11] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsDeleteOfIdentifierPartsIfSomeOfIdentifierRemains.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsDeleteOfIdentifierPartsIfSomeOfIdentifierRemains.stree.txt
new file mode 100644
index 0000000000..45f7d16abb
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsDeleteOfIdentifierPartsIfSomeOfIdentifierRemains.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..11)::11 - [foo @Us baz]
+    MarkupBlock - [0..11)::11
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..7)::3
+            CSharpImplicitExpression - [4..7)::3
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..7)::2
+                    CSharpCodeBlock - [5..7)::2
+                        CSharpExpressionLiteral - [5..7)::2 - [Us] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[Us];
+        MarkupTextLiteral - [7..11)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsDotAtEndOfNonWhitespaceCharacters.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsDotAtEndOfNonWhitespaceCharacters.cspans.txt
new file mode 100644
index 0000000000..2cee255e82
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsDotAtEndOfNonWhitespaceCharacters.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] test.cshtml)
+Transition span at (0:0,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [16] test.cshtml)
+MetaCode span at (1:0,1 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [16] test.cshtml)
+Code span at (2:0,2 [6] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [16] test.cshtml)
+Transition span at (8:1,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (8:1,4 [5] test.cshtml)
+Code span at (9:1,5 [4] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (8:1,4 [5] test.cshtml)
+Code span at (13:1,9 [2] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [16] test.cshtml)
+MetaCode span at (15:2,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [16] test.cshtml)
+Markup span at (16:2,1 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsDotAtEndOfNonWhitespaceCharacters.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsDotAtEndOfNonWhitespaceCharacters.stree.txt
new file mode 100644
index 0000000000..b01b7b48a0
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsDotAtEndOfNonWhitespaceCharacters.stree.txt
@@ -0,0 +1,30 @@
+RazorDocument - [0..16)::16 - [@{LF    @foo.LF}]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            CSharpStatement - [0..16)::16
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..16)::15
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..15)::13
+                        CSharpStatementLiteral - [2..8)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        CSharpCodeBlock - [8..13)::5
+                            CSharpImplicitExpression - [8..13)::5
+                                CSharpTransition - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [9..13)::4
+                                    CSharpCodeBlock - [9..13)::4
+                                        CSharpExpressionLiteral - [9..13)::4 - [foo.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K20
+                                            Identifier;[foo];
+                                            Dot;[.];
+                        CSharpStatementLiteral - [13..15)::2 - [LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                    RazorMetaCode - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [16..16)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsDotIfTrailingDotsAreAllowed.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsDotIfTrailingDotsAreAllowed.cspans.txt
new file mode 100644
index 0000000000..98730d6700
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsDotIfTrailingDotsAreAllowed.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [8] test.cshtml)
+Transition span at (0:0,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [8] test.cshtml)
+MetaCode span at (1:0,1 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [8] test.cshtml)
+Code span at (2:0,2 [0] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [8] test.cshtml)
+Transition span at (2:0,2 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (2:0,2 [5] test.cshtml)
+Code span at (3:0,3 [4] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (2:0,2 [5] test.cshtml)
+Code span at (7:0,7 [0] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [8] test.cshtml)
+MetaCode span at (7:0,7 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [8] test.cshtml)
+Markup span at (8:0,8 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [8] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsDotIfTrailingDotsAreAllowed.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsDotIfTrailingDotsAreAllowed.stree.txt
new file mode 100644
index 0000000000..dca9949e4e
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsDotIfTrailingDotsAreAllowed.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..8)::8 - [@{@foo.}]
+    MarkupBlock - [0..8)::8
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..8)::8
+            CSharpStatement - [0..8)::8
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..8)::7
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..7)::5
+                        CSharpStatementLiteral - [2..2)::0 - [] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            Marker;[];
+                        CSharpCodeBlock - [2..7)::5
+                            CSharpImplicitExpression - [2..7)::5
+                                CSharpTransition - [2..3)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [3..7)::4
+                                    CSharpCodeBlock - [3..7)::4
+                                        CSharpExpressionLiteral - [3..7)::4 - [foo.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K20
+                                            Identifier;[foo];
+                                            Dot;[.];
+                        CSharpStatementLiteral - [7..7)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
+                    RazorMetaCode - [7..8)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [8..8)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsIdentifierAfterDotAtEndOfNonWhitespaceCharacters.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsIdentifierAfterDotAtEndOfNonWhitespaceCharacters.cspans.txt
new file mode 100644
index 0000000000..4455e62b9c
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsIdentifierAfterDotAtEndOfNonWhitespaceCharacters.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] test.cshtml)
+Transition span at (0:0,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [17] test.cshtml)
+MetaCode span at (1:0,1 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [17] test.cshtml)
+Code span at (2:0,2 [6] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [17] test.cshtml)
+Transition span at (8:1,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (8:1,4 [6] test.cshtml)
+Code span at (9:1,5 [5] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (8:1,4 [6] test.cshtml)
+Code span at (14:1,10 [2] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [17] test.cshtml)
+MetaCode span at (16:2,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [17] test.cshtml)
+Markup span at (17:2,1 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsIdentifierAfterDotAtEndOfNonWhitespaceCharacters.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsIdentifierAfterDotAtEndOfNonWhitespaceCharacters.stree.txt
new file mode 100644
index 0000000000..c9546f0e8b
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsIdentifierAfterDotAtEndOfNonWhitespaceCharacters.stree.txt
@@ -0,0 +1,31 @@
+RazorDocument - [0..17)::17 - [@{LF    @foo.dLF}]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..17)::17
+            CSharpStatement - [0..17)::17
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..17)::16
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..16)::14
+                        CSharpStatementLiteral - [2..8)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        CSharpCodeBlock - [8..14)::6
+                            CSharpImplicitExpression - [8..14)::6
+                                CSharpTransition - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [9..14)::5
+                                    CSharpCodeBlock - [9..14)::5
+                                        CSharpExpressionLiteral - [9..14)::5 - [foo.d] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K20
+                                            Identifier;[foo];
+                                            Dot;[.];
+                                            Identifier;[d];
+                        CSharpStatementLiteral - [14..16)::2 - [LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                    RazorMetaCode - [16..17)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [17..17)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsIdentifierExpansionAtEndOfNonWhitespaceCharacters.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsIdentifierExpansionAtEndOfNonWhitespaceCharacters.cspans.txt
new file mode 100644
index 0000000000..2cee255e82
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsIdentifierExpansionAtEndOfNonWhitespaceCharacters.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] test.cshtml)
+Transition span at (0:0,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [16] test.cshtml)
+MetaCode span at (1:0,1 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [16] test.cshtml)
+Code span at (2:0,2 [6] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [16] test.cshtml)
+Transition span at (8:1,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (8:1,4 [5] test.cshtml)
+Code span at (9:1,5 [4] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (8:1,4 [5] test.cshtml)
+Code span at (13:1,9 [2] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [16] test.cshtml)
+MetaCode span at (15:2,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [16] test.cshtml)
+Markup span at (16:2,1 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [16] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsIdentifierExpansionAtEndOfNonWhitespaceCharacters.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsIdentifierExpansionAtEndOfNonWhitespaceCharacters.stree.txt
new file mode 100644
index 0000000000..5fc6a5b229
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsIdentifierExpansionAtEndOfNonWhitespaceCharacters.stree.txt
@@ -0,0 +1,29 @@
+RazorDocument - [0..16)::16 - [@{LF    @foodLF}]
+    MarkupBlock - [0..16)::16
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..16)::16
+            CSharpStatement - [0..16)::16
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..16)::15
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..15)::13
+                        CSharpStatementLiteral - [2..8)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        CSharpCodeBlock - [8..13)::5
+                            CSharpImplicitExpression - [8..13)::5
+                                CSharpTransition - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [9..13)::4
+                                    CSharpCodeBlock - [9..13)::4
+                                        CSharpExpressionLiteral - [9..13)::4 - [food] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K20
+                                            Identifier;[food];
+                        CSharpStatementLiteral - [13..15)::2 - [LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                    RazorMetaCode - [15..16)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [16..16)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsInnerInsertions.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsInnerInsertions.cspans.txt
new file mode 100644
index 0000000000..a0fd607870
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsInnerInsertions.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [14] test.cshtml)
+Code span at (5:0,5 [13] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [14] test.cshtml)
+Markup span at (18:0,18 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [22] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsInnerInsertions.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsInnerInsertions.stree.txt
new file mode 100644
index 0000000000..26c7aa630c
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsInnerInsertions.stree.txt
@@ -0,0 +1,19 @@
+RazorDocument - [0..22)::22 - [foo @DateTime..Now baz]
+    MarkupBlock - [0..22)::22
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..18)::14
+            CSharpImplicitExpression - [4..18)::14
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..18)::13
+                    CSharpCodeBlock - [5..18)::13
+                        CSharpExpressionLiteral - [5..18)::13 - [DateTime..Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[DateTime];
+                            Dot;[.];
+                            Dot;[.];
+                            Identifier;[Now];
+        MarkupTextLiteral - [18..22)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsInnerInsertionsInStatementBlock.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsInnerInsertionsInStatementBlock.cspans.txt
new file mode 100644
index 0000000000..bf6002d7e6
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsInnerInsertionsInStatementBlock.cspans.txt
@@ -0,0 +1,9 @@
+Markup span at (0:0,0 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] test.cshtml)
+Transition span at (0:0,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [25] test.cshtml)
+MetaCode span at (1:0,1 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [25] test.cshtml)
+Code span at (2:0,2 [6] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] test.cshtml)
+Transition span at (8:1,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (8:1,4 [14] test.cshtml)
+Code span at (9:1,5 [13] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (8:1,4 [14] test.cshtml)
+Code span at (22:1,18 [2] test.cshtml) (Accepts:Any) - Parent: Statement block at (0:0,0 [25] test.cshtml)
+MetaCode span at (24:2,0 [1] test.cshtml) (Accepts:None) - Parent: Statement block at (0:0,0 [25] test.cshtml)
+Markup span at (25:2,1 [0] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [25] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsInnerInsertionsInStatementBlock.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsInnerInsertionsInStatementBlock.stree.txt
new file mode 100644
index 0000000000..a952d79b84
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsInnerInsertionsInStatementBlock.stree.txt
@@ -0,0 +1,32 @@
+RazorDocument - [0..25)::25 - [@{LF    @DateTime..NowLF}]
+    MarkupBlock - [0..25)::25
+        MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
+        CSharpCodeBlock - [0..25)::25
+            CSharpStatement - [0..25)::25
+                CSharpTransition - [0..1)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpStatementBody - [1..25)::24
+                    RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        LeftBrace;[{];
+                    CSharpCodeBlock - [2..24)::22
+                        CSharpStatementLiteral - [2..8)::6 - [LF    ] - Gen<Stmt> - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL
+                            NewLine;[LF];
+                            Whitespace;[    ];
+                        CSharpCodeBlock - [8..22)::14
+                            CSharpImplicitExpression - [8..22)::14
+                                CSharpTransition - [8..9)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                                    Transition;[@];
+                                CSharpImplicitExpressionBody - [9..22)::13
+                                    CSharpCodeBlock - [9..22)::13
+                                        CSharpExpressionLiteral - [9..22)::13 - [DateTime..Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[ATD];K20
+                                            Identifier;[DateTime];
+                                            Dot;[.];
+                                            Dot;[.];
+                                            Identifier;[Now];
+                        CSharpStatementLiteral - [22..24)::2 - [LF] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            NewLine;[LF];
+                    RazorMetaCode - [24..25)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                        RightBrace;[}];
+        MarkupTextLiteral - [25..25)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Marker;[];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsMultipleInsertionIfItOnlyCausesIdentifierExpansion.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsMultipleInsertionIfItOnlyCausesIdentifierExpansion.cspans.txt
new file mode 100644
index 0000000000..ff044ef739
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsMultipleInsertionIfItOnlyCausesIdentifierExpansion.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [7] test.cshtml)
+Code span at (5:0,5 [6] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [7] test.cshtml)
+Markup span at (11:0,11 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [15] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsMultipleInsertionIfItOnlyCausesIdentifierExpansion.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsMultipleInsertionIfItOnlyCausesIdentifierExpansion.stree.txt
new file mode 100644
index 0000000000..47e3a75e0c
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsMultipleInsertionIfItOnlyCausesIdentifierExpansion.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..15)::15 - [foo @barbiz baz]
+    MarkupBlock - [0..15)::15
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..11)::7
+            CSharpImplicitExpression - [4..11)::7
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..11)::6
+                    CSharpCodeBlock - [5..11)::6
+                        CSharpExpressionLiteral - [5..11)::6 - [barbiz] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[barbiz];
+        MarkupTextLiteral - [11..15)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsPrefixIdentifierReplacements_MultipleSymbols.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsPrefixIdentifierReplacements_MultipleSymbols.cspans.txt
new file mode 100644
index 0000000000..58bb6d600e
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsPrefixIdentifierReplacements_MultipleSymbols.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [13] test.cshtml)
+Code span at (5:0,5 [12] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [13] test.cshtml)
+Markup span at (17:0,17 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsPrefixIdentifierReplacements_MultipleSymbols.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsPrefixIdentifierReplacements_MultipleSymbols.stree.txt
new file mode 100644
index 0000000000..0fbb9eb63d
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsPrefixIdentifierReplacements_MultipleSymbols.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..21)::21 - [foo @DateTime.Now baz]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..17)::13
+            CSharpImplicitExpression - [4..17)::13
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..17)::12
+                    CSharpCodeBlock - [5..17)::12
+                        CSharpExpressionLiteral - [5..17)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[DateTime];
+                            Dot;[.];
+                            Identifier;[Now];
+        MarkupTextLiteral - [17..21)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsPrefixIdentifierReplacements_SingleSymbol.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsPrefixIdentifierReplacements_SingleSymbol.cspans.txt
new file mode 100644
index 0000000000..f507cc7988
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsPrefixIdentifierReplacements_SingleSymbol.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [9] test.cshtml)
+Code span at (5:0,5 [8] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [9] test.cshtml)
+Markup span at (13:0,13 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsPrefixIdentifierReplacements_SingleSymbol.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsPrefixIdentifierReplacements_SingleSymbol.stree.txt
new file mode 100644
index 0000000000..e3ca47e5be
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsPrefixIdentifierReplacements_SingleSymbol.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..17)::17 - [foo @DateTime baz]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..13)::9
+            CSharpImplicitExpression - [4..13)::9
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..13)::8
+                    CSharpCodeBlock - [5..13)::8
+                        CSharpExpressionLiteral - [5..13)::8 - [DateTime] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[DateTime];
+        MarkupTextLiteral - [13..17)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsSuffixIdentifierReplacements_MultipleSymbols.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsSuffixIdentifierReplacements_MultipleSymbols.cspans.txt
new file mode 100644
index 0000000000..58bb6d600e
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsSuffixIdentifierReplacements_MultipleSymbols.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [13] test.cshtml)
+Code span at (5:0,5 [12] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [13] test.cshtml)
+Markup span at (17:0,17 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [21] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsSuffixIdentifierReplacements_MultipleSymbols.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsSuffixIdentifierReplacements_MultipleSymbols.stree.txt
new file mode 100644
index 0000000000..0fbb9eb63d
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsSuffixIdentifierReplacements_MultipleSymbols.stree.txt
@@ -0,0 +1,18 @@
+RazorDocument - [0..21)::21 - [foo @DateTime.Now baz]
+    MarkupBlock - [0..21)::21
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..17)::13
+            CSharpImplicitExpression - [4..17)::13
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..17)::12
+                    CSharpCodeBlock - [5..17)::12
+                        CSharpExpressionLiteral - [5..17)::12 - [DateTime.Now] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[DateTime];
+                            Dot;[.];
+                            Identifier;[Now];
+        MarkupTextLiteral - [17..21)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsSuffixIdentifierReplacements_SingleSymbol.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsSuffixIdentifierReplacements_SingleSymbol.cspans.txt
new file mode 100644
index 0000000000..f507cc7988
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsSuffixIdentifierReplacements_SingleSymbol.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [9] test.cshtml)
+Code span at (5:0,5 [8] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [9] test.cshtml)
+Markup span at (13:0,13 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsSuffixIdentifierReplacements_SingleSymbol.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsSuffixIdentifierReplacements_SingleSymbol.stree.txt
new file mode 100644
index 0000000000..e3ca47e5be
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsSuffixIdentifierReplacements_SingleSymbol.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..17)::17 - [foo @DateTime baz]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..13)::9
+            CSharpImplicitExpression - [4..13)::9
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..13)::8
+                    CSharpCodeBlock - [5..13)::8
+                        CSharpExpressionLiteral - [5..13)::8 - [DateTime] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[DateTime];
+        MarkupTextLiteral - [13..17)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsSurroundedIdentifierReplacements.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsSurroundedIdentifierReplacements.cspans.txt
new file mode 100644
index 0000000000..805ec8e78e
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsSurroundedIdentifierReplacements.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [24] test.cshtml)
+Code span at (5:0,5 [23] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [24] test.cshtml)
+Markup span at (28:0,28 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [32] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsSurroundedIdentifierReplacements.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsSurroundedIdentifierReplacements.stree.txt
new file mode 100644
index 0000000000..04edbefa5c
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsSurroundedIdentifierReplacements.stree.txt
@@ -0,0 +1,22 @@
+RazorDocument - [0..32)::32 - [foo @DateTime.Now.ToString() baz]
+    MarkupBlock - [0..32)::32
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..28)::24
+            CSharpImplicitExpression - [4..28)::24
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..28)::23
+                    CSharpCodeBlock - [5..28)::23
+                        CSharpExpressionLiteral - [5..28)::23 - [DateTime.Now.ToString()] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[DateTime];
+                            Dot;[.];
+                            Identifier;[Now];
+                            Dot;[.];
+                            Identifier;[ToString];
+                            LeftParenthesis;[(];
+                            RightParenthesis;[)];
+        MarkupTextLiteral - [28..32)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsWholeIdentifierReplacement.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsWholeIdentifierReplacement.cspans.txt
new file mode 100644
index 0000000000..f507cc7988
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsWholeIdentifierReplacement.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [9] test.cshtml)
+Code span at (5:0,5 [8] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [9] test.cshtml)
+Markup span at (13:0,13 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [17] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsWholeIdentifierReplacement.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsWholeIdentifierReplacement.stree.txt
new file mode 100644
index 0000000000..e3ca47e5be
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprAcceptsWholeIdentifierReplacement.stree.txt
@@ -0,0 +1,16 @@
+RazorDocument - [0..17)::17 - [foo @DateTime baz]
+    MarkupBlock - [0..17)::17
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..13)::9
+            CSharpImplicitExpression - [4..13)::9
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..13)::8
+                    CSharpCodeBlock - [5..13)::8
+                        CSharpExpressionLiteral - [5..13)::8 - [DateTime] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[DateTime];
+        MarkupTextLiteral - [13..17)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprProvisionalForMultipleInsertionIfItCausesIdentifierExpansionAndTrailingDot.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprProvisionalForMultipleInsertionIfItCausesIdentifierExpansionAndTrailingDot.cspans.txt
new file mode 100644
index 0000000000..5532c30c0e
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprProvisionalForMultipleInsertionIfItCausesIdentifierExpansionAndTrailingDot.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [6] test.cshtml)
+Code span at (5:0,5 [5] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [6] test.cshtml)
+Markup span at (10:0,10 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprProvisionalForMultipleInsertionIfItCausesIdentifierExpansionAndTrailingDot.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprProvisionalForMultipleInsertionIfItCausesIdentifierExpansionAndTrailingDot.stree.txt
new file mode 100644
index 0000000000..f236120f41
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprProvisionalForMultipleInsertionIfItCausesIdentifierExpansionAndTrailingDot.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..14)::14 - [foo @User. baz]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..10)::6
+            CSharpImplicitExpression - [4..10)::6
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..10)::5
+                    CSharpCodeBlock - [5..10)::5
+                        CSharpExpressionLiteral - [5..10)::5 - [User.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[User];
+                            Dot;[.];
+        MarkupTextLiteral - [10..14)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprProvisionallyAcceptsDeleteOfIdentifierPartsIfDotRemains.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprProvisionallyAcceptsDeleteOfIdentifierPartsIfDotRemains.cspans.txt
new file mode 100644
index 0000000000..5532c30c0e
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprProvisionallyAcceptsDeleteOfIdentifierPartsIfDotRemains.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [6] test.cshtml)
+Code span at (5:0,5 [5] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [6] test.cshtml)
+Markup span at (10:0,10 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [14] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprProvisionallyAcceptsDeleteOfIdentifierPartsIfDotRemains.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprProvisionallyAcceptsDeleteOfIdentifierPartsIfDotRemains.stree.txt
new file mode 100644
index 0000000000..f236120f41
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprProvisionallyAcceptsDeleteOfIdentifierPartsIfDotRemains.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..14)::14 - [foo @User. baz]
+    MarkupBlock - [0..14)::14
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..10)::6
+            CSharpImplicitExpression - [4..10)::6
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..10)::5
+                    CSharpCodeBlock - [5..10)::5
+                        CSharpExpressionLiteral - [5..10)::5 - [User.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[User];
+                            Dot;[.];
+        MarkupTextLiteral - [10..14)::4 - [ baz] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[baz];
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprProvisionallyAcceptsDotAfterIdentifierInMarkup.cspans.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprProvisionallyAcceptsDotAfterIdentifierInMarkup.cspans.txt
new file mode 100644
index 0000000000..fde3c1b21c
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprProvisionallyAcceptsDotAfterIdentifierInMarkup.cspans.txt
@@ -0,0 +1,4 @@
+Markup span at (0:0,0 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] test.cshtml)
+Transition span at (4:0,4 [1] test.cshtml) (Accepts:None) - Parent: Expression block at (4:0,4 [5] test.cshtml)
+Code span at (5:0,5 [4] test.cshtml) (Accepts:NonWhitespace) - Parent: Expression block at (4:0,4 [5] test.cshtml)
+Markup span at (9:0,9 [4] test.cshtml) (Accepts:Any) - Parent: Markup block at (0:0,0 [13] test.cshtml)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprProvisionallyAcceptsDotAfterIdentifierInMarkup.stree.txt b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprProvisionallyAcceptsDotAfterIdentifierInMarkup.stree.txt
new file mode 100644
index 0000000000..fd089e0db9
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/TestFiles/ParserTests/RazorSyntaxTreePartialParserTest/ImpExprProvisionallyAcceptsDotAfterIdentifierInMarkup.stree.txt
@@ -0,0 +1,17 @@
+RazorDocument - [0..13)::13 - [foo @foo. bar]
+    MarkupBlock - [0..13)::13
+        MarkupTextLiteral - [0..4)::4 - [foo ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Text;[foo];
+            Whitespace;[ ];
+        CSharpCodeBlock - [4..9)::5
+            CSharpImplicitExpression - [4..9)::5
+                CSharpTransition - [4..5)::1 - Gen<None> - SpanEditHandler;Accepts:None
+                    Transition;[@];
+                CSharpImplicitExpressionBody - [5..9)::4
+                    CSharpCodeBlock - [5..9)::4
+                        CSharpExpressionLiteral - [5..9)::4 - [foo.] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K20
+                            Identifier;[foo];
+                            Dot;[.];
+        MarkupTextLiteral - [9..13)::4 - [ bar] - Gen<Markup> - SpanEditHandler;Accepts:Any
+            Whitespace;[ ];
+            Text;[bar];
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DocumentGenerator/BackgroundDocumentGeneratorTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DocumentGenerator/BackgroundDocumentGeneratorTest.cs
index fdc6bd3698..cf94a74358 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DocumentGenerator/BackgroundDocumentGeneratorTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DocumentGenerator/BackgroundDocumentGeneratorTest.cs
@@ -5,6 +5,8 @@ using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Host;
 using Moq;
 using Xunit;
 
@@ -12,20 +14,18 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 {
     // These tests are really integration tests. There isn't a good way to unit test this functionality since
     // the only thing in here is threading.
-    public class BackgroundDocumentGeneratorTest : ForegroundDispatcherTestBase
+    public class BackgroundDocumentGeneratorTest : ForegroundDispatcherWorkspaceTestBase
     {
         public BackgroundDocumentGeneratorTest()
         {
             Documents = new HostDocument[]
             {
-                new HostDocument("c:\\Test1\\Index.cshtml", "Index.cshtml"),
-                new HostDocument("c:\\Test1\\Components\\Counter.cshtml", "Components\\Counter.cshtml"),
+                TestProjectData.SomeProjectFile1,
+                TestProjectData.AnotherProjectFile1,
             };
 
-            HostProject1 = new HostProject("c:\\Test1\\Test1.csproj", FallbackRazorConfiguration.MVC_1_0);
-            HostProject2 = new HostProject("c:\\Test2\\Test2.csproj", FallbackRazorConfiguration.MVC_1_0);
-
-            Workspace = TestWorkspace.Create();
+            HostProject1 = new HostProject(TestProjectData.SomeProject.FilePath, FallbackRazorConfiguration.MVC_1_0);
+            HostProject2 = new HostProject(TestProjectData.AnotherProject.FilePath, FallbackRazorConfiguration.MVC_1_0);
 
             var projectId1 = ProjectId.CreateNewId("Test1");
             var projectId2 = ProjectId.CreateNewId("Test2");
@@ -37,14 +37,14 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                     "Test1",
                     "Test1",
                     LanguageNames.CSharp,
-                    "c:\\Test1\\Test1.csproj"))
+                    TestProjectData.SomeProject.FilePath))
                 .AddProject(ProjectInfo.Create(
                     projectId2,
                     VersionStamp.Default,
                     "Test2",
                     "Test2",
                     LanguageNames.CSharp,
-                    "c:\\Test2\\Test2.csproj")); ;
+                    TestProjectData.AnotherProject.FilePath)); ;
 
             WorkspaceProject1 = solution.GetProject(projectId1);
             WorkspaceProject2 = solution.GetProject(projectId2);
@@ -60,7 +60,11 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
         private Project WorkspaceProject2 { get; }
 
-        private Workspace Workspace { get; }
+        protected override void ConfigureProjectEngine(RazorProjectEngineBuilder builder)
+        {
+            builder.Features.Remove(builder.Features.OfType<IImportProjectFeature>().Single());
+            builder.Features.Add(new TestImportProjectFeature());
+        }
 
         [ForegroundFact]
         public async Task Queue_ProcessesNotifications_AndGoesBackToSleep()
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Documents/VisualStudioFileChangeTrackerTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Documents/VisualStudioFileChangeTrackerTest.cs
index fcef648173..93e48b1f4f 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Documents/VisualStudioFileChangeTrackerTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Documents/VisualStudioFileChangeTrackerTest.cs
@@ -23,7 +23,7 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
                 .Setup(f => f.AdviseFileChange(It.IsAny<string>(), It.IsAny<uint>(), It.IsAny<IVsFileChangeEvents>(), out cookie))
                 .Returns(VSConstants.S_OK)
                 .Verifiable();
-            var tracker = new VisualStudioFileChangeTracker("C:/_ViewImports.cshtml", Dispatcher, ErrorReporter, fileChangeService.Object);
+            var tracker = new VisualStudioFileChangeTracker(TestProjectData.SomeProjectImportFile.FilePath, Dispatcher, ErrorReporter, fileChangeService.Object);
 
             // Act
             tracker.StartListening();
@@ -43,7 +43,7 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
                 .Setup(f => f.AdviseFileChange(It.IsAny<string>(), It.IsAny<uint>(), It.IsAny<IVsFileChangeEvents>(), out cookie))
                 .Returns(VSConstants.S_OK)
                 .Callback(() => callCount++);
-            var tracker = new VisualStudioFileChangeTracker("C:/_ViewImports.cshtml", Dispatcher, ErrorReporter, fileChangeService.Object);
+            var tracker = new VisualStudioFileChangeTracker(TestProjectData.SomeProjectImportFile.FilePath, Dispatcher, ErrorReporter, fileChangeService.Object);
             tracker.StartListening();
 
             // Act
@@ -67,7 +67,7 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
                 .Setup(f => f.UnadviseFileChange(cookie))
                 .Returns(VSConstants.S_OK)
                 .Verifiable();
-            var tracker = new VisualStudioFileChangeTracker("C:/_ViewImports.cshtml", Dispatcher, ErrorReporter, fileChangeService.Object);
+            var tracker = new VisualStudioFileChangeTracker(TestProjectData.SomeProjectImportFile.FilePath, Dispatcher, ErrorReporter, fileChangeService.Object);
             tracker.StartListening(); // Start listening for changes.
 
             // Act
@@ -86,7 +86,7 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
             fileChangeService
                 .Setup(f => f.UnadviseFileChange(cookie))
                 .Throws(new InvalidOperationException());
-            var tracker = new VisualStudioFileChangeTracker("C:/_ViewImports.cshtml", Dispatcher, ErrorReporter, fileChangeService.Object);
+            var tracker = new VisualStudioFileChangeTracker(TestProjectData.SomeProjectImportFile.FilePath, Dispatcher, ErrorReporter, fileChangeService.Object);
 
             // Act & Assert
             tracker.StopListening();
@@ -100,7 +100,7 @@ namespace Microsoft.VisualStudio.Editor.Razor.Documents
         public void FilesChanged_WithSpecificFlags_InvokesChangedHandler_WithExpectedArguments(uint fileChangeFlag, int expectedKind)
         {
             // Arrange
-            var filePath = "C:\\path\\to\\project\\_ViewImports.cshtml";
+            var filePath = TestProjectData.SomeProjectImportFile.FilePath;
             uint cookie;
             var fileChangeService = new Mock<IVsFileChangeEx>();
             fileChangeService
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj
index b60bfeae3c..e8f261ba47 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj
@@ -1,18 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
 
     <!-- The binding redirects are needed due to a conflict between the test host and Roslyn regarding System.Collections.Immutable -->
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    <CodeAnalysisRuleSet>..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\Microsoft.VisualStudio.LanguageServices.Razor.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="..\Microsoft.CodeAnalysis.Razor.Workspaces.Test\Shared\**\*.cs">
       <Link>Shared\%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Compile>
+    <Compile Include="..\Microsoft.VisualStudio.Editor.Razor.Test\Shared\**\*.cs">
+      <Link>Shared\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
@@ -36,12 +40,20 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(VSIX_MicrosoftCodeAnalysisCommonPackageVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(VSIX_MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion)" />
+    <PackageReference Include="Microsoft.VisualStudio.ImageCatalog" Version="$(MicrosoftVisualStudioImageCatalogPackageVersion)" />
+    <PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="$(MicrosoftVisualStudioLanguageIntellisensePackageVersion)" />
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
+    <PackageReference Include="StreamJsonRpc" Version="$(StreamJsonRpcPackageVersion)" />
     <PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersPackageVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
     <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' ">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssemblies)" PrivateAssets="All" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/DefaultProjectSnapshotManagerTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/DefaultProjectSnapshotManagerTest.cs
index c69fc87f91..58d99f2619 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/DefaultProjectSnapshotManagerTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/DefaultProjectSnapshotManagerTest.cs
@@ -13,35 +13,28 @@ using Xunit;
 
 namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 {
-    public class DefaultProjectSnapshotManagerTest : ForegroundDispatcherTestBase
+    public class DefaultProjectSnapshotManagerTest : ForegroundDispatcherWorkspaceTestBase
     {
         public DefaultProjectSnapshotManagerTest()
         {
-            TagHelperResolver = new TestTagHelperResolver();
+            // Force VB and C# to Load
+            GC.KeepAlive(typeof(Microsoft.CodeAnalysis.CSharp.SyntaxFactory));
+            GC.KeepAlive(typeof(Microsoft.CodeAnalysis.VisualBasic.SyntaxFactory));
 
-            HostServices = TestServices.Create(
-                new IWorkspaceService[]
-                {
-                    new TestProjectSnapshotProjectEngineFactory(),
-                },
-                new ILanguageService[]
-                {
-                    TagHelperResolver,
-                });
+            TagHelperResolver = new TestTagHelperResolver();
 
             Documents = new HostDocument[]
             {
-                new HostDocument("c:\\MyProject\\File.cshtml", "File.cshtml"),
-                new HostDocument("c:\\MyProject\\Index.cshtml", "Index.cshtml"),
+                TestProjectData.SomeProjectFile1,
+                TestProjectData.SomeProjectFile2,
 
                 // linked file
-                new HostDocument("c:\\SomeOtherProject\\Index.cshtml", "Pages\\Index.cshtml"),
+                TestProjectData.AnotherProjectNestedFile3,
             };
 
-            HostProject = new HostProject("c:\\MyProject\\Test.csproj", FallbackRazorConfiguration.MVC_2_0);
-            HostProjectWithConfigurationChange = new HostProject("c:\\MyProject\\Test.csproj", FallbackRazorConfiguration.MVC_1_0);
-
-            Workspace = TestWorkspace.Create(HostServices);
+            HostProject = new HostProject(TestProjectData.SomeProject.FilePath, FallbackRazorConfiguration.MVC_2_0);
+            HostProjectWithConfigurationChange = new HostProject(TestProjectData.SomeProject.FilePath, FallbackRazorConfiguration.MVC_1_0);
+            
             ProjectManager = new TestProjectSnapshotManager(Dispatcher, Enumerable.Empty<ProjectSnapshotChangeTrigger>(), Workspace);
 
             var projectId = ProjectId.CreateNewId("Test");
@@ -51,7 +44,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 "Test",
                 "Test",
                 LanguageNames.CSharp,
-                "c:\\MyProject\\Test.csproj"));
+                TestProjectData.SomeProject.FilePath));
             WorkspaceProject = solution.GetProject(projectId);
 
             var vbProjectId = ProjectId.CreateNewId("VB");
@@ -81,7 +74,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 "Test (Different TFM)",
                 "Test",
                 LanguageNames.CSharp,
-                "c:\\MyProject\\Test.csproj"));
+                TestProjectData.SomeProject.FilePath));
             WorkspaceProjectWithDifferentTfm = solution.GetProject(projectIdWithDifferentTfm);
 
             SomeTagHelpers = TagHelperResolver.TagHelpers;
@@ -108,14 +101,15 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
         private TestProjectSnapshotManager ProjectManager { get; }
 
-        private HostServices HostServices { get; }
-
-        private Workspace Workspace { get; }
-
         private SourceText SourceText { get; }
 
         private IList<TagHelperDescriptor> SomeTagHelpers { get; }
 
+        protected override void ConfigureLanguageServices(List<ILanguageService> services)
+        {
+            services.Add(TagHelperResolver);
+        }
+
         [ForegroundFact]
         public void DocumentAdded_AddsDocument()
         {
@@ -129,7 +123,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             // Assert
             var snapshot = ProjectManager.GetSnapshot(HostProject);
-            Assert.Collection(snapshot.DocumentFilePaths, d => Assert.Equal(Documents[0].FilePath, d));
+            Assert.Collection(snapshot.DocumentFilePaths.OrderBy(f => f), d => Assert.Equal(Documents[0].FilePath, d));
 
             Assert.Equal(ProjectChangeKind.DocumentAdded, ProjectManager.ListenersNotifiedOf);
         }
@@ -148,7 +142,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             // Assert
             var snapshot = ProjectManager.GetSnapshot(HostProject);
-            Assert.Collection(snapshot.DocumentFilePaths, d => Assert.Equal(Documents[0].FilePath, d));
+            Assert.Collection(snapshot.DocumentFilePaths.OrderBy(f => f), d => Assert.Equal(Documents[0].FilePath, d));
 
             Assert.Null(ProjectManager.ListenersNotifiedOf);
         }
@@ -262,9 +256,9 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             // Assert
             var snapshot = ProjectManager.GetSnapshot(HostProject);
             Assert.Collection(
-                snapshot.DocumentFilePaths, 
-                d => Assert.Equal(Documents[0].FilePath, d),
-                d => Assert.Equal(Documents[2].FilePath, d));
+                snapshot.DocumentFilePaths.OrderBy(f => f), 
+                d => Assert.Equal(Documents[2].FilePath, d),
+                d => Assert.Equal(Documents[0].FilePath, d));
 
             Assert.Equal(ProjectChangeKind.DocumentRemoved, ProjectManager.ListenersNotifiedOf);
         }
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/DefaultRazorProjectHostTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/DefaultRazorProjectHostTest.cs
index ce7de26d39..24e94872db 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/DefaultRazorProjectHostTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/DefaultRazorProjectHostTest.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
@@ -15,11 +16,10 @@ using ItemCollection = Microsoft.VisualStudio.ProjectSystem.ItemCollection;
 
 namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 {
-    public class DefaultRazorProjectHostTest : ForegroundDispatcherTestBase
+    public class DefaultRazorProjectHostTest : ForegroundDispatcherWorkspaceTestBase
     {
         public DefaultRazorProjectHostTest()
         {
-            Workspace = new AdhocWorkspace();
             ProjectManager = new TestProjectSnapshotManager(Dispatcher, Workspace);
 
             ConfigurationItems = new ItemCollection(Rules.RazorConfiguration.SchemaName);
@@ -38,8 +38,6 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
         private TestProjectSnapshotManager ProjectManager { get; }
 
-        private Workspace Workspace { get; }
-
         [Fact]
         public void TryGetDefaultConfiguration_FailsIfNoRule()
         {
@@ -612,7 +610,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
         public async Task DefaultRazorProjectHost_ForegroundThread_CreateAndDispose_Succeeds()
         {
             // Arrange
-            var services = new TestProjectSystemServices("c:\\MyProject\\Test.csproj");
+            var services = new TestProjectSystemServices(TestProjectData.SomeProject.FilePath);
             var host = new DefaultRazorProjectHost(services, Workspace, ProjectManager);
 
             // Act & Assert
@@ -627,7 +625,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
         public async Task DefaultRazorProjectHost_BackgroundThread_CreateAndDispose_Succeeds()
         {
             // Arrange
-            var services = new TestProjectSystemServices("c:\\MyProject\\Test.csproj");
+            var services = new TestProjectSystemServices(TestProjectData.SomeProject.FilePath);
             var host = new DefaultRazorProjectHost(services, Workspace, ProjectManager);
 
             // Act & Assert
@@ -646,7 +644,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             {
             };
 
-            var services = new TestProjectSystemServices("Test.csproj");
+            var services = new TestProjectSystemServices(TestProjectData.SomeProject.FilePath);
             var host = new DefaultRazorProjectHost(services, Workspace, ProjectManager);
 
             // Act & Assert
@@ -670,8 +668,8 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             ExtensionItems.Item("MVC-2.1");
             ExtensionItems.Item("Another-Thing");
 
-            DocumentItems.Item("File.cshtml");
-            DocumentItems.Property("File.cshtml", Rules.RazorGenerateWithTargetPath.TargetPathProperty, "File.cshtml");
+            DocumentItems.Item(Path.GetFileName(TestProjectData.SomeProjectFile1.FilePath));
+            DocumentItems.Property(Path.GetFileName(TestProjectData.SomeProjectFile1.FilePath), Rules.RazorGenerateWithTargetPath.TargetPathProperty, TestProjectData.SomeProjectFile1.TargetPath);
 
             var changes = new TestProjectChangeDescription[]
             {
@@ -681,7 +679,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 DocumentItems.ToChange(),
             };
 
-            var services = new TestProjectSystemServices("c:\\MyProject\\Test.csproj");
+            var services = new TestProjectSystemServices(TestProjectData.SomeProject.FilePath);
 
             var host = new DefaultRazorProjectHost(services, Workspace, ProjectManager);
 
@@ -693,7 +691,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             // Assert
             var snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("c:\\MyProject\\Test.csproj", snapshot.FilePath);
+            Assert.Equal(TestProjectData.SomeProject.FilePath, snapshot.FilePath);
 
             Assert.Equal(RazorLanguageVersion.Version_2_1, snapshot.Configuration.LanguageVersion);
             Assert.Equal("MVC-2.1", snapshot.Configuration.ConfigurationName);
@@ -707,8 +705,8 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 d =>
                 {
                     var document = snapshot.GetDocument(d);
-                    Assert.Equal("c:\\MyProject\\File.cshtml", document.FilePath);
-                    Assert.Equal("File.cshtml", document.TargetPath);
+                    Assert.Equal(TestProjectData.SomeProjectFile1.FilePath, document.FilePath);
+                    Assert.Equal(TestProjectData.SomeProjectFile1.TargetPath, document.TargetPath);
                 });
 
             await Task.Run(async () => await host.DisposeAsync());
@@ -726,7 +724,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             ExtensionItems.Item("TestExtension");
 
-            DocumentItems.Item("File.cshtml");
+            DocumentItems.Item(Path.GetFileName(TestProjectData.SomeProjectFile1.FilePath));
 
             var changes = new TestProjectChangeDescription[]
             {
@@ -736,7 +734,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 DocumentItems.ToChange(),
             };
 
-            var services = new TestProjectSystemServices("c:\\MyProject\\Test.csproj");
+            var services = new TestProjectSystemServices(TestProjectData.SomeProject.FilePath);
 
             var host = new DefaultRazorProjectHost(services, Workspace, ProjectManager);
 
@@ -766,8 +764,8 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             ExtensionItems.Item("MVC-2.1");
             ExtensionItems.Item("Another-Thing");
 
-            DocumentItems.Item("File.cshtml");
-            DocumentItems.Property("File.cshtml", Rules.RazorGenerateWithTargetPath.TargetPathProperty, "File.cshtml");
+            DocumentItems.Item(Path.GetFileName(TestProjectData.SomeProjectFile1.FilePath));
+            DocumentItems.Property(Path.GetFileName(TestProjectData.SomeProjectFile1.FilePath), Rules.RazorGenerateWithTargetPath.TargetPathProperty, TestProjectData.SomeProjectFile1.TargetPath);
 
             var changes = new TestProjectChangeDescription[]
             {
@@ -777,7 +775,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 DocumentItems.ToChange(),
             };
 
-            var services = new TestProjectSystemServices("c:\\MyProject\\Test.csproj");
+            var services = new TestProjectSystemServices(TestProjectData.SomeProject.FilePath);
 
             var host = new DefaultRazorProjectHost(services, Workspace, ProjectManager);
 
@@ -789,7 +787,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             // Assert - 1
             var snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("c:\\MyProject\\Test.csproj", snapshot.FilePath);
+            Assert.Equal(TestProjectData.SomeProject.FilePath, snapshot.FilePath);
 
             Assert.Equal(RazorLanguageVersion.Version_2_1, snapshot.Configuration.LanguageVersion);
             Assert.Equal("MVC-2.1", snapshot.Configuration.ConfigurationName);
@@ -803,8 +801,8 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 d => 
                 {
                     var document = snapshot.GetDocument(d);
-                    Assert.Equal("c:\\MyProject\\File.cshtml", document.FilePath);
-                    Assert.Equal("File.cshtml", document.TargetPath);
+                    Assert.Equal(TestProjectData.SomeProjectFile1.FilePath, document.FilePath);
+                    Assert.Equal(TestProjectData.SomeProjectFile1.TargetPath, document.TargetPath);
                 });
 
             // Act - 2
@@ -813,9 +811,9 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             ConfigurationItems.RemoveItem("MVC-2.1");
             ConfigurationItems.Item("MVC-2.0", new Dictionary<string, string>() { { "Extensions", "MVC-2.0;Another-Thing" }, });
             ExtensionItems.Item("MVC-2.0");
-            DocumentItems.Item("c:\\AnotherProject\\AnotherFile.cshtml", new Dictionary<string, string>()
+            DocumentItems.Item(TestProjectData.AnotherProjectNestedFile3.FilePath, new Dictionary<string, string>()
             {
-                { Rules.RazorGenerateWithTargetPath.TargetPathProperty, "Pages\\AnotherFile.cshtml" },
+                { Rules.RazorGenerateWithTargetPath.TargetPathProperty, TestProjectData.AnotherProjectNestedFile3.TargetPath },
             });
 
             changes = new TestProjectChangeDescription[]
@@ -830,7 +828,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             // Assert - 2
             snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("c:\\MyProject\\Test.csproj", snapshot.FilePath);
+            Assert.Equal(TestProjectData.SomeProject.FilePath, snapshot.FilePath);
 
             Assert.Equal(RazorLanguageVersion.Version_2_0, snapshot.Configuration.LanguageVersion);
             Assert.Equal("MVC-2.0", snapshot.Configuration.ConfigurationName);
@@ -844,14 +842,14 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 d =>
                 {
                     var document = snapshot.GetDocument(d);
-                    Assert.Equal("c:\\AnotherProject\\AnotherFile.cshtml", document.FilePath);
-                    Assert.Equal("Pages\\AnotherFile.cshtml", document.TargetPath);
+                    Assert.Equal(TestProjectData.AnotherProjectNestedFile3.FilePath, document.FilePath);
+                    Assert.Equal(TestProjectData.AnotherProjectNestedFile3.TargetPath, document.TargetPath);
                 },
                 d =>
                 {
                     var document = snapshot.GetDocument(d);
-                    Assert.Equal("c:\\MyProject\\File.cshtml", document.FilePath);
-                    Assert.Equal("File.cshtml", document.TargetPath);
+                    Assert.Equal(TestProjectData.SomeProjectFile1.FilePath, document.FilePath);
+                    Assert.Equal(TestProjectData.SomeProjectFile1.TargetPath, document.TargetPath);
                 });
 
             await Task.Run(async () => await host.DisposeAsync());
@@ -871,8 +869,8 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             ExtensionItems.Item("MVC-2.1");
             ExtensionItems.Item("Another-Thing");
 
-            DocumentItems.Item("File.cshtml");
-            DocumentItems.Property("File.cshtml", Rules.RazorGenerateWithTargetPath.TargetPathProperty, "File.cshtml");
+            DocumentItems.Item(Path.GetFileName(TestProjectData.SomeProjectFile1.FilePath));
+            DocumentItems.Property(Path.GetFileName(TestProjectData.SomeProjectFile1.FilePath), Rules.RazorGenerateWithTargetPath.TargetPathProperty, TestProjectData.SomeProjectFile1.TargetPath);
 
             var changes = new TestProjectChangeDescription[]
             {
@@ -882,7 +880,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 DocumentItems.ToChange(),
             };
 
-            var services = new TestProjectSystemServices("c:\\MyProject\\Test.csproj");
+            var services = new TestProjectSystemServices(TestProjectData.SomeProject.FilePath);
 
             var host = new DefaultRazorProjectHost(services, Workspace, ProjectManager);
 
@@ -894,7 +892,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             // Assert - 1
             var snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("c:\\MyProject\\Test.csproj", snapshot.FilePath);
+            Assert.Equal(TestProjectData.SomeProject.FilePath, snapshot.FilePath);
 
             Assert.Equal(RazorLanguageVersion.Version_2_1, snapshot.Configuration.LanguageVersion);
             Assert.Equal("MVC-2.1", snapshot.Configuration.ConfigurationName);
@@ -937,8 +935,8 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             ExtensionItems.Item("MVC-2.1");
             ExtensionItems.Item("Another-Thing");
 
-            DocumentItems.Item("File.cshtml");
-            DocumentItems.Property("File.cshtml", Rules.RazorGenerateWithTargetPath.TargetPathProperty, "File.cshtml");
+            DocumentItems.Item(Path.GetFileName(TestProjectData.SomeProjectFile1.FilePath));
+            DocumentItems.Property(Path.GetFileName(TestProjectData.SomeProjectFile1.FilePath), Rules.RazorGenerateWithTargetPath.TargetPathProperty, TestProjectData.SomeProjectFile1.TargetPath);
 
             var changes = new TestProjectChangeDescription[]
             {
@@ -948,7 +946,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 DocumentItems.ToChange(),
             };
 
-            var services = new TestProjectSystemServices("c:\\MyProject\\Test.csproj");
+            var services = new TestProjectSystemServices(TestProjectData.SomeProject.FilePath);
 
             var host = new DefaultRazorProjectHost(services, Workspace, ProjectManager);
 
@@ -960,7 +958,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             // Assert - 1
             var snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("c:\\MyProject\\Test.csproj", snapshot.FilePath);
+            Assert.Equal(TestProjectData.SomeProject.FilePath, snapshot.FilePath);
 
             Assert.Equal(RazorLanguageVersion.Version_2_1, snapshot.Configuration.LanguageVersion);
             Assert.Equal("MVC-2.1", snapshot.Configuration.ConfigurationName);
@@ -1007,8 +1005,8 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             ExtensionItems.Item("MVC-2.1");
             ExtensionItems.Item("Another-Thing");
 
-            DocumentItems.Item("File.cshtml");
-            DocumentItems.Property("File.cshtml", Rules.RazorGenerateWithTargetPath.TargetPathProperty, "File.cshtml");
+            DocumentItems.Item(Path.GetFileName(TestProjectData.SomeProjectFile1.FilePath));
+            DocumentItems.Property(Path.GetFileName(TestProjectData.SomeProjectFile1.FilePath), Rules.RazorGenerateWithTargetPath.TargetPathProperty, TestProjectData.SomeProjectFile1.TargetPath);
 
             var changes = new TestProjectChangeDescription[]
             {
@@ -1018,7 +1016,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 DocumentItems.ToChange(),
             };
 
-            var services = new TestProjectSystemServices("c:\\MyProject\\Test.csproj");
+            var services = new TestProjectSystemServices(TestProjectData.SomeProject.FilePath);
 
             var host = new DefaultRazorProjectHost(services, Workspace, ProjectManager);
 
@@ -1030,16 +1028,16 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             // Assert - 1
             var snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("c:\\MyProject\\Test.csproj", snapshot.FilePath);
+            Assert.Equal(TestProjectData.SomeProject.FilePath, snapshot.FilePath);
             Assert.Same("MVC-2.1", snapshot.Configuration.ConfigurationName);
 
             // Act - 2
-            services.UnconfiguredProject.FullPath = "c:\\AnotherProject\\Test2.csproj";
+            services.UnconfiguredProject.FullPath = TestProjectData.AnotherProject.FilePath;
             await Task.Run(async () => await host.OnProjectRenamingAsync());
 
             // Assert - 1
             snapshot = Assert.Single(ProjectManager.Projects);
-            Assert.Equal("c:\\AnotherProject\\Test2.csproj", snapshot.FilePath);
+            Assert.Equal(TestProjectData.AnotherProject.FilePath, snapshot.FilePath);
             Assert.Same("MVC-2.1", snapshot.Configuration.ConfigurationName);
 
             await Task.Run(async () => await host.DisposeAsync());
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/FallbackRazorProjectHostTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/FallbackRazorProjectHostTest.cs
index 8cb7174d1b..22d9951f8f 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/FallbackRazorProjectHostTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/FallbackRazorProjectHostTest.cs
@@ -12,11 +12,10 @@ using ItemReference = Microsoft.CodeAnalysis.Razor.ProjectSystem.ManagedProjectS
 
 namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 {
-    public class FallbackRazorProjectHostTest : ForegroundDispatcherTestBase
+    public class FallbackRazorProjectHostTest : ForegroundDispatcherWorkspaceTestBase
     {
         public FallbackRazorProjectHostTest()
         {
-            Workspace = new AdhocWorkspace();
             ProjectManager = new TestProjectSnapshotManager(Dispatcher, Workspace);
 
             ReferenceItems = new ItemCollection(ManagedProjectSystemSchema.ResolvedCompilationReference.SchemaName);
@@ -32,8 +31,6 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
         private ItemCollection NoneItems { get; }
 
-        private Workspace Workspace { get; }
-
         [Fact]
         public void GetChangedAndRemovedDocuments_ReturnsChangedContentAndNoneItems()
         {
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestProjectSystemServices.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestProjectSystemServices.cs
index 78937189f9..42fa7a575f 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestProjectSystemServices.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/TestProjectSystemServices.cs
@@ -29,7 +29,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
         public TestProjectSystemServices(string fullPath, params TestPropertyData[] data)
         {
             ProjectService = new TestProjectService();
-            ThreadingService = ProjectService.Services.ThreadingPolicy;
+            ThreadingService = ProjectService.Services.TestThreadingPolicy;
 
             UnconfiguredProject = new TestUnconfiguredProject(ProjectService, fullPath);
             ProjectService.LoadedUnconfiguredProjects.Add(UnconfiguredProject);
@@ -87,33 +87,33 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
                 dataSourceVersions: ImmutableDictionary<NamedIdentity, IComparable>.Empty);
         }
 
-        public class TestProjectServices : IProjectServices
+        public class TestProjectServices : ProjectServices
         {
             public TestProjectServices(TestProjectService projectService)
             {
-                ProjectService = projectService;
-                ThreadingPolicy = new TestThreadingService();
+                TestProjectService = projectService;
+                TestThreadingPolicy = new TestThreadingService();
             }
 
-            public TestProjectService ProjectService { get; }
+            public TestProjectService TestProjectService { get; }
 
-            public TestThreadingService ThreadingPolicy { get; }
+            public TestThreadingService TestThreadingPolicy { get; }
 
-            IProjectLockService IProjectServices.ProjectLockService => throw new NotImplementedException();
+            public override IProjectService ProjectService => TestProjectService;
 
-            IProjectThreadingService IProjectServices.ThreadingPolicy => ThreadingPolicy;
+            public override IProjectThreadingService ThreadingPolicy => TestThreadingPolicy;
 
-            IProjectFaultHandlerService IProjectServices.FaultHandler => throw new NotImplementedException();
+            public override ExportProvider ExportProvider => throw new NotImplementedException();
 
-            IProjectReloader IProjectServices.ProjectReloader => throw new NotImplementedException();
+            public override IProjectDataSourceRegistry DataSourceRegistry => throw new NotImplementedException();
 
-            ExportProvider IProjectCommonServices.ExportProvider => throw new NotImplementedException();
+            public override IProjectCapabilitiesScope Capabilities => throw new NotImplementedException();
 
-            IProjectDataSourceRegistry IProjectCommonServices.DataSourceRegistry => throw new NotImplementedException();
+            public override IProjectLockService ProjectLockService => throw new NotImplementedException();
 
-            IProjectService IProjectCommonServices.ProjectService => ProjectService;
+            public override IProjectFaultHandlerService FaultHandler => throw new NotImplementedException();
 
-            IProjectCapabilitiesScope IProjectCommonServices.Capabilities => throw new NotImplementedException();
+            public override IProjectReloader ProjectReloader => throw new NotImplementedException();
         }
 
         public class TestProjectService : IProjectService
@@ -130,7 +130,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             IEnumerable<UnconfiguredProject> IProjectService.LoadedUnconfiguredProjects => throw new NotImplementedException();
 
-            IProjectServices IProjectService.Services => Services;
+            ProjectServices IProjectService.Services => Services;
 
             IProjectCapabilitiesScope IProjectService.Capabilities => throw new NotImplementedException();
 
@@ -171,15 +171,16 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             public List<TestConfiguredProject> LoadedConfiguredProjects { get; }
 
+            public UnconfiguredProjectServices Services => throw new NotImplementedException();
+
             string UnconfiguredProject.FullPath => FullPath;
+
             bool UnconfiguredProject.RequiresReloadForExternalFileChange => throw new NotImplementedException();
 
             IProjectCapabilitiesScope UnconfiguredProject.Capabilities => throw new NotImplementedException();
 
             IProjectService UnconfiguredProject.ProjectService => ProjectService;
 
-            IUnconfiguredProjectServices UnconfiguredProject.Services => throw new NotImplementedException();
-
             IEnumerable<ConfiguredProject> UnconfiguredProject.LoadedConfiguredProjects => LoadedConfiguredProjects;
 
             bool UnconfiguredProject.IsLoading => throw new NotImplementedException();
@@ -323,7 +324,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
             UnconfiguredProject ConfiguredProject.UnconfiguredProject => UnconfiguredProject;
 
-            IConfiguredProjectServices ConfiguredProject.Services => Services;
+            ConfiguredProjectServices ConfiguredProject.Services => Services;
 
             event AsyncEventHandler ConfiguredProject.ProjectUnloading
             {
@@ -370,65 +371,81 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
             }
         }
 
-        public class TestConfiguredProjectServices : IConfiguredProjectServices
+        public class TestConfiguredProjectServices : ConfiguredProjectServices
         {
             public TestConfiguredProjectServices(TestConfiguredProject configuredProject, TestPropertyData[] data)
             {
                 ConfiguredProject = configuredProject;
 
-                AdditionalRuleDefinitions = new TestAdditionalRuleDefinitionsService();
-                PropertyPagesCatalog = new TestPropertyPagesCatalogProvider(new TestPropertyPagesCatalog(data));
+                TestAdditionalRuleDefinitions = new TestAdditionalRuleDefinitionsService();
+                TestPropertyPagesCatalog = new TestPropertyPagesCatalogProvider(new TestPropertyPagesCatalog(data));
             }
 
             public TestConfiguredProject ConfiguredProject { get; }
 
-            public TestAdditionalRuleDefinitionsService AdditionalRuleDefinitions { get; }
+            public TestAdditionalRuleDefinitionsService TestAdditionalRuleDefinitions { get; }
 
-            public TestPropertyPagesCatalogProvider PropertyPagesCatalog { get; }
+            public override IAdditionalRuleDefinitionsService AdditionalRuleDefinitions => TestAdditionalRuleDefinitions;
 
-            IOutputGroupsService IConfiguredProjectServices.OutputGroups => throw new NotImplementedException();
+            public TestPropertyPagesCatalogProvider TestPropertyPagesCatalog { get; }
 
-            IBuildProject IConfiguredProjectServices.Build => throw new NotImplementedException();
+            public override IPropertyPagesCatalogProvider PropertyPagesCatalog => TestPropertyPagesCatalog;
 
-            IBuildSupport IConfiguredProjectServices.BuildSupport => throw new NotImplementedException();
+            public override IOutputGroupsService OutputGroups => throw new NotImplementedException();
 
-            IAssemblyReferencesService IConfiguredProjectServices.AssemblyReferences => throw new NotImplementedException();
+            public override IBuildProject Build => throw new NotImplementedException();
 
-            IComReferencesService IConfiguredProjectServices.ComReferences => throw new NotImplementedException();
+            public override IBuildSupport BuildSupport => throw new NotImplementedException();
 
-            ISdkReferencesService IConfiguredProjectServices.SdkReferences => throw new NotImplementedException();
+            public override IAssemblyReferencesService AssemblyReferences => throw new NotImplementedException();
 
-            IPackageReferencesService IConfiguredProjectServices.PackageReferences => throw new NotImplementedException();
+            public override IComReferencesService ComReferences => throw new NotImplementedException();
 
-            IWinRTReferencesService IConfiguredProjectServices.WinRTReferences => throw new NotImplementedException();
+            public override ISdkReferencesService SdkReferences => throw new NotImplementedException();
 
-            IBuildDependencyProjectReferencesService IConfiguredProjectServices.ProjectReferences => throw new NotImplementedException();
+            public override IPackageReferencesService PackageReferences => throw new NotImplementedException();
 
-            IProjectItemProvider IConfiguredProjectServices.SourceItems => throw new NotImplementedException();
+            public override IWinRTReferencesService WinRTReferences => throw new NotImplementedException();
 
-            IProjectPropertiesProvider IConfiguredProjectServices.ProjectPropertiesProvider => throw new NotImplementedException();
+            public override IBuildDependencyProjectReferencesService ProjectReferences => throw new NotImplementedException();
 
-            IProjectPropertiesProvider IConfiguredProjectServices.UserPropertiesProvider => throw new NotImplementedException();
+            public override IProjectItemProvider SourceItems => throw new NotImplementedException();
 
-            IProjectAsynchronousTasksService IConfiguredProjectServices.ProjectAsynchronousTasks => throw new NotImplementedException();
+            public override IProjectPropertiesProvider ProjectPropertiesProvider => throw new NotImplementedException();
 
-            IAdditionalRuleDefinitionsService IConfiguredProjectServices.AdditionalRuleDefinitions => AdditionalRuleDefinitions;
+            public override IProjectPropertiesProvider UserPropertiesProvider => throw new NotImplementedException();
 
-            IPropertyPagesCatalogProvider IConfiguredProjectServices.PropertyPagesCatalog => PropertyPagesCatalog;
+            public override IProjectSubscriptionService ProjectSubscription => throw new NotImplementedException();
 
-            IProjectSubscriptionService IConfiguredProjectServices.ProjectSubscription => throw new NotImplementedException();
+            public override IProjectSnapshotService ProjectSnapshotService => throw new NotImplementedException();
 
-            IProjectSnapshotService IConfiguredProjectServices.ProjectSnapshotService => throw new NotImplementedException();
+            public override IActiveConfiguredProjectSubscriptionService ActiveConfiguredProjectSubscription => throw new NotImplementedException();
 
-            object IConfiguredProjectServices.HostObject => throw new NotImplementedException();
+            public override IActiveConfiguredProjectProvider ActiveConfiguredProjectProvider => throw new NotImplementedException();
 
-            ExportProvider IProjectCommonServices.ExportProvider => throw new NotImplementedException();
+            public override IProjectAsynchronousTasksService ProjectAsynchronousTasks => throw new NotImplementedException();
 
-            IProjectDataSourceRegistry IProjectCommonServices.DataSourceRegistry => throw new NotImplementedException();
+            public override IProjectConfigurationsService ProjectConfigurationsService => throw new NotImplementedException();
 
-            IProjectService IProjectCommonServices.ProjectService => ConfiguredProject.UnconfiguredProject.ProjectService;
+            public override object HostObject => throw new NotImplementedException();
 
-            IProjectCapabilitiesScope IProjectCommonServices.Capabilities => throw new NotImplementedException();
+            public override IProjectCapabilitiesRequirementsService ProjectCapabilitiesRequirementsService => throw new NotImplementedException();
+
+            public override ExportProvider ExportProvider => throw new NotImplementedException();
+
+            public override IProjectDataSourceRegistry DataSourceRegistry => throw new NotImplementedException();
+
+            public override IProjectService ProjectService => ConfiguredProject.UnconfiguredProject.ProjectService;
+
+            public override IProjectCapabilitiesScope Capabilities => throw new NotImplementedException();
+
+            public override IProjectLockService ProjectLockService => throw new NotImplementedException();
+
+            public override IProjectThreadingService ThreadingPolicy => throw new NotImplementedException();
+
+            public override IProjectFaultHandlerService FaultHandler => throw new NotImplementedException();
+
+            public override IProjectReloader ProjectReloader => throw new NotImplementedException();
         }
 
         public class TestAdditionalRuleDefinitionsService : IAdditionalRuleDefinitionsService
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/WorkspaceProjectSnapshotChangeTriggerTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/WorkspaceProjectSnapshotChangeTriggerTest.cs
index f77a283b33..f5931269d2 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/WorkspaceProjectSnapshotChangeTriggerTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/ProjectSystem/WorkspaceProjectSnapshotChangeTriggerTest.cs
@@ -9,11 +9,10 @@ using Xunit;
 
 namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 {
-    public class WorkspaceProjectSnapshotChangeTriggerTest : ForegroundDispatcherTestBase
+    public class WorkspaceProjectSnapshotChangeTriggerTest : ForegroundDispatcherWorkspaceTestBase
     {
         public WorkspaceProjectSnapshotChangeTriggerTest()
         {
-            Workspace = TestWorkspace.Create();
             EmptySolution = Workspace.CurrentSolution.GetIsolatedSolution();
 
             var projectId1 = ProjectId.CreateNewId("One");
@@ -72,8 +71,6 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
 
         private Project ProjectNumberThree { get; }
 
-        private Workspace Workspace { get; }
-
         [ForegroundTheory]
         [InlineData(WorkspaceChangeKind.SolutionAdded)]
         [InlineData(WorkspaceChangeKind.SolutionChanged)]
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/VsSolutionUpdatesProjectSnapshotChangeTriggerTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/VsSolutionUpdatesProjectSnapshotChangeTriggerTest.cs
index c5ce077844..d180992d83 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/VsSolutionUpdatesProjectSnapshotChangeTriggerTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/VsSolutionUpdatesProjectSnapshotChangeTriggerTest.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.Shell.Interop;
@@ -16,8 +16,8 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
     {
         public VsSolutionUpdatesProjectSnapshotChangeTriggerTest()
         {
-            SomeProject = new HostProject("c:\\SomeProject\\SomeProject.csproj", FallbackRazorConfiguration.MVC_1_0);
-            SomeOtherProject = new HostProject("c:\\SomeOtherProject\\SomeOtherProject.csproj", FallbackRazorConfiguration.MVC_2_0);
+            SomeProject = new HostProject(TestProjectData.SomeProject.FilePath, FallbackRazorConfiguration.MVC_1_0);
+            SomeOtherProject = new HostProject(TestProjectData.AnotherProject.FilePath, FallbackRazorConfiguration.MVC_2_0);
 
             Workspace = TestWorkspace.Create(w =>
             {
diff --git a/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test.csproj b/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test.csproj
index a413433e4a..59efeb770d 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test.csproj
+++ b/src/Razor/test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test/Microsoft.VisualStudio.Mac.LanguageServices.Razor.Test.csproj
@@ -1,13 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="..\Microsoft.CodeAnalysis.Razor.Workspaces.Test\Shared\**\*.cs">
       <Link>Shared\%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Compile>
+    <Compile Include="..\Microsoft.VisualStudio.Editor.Razor.Test\Shared\**\*.cs">
+      <Link>Shared\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
@@ -27,4 +30,8 @@
     <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' ">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssemblies)" PrivateAssets="All" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Razor/test/RazorPageGenerator.Test/RazorPageGenerator.Test.csproj b/src/Razor/test/RazorPageGenerator.Test/RazorPageGenerator.Test.csproj
index 414da38a02..615615d511 100644
--- a/src/Razor/test/RazorPageGenerator.Test/RazorPageGenerator.Test.csproj
+++ b/src/Razor/test/RazorPageGenerator.Test/RazorPageGenerator.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <!-- To generate baselines, run tests with /p:GenerateBaselines=true -->
     <DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
     <DefineConstants>$(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES</DefineConstants>
diff --git a/src/Razor/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj
index 853f1fee6a..10866769b7 100644
--- a/src/Razor/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj
+++ b/src/Razor/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj
@@ -1,19 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   
   <PropertyGroup>
-    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\</_RazorMSBuildRoot>
-    <RazorSdkBuildTasksDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\</RazorSdkBuildTasksDirectoryRoot>
+    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />
 
   <PropertyGroup>
-    <!-- Override for the MVC extension -->
-    <_MvcExtensionAssemblyPath>$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll</_MvcExtensionAssemblyPath>
-  </PropertyGroup>
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.props" />
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
@@ -31,7 +23,6 @@
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
     <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Design\Microsoft.AspNetCore.Razor.Design.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
@@ -40,6 +31,4 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/>
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
-
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.targets" />
 </Project>
diff --git a/src/Razor/test/testapps/ClassLibrary/ClassLibrary.csproj b/src/Razor/test/testapps/ClassLibrary/ClassLibrary.csproj
index 69d5f1b5d7..717524a947 100644
--- a/src/Razor/test/testapps/ClassLibrary/ClassLibrary.csproj
+++ b/src/Razor/test/testapps/ClassLibrary/ClassLibrary.csproj
@@ -1,18 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   
   <PropertyGroup>
-    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\</_RazorMSBuildRoot>
-    <RazorSdkBuildTasksDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\</RazorSdkBuildTasksDirectoryRoot>
+    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />
-
-  <PropertyGroup>
-    <!-- Override for the MVC extension -->
-    <_MvcExtensionAssemblyPath>$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll</_MvcExtensionAssemblyPath>
-  </PropertyGroup>
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.props" />
-
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
 
@@ -20,6 +11,10 @@
     <Product>Razor Test</Product>
     <Company>Microsoft</Company>
     <Description>ClassLibrary Description</Description>
+
+    <_EnableAllInclusiveRazorSdk>true</_EnableAllInclusiveRazorSdk>
+    <RazorLangVersion>3.0</RazorLangVersion>
+    <RazorDefaultConfiguration>MVC-3.0</RazorDefaultConfiguration>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
@@ -31,7 +26,6 @@
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
     <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Design\Microsoft.AspNetCore.Razor.Design.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
@@ -43,6 +37,4 @@
 
   <!-- Test Placeholder -->
 
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.targets" />
-
 </Project>
diff --git a/src/Razor/test/testapps/ClassLibrary2/ClassLibrary2.csproj b/src/Razor/test/testapps/ClassLibrary2/ClassLibrary2.csproj
index c31808dea6..2576345aa3 100644
--- a/src/Razor/test/testapps/ClassLibrary2/ClassLibrary2.csproj
+++ b/src/Razor/test/testapps/ClassLibrary2/ClassLibrary2.csproj
@@ -1,20 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   
   <PropertyGroup>
-    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\</_RazorMSBuildRoot>
-    <RazorSdkBuildTasksDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\</RazorSdkBuildTasksDirectoryRoot>
+    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />
-
-  <PropertyGroup>
-    <!-- Override for the MVC extension -->
-    <_MvcExtensionAssemblyPath>$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll</_MvcExtensionAssemblyPath>
-  </PropertyGroup>
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.props" />
-
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+
+    <_EnableAllInclusiveRazorSdk>true</_EnableAllInclusiveRazorSdk>
+    <RazorLangVersion>3.0</RazorLangVersion>
+    <RazorDefaultConfiguration>MVC-3.0</RazorDefaultConfiguration>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
@@ -30,7 +25,6 @@
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
     <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Design\Microsoft.AspNetCore.Razor.Design.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
@@ -42,6 +36,4 @@
 
   <!-- Test Placeholder -->
 
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.targets" />
-
 </Project>
diff --git a/src/Razor/test/testapps/Directory.Build.props b/src/Razor/test/testapps/Directory.Build.props
index ad571d2510..8020d32ee0 100644
--- a/src/Razor/test/testapps/Directory.Build.props
+++ b/src/Razor/test/testapps/Directory.Build.props
@@ -19,7 +19,10 @@
     <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
     <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
 
-    <NETStandardImplicitPackageVersion>$(NETStandardLibraryPackageVersion)</NETStandardImplicitPackageVersion>
+    <NETStandardImplicitPackageVersion>$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
+
+    <!-- Working around an issue in XDT transforms -->
+    <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
   </PropertyGroup>
 
   <!-- Don't use the server when building in place. This locks up rzc.dll -->
diff --git a/src/Razor/test/testapps/Directory.Build.targets b/src/Razor/test/testapps/Directory.Build.targets
index f9e03832a0..39f4f47645 100644
--- a/src/Razor/test/testapps/Directory.Build.targets
+++ b/src/Razor/test/testapps/Directory.Build.targets
@@ -2,7 +2,7 @@
   <Import Project="RazorTest.Introspection.targets" />
 
   <PropertyGroup>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion>
     <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
     <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
   </PropertyGroup>
diff --git a/src/Razor/test/testapps/LargeProject/LargeProject.csproj b/src/Razor/test/testapps/LargeProject/LargeProject.csproj
index 8e7d83c73f..5f755a4dfd 100644
--- a/src/Razor/test/testapps/LargeProject/LargeProject.csproj
+++ b/src/Razor/test/testapps/LargeProject/LargeProject.csproj
@@ -1,20 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\</_RazorMSBuildRoot>
-    <RazorSdkBuildTasksDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\</RazorSdkBuildTasksDirectoryRoot>
+    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />
-
   <PropertyGroup>
-    <!-- Override for the MVC extension -->
-    <_MvcExtensionAssemblyPath>$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll</_MvcExtensionAssemblyPath>
-  </PropertyGroup>
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.props" />
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
@@ -26,7 +17,6 @@
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
     <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Design\Microsoft.AspNetCore.Razor.Design.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
@@ -37,7 +27,5 @@
   </ItemGroup>  
 
   <!-- Test Placeholder -->
-
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.targets" />
   
 </Project>
diff --git a/src/Razor/test/testapps/MvcWithComponents/Models/ErrorViewModel.cs b/src/Razor/test/testapps/MvcWithComponents/Models/ErrorViewModel.cs
new file mode 100644
index 0000000000..df07aa87c0
--- /dev/null
+++ b/src/Razor/test/testapps/MvcWithComponents/Models/ErrorViewModel.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace MvcWithComponents.Models
+{
+    public class ErrorViewModel
+    {
+        public string RequestId { get; set; }
+
+        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/testapps/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testapps/MvcWithComponents/MvcWithComponents.csproj
new file mode 100644
index 0000000000..660a620ff1
--- /dev/null
+++ b/src/Razor/test/testapps/MvcWithComponents/MvcWithComponents.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Html.Abstractions.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/>
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
+  </ItemGroup>
+
+  <!-- Test Placeholder -->
+
+</Project>
diff --git a/src/Razor/test/testapps/MvcWithComponents/Program.cs b/src/Razor/test/testapps/MvcWithComponents/Program.cs
new file mode 100644
index 0000000000..2011ae9687
--- /dev/null
+++ b/src/Razor/test/testapps/MvcWithComponents/Program.cs
@@ -0,0 +1,13 @@
+
+namespace MvcWithComponents
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Just make sure we have a reference to the MvcShim
+            var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult);
+            System.Console.WriteLine(t.FullName);
+        }
+    }
+}
diff --git a/src/Razor/test/testapps/MvcWithComponents/TestComponent.razor b/src/Razor/test/testapps/MvcWithComponents/TestComponent.razor
new file mode 100644
index 0000000000..558c8aaa24
--- /dev/null
+++ b/src/Razor/test/testapps/MvcWithComponents/TestComponent.razor
@@ -0,0 +1 @@
+Hello from component
\ No newline at end of file
diff --git a/src/Razor/test/testapps/MvcWithComponents/Views/Home/Index.cshtml b/src/Razor/test/testapps/MvcWithComponents/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..8832e1ad15
--- /dev/null
+++ b/src/Razor/test/testapps/MvcWithComponents/Views/Home/Index.cshtml
@@ -0,0 +1,5 @@
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+Hello world!
\ No newline at end of file
diff --git a/src/Razor/test/testapps/MvcWithComponents/Views/Shared/NavMenu.razor b/src/Razor/test/testapps/MvcWithComponents/Views/Shared/NavMenu.razor
new file mode 100644
index 0000000000..d6eede9b18
--- /dev/null
+++ b/src/Razor/test/testapps/MvcWithComponents/Views/Shared/NavMenu.razor
@@ -0,0 +1,2 @@
+NavMenu content
+
diff --git a/src/Razor/test/testapps/MvcWithComponents/Views/_ViewImports.cshtml b/src/Razor/test/testapps/MvcWithComponents/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..7e47b2893e
--- /dev/null
+++ b/src/Razor/test/testapps/MvcWithComponents/Views/_ViewImports.cshtml
@@ -0,0 +1,3 @@
+@using MvcWithComponents
+@using MvcWithComponents.Models
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testapps/MvcWithComponents/Views/_ViewStart.cshtml b/src/Razor/test/testapps/MvcWithComponents/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Razor/test/testapps/MvcWithComponents/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}
diff --git a/src/Razor/test/testapps/SimpleMvc/SimpleMvc.csproj b/src/Razor/test/testapps/SimpleMvc/SimpleMvc.csproj
index 22b0730b7a..925a8c7194 100644
--- a/src/Razor/test/testapps/SimpleMvc/SimpleMvc.csproj
+++ b/src/Razor/test/testapps/SimpleMvc/SimpleMvc.csproj
@@ -1,20 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   
   <PropertyGroup>
-    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\</_RazorMSBuildRoot>
-    <RazorSdkBuildTasksDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\</RazorSdkBuildTasksDirectoryRoot>
+    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />
-
   <PropertyGroup>
-    <!-- Override for the MVC extension -->
-    <_MvcExtensionAssemblyPath>$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll</_MvcExtensionAssemblyPath>
-  </PropertyGroup>
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.props" />
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
@@ -26,7 +17,6 @@
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
     <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Design\Microsoft.AspNetCore.Razor.Design.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
@@ -38,6 +28,4 @@
 
   <!-- Test Placeholder -->
 
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.targets" />
-
 </Project>
diff --git a/src/Razor/test/testapps/SimpleMvc21/Models/ErrorViewModel.cs b/src/Razor/test/testapps/SimpleMvc21/Models/ErrorViewModel.cs
new file mode 100644
index 0000000000..b4aa044914
--- /dev/null
+++ b/src/Razor/test/testapps/SimpleMvc21/Models/ErrorViewModel.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace SimpleMvc.Models
+{
+    public class ErrorViewModel
+    {
+        public string RequestId { get; set; }
+
+        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+    }
+}
\ No newline at end of file
diff --git a/src/Razor/test/testapps/SimpleMvc21/Program.cs b/src/Razor/test/testapps/SimpleMvc21/Program.cs
new file mode 100644
index 0000000000..39ec364271
--- /dev/null
+++ b/src/Razor/test/testapps/SimpleMvc21/Program.cs
@@ -0,0 +1,13 @@
+
+namespace SimpleMvc
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Just make sure we have a reference to the MVC 2.1
+            var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult);
+            System.Console.WriteLine(t.FullName);
+        }
+    }
+}
diff --git a/src/Razor/test/testapps/SimpleMvc21/SimpleMvc21.csproj b/src/Razor/test/testapps/SimpleMvc21/SimpleMvc21.csproj
new file mode 100644
index 0000000000..2f53950aa6
--- /dev/null
+++ b/src/Razor/test/testapps/SimpleMvc21/SimpleMvc21.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <!--
+    This project references a shipped version of MVC and should not reference local builds of
+    the CodeGeneration targets, rzc, or any of the test shims.
+  -->
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+  </PropertyGroup>
+
+  <!-- Test Placeholder -->
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.App">
+      <!-- Avoid exporting types from real MVC that will conflict with the test shim -->
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+
+     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2">
+      <!-- Avoid exporting types from real MVC that will conflict with the test shim -->
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/src/Razor/test/testapps/SimpleMvc21/Views/Home/About.cshtml b/src/Razor/test/testapps/SimpleMvc21/Views/Home/About.cshtml
new file mode 100644
index 0000000000..3674e37a86
--- /dev/null
+++ b/src/Razor/test/testapps/SimpleMvc21/Views/Home/About.cshtml
@@ -0,0 +1,7 @@
+@{
+    ViewData["Title"] = "About";
+}
+<h2>@ViewData["Title"]</h2>
+<h3>@ViewData["Message"]</h3>
+
+<p>Use this area to provide additional information.</p>
diff --git a/src/Razor/test/testapps/SimpleMvc21/Views/Home/Index.cshtml b/src/Razor/test/testapps/SimpleMvc21/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..00afab6a0c
--- /dev/null
+++ b/src/Razor/test/testapps/SimpleMvc21/Views/Home/Index.cshtml
@@ -0,0 +1,108 @@
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+<div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="6000">
+    <ol class="carousel-indicators">
+        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+        <li data-target="#myCarousel" data-slide-to="1"></li>
+        <li data-target="#myCarousel" data-slide-to="2"></li>
+        <li data-target="#myCarousel" data-slide-to="3"></li>
+    </ol>
+    <div class="carousel-inner" role="listbox">
+        <div class="item active">
+            <img src="~/images/banner1.svg" alt="ASP.NET" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how to build ASP.NET apps that can run anywhere.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525028&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner2.svg" alt="Visual Studio" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    There are powerful new features in Visual Studio for building modern web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525030&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner3.svg" alt="Package Management" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Bring in libraries from NuGet, Bower, and npm, and automate tasks using Grunt or Gulp.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525029&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/images/banner4.svg" alt="Microsoft Azure" class="img-responsive" />
+            <div class="carousel-caption" role="option">
+                <p>
+                    Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps.
+                    <a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkID=525027&clcid=0x409">
+                        Learn More
+                    </a>
+                </p>
+            </div>
+        </div>
+    </div>
+    <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
+        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+        <span class="sr-only">Previous</span>
+    </a>
+    <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
+        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+        <span class="sr-only">Next</span>
+    </a>
+</div>
+
+<div class="row">
+    <div class="col-md-3">
+        <h2>Application uses</h2>
+        <ul>
+            <li>Sample pages using ASP.NET Core MVC</li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518004">Bower</a> for managing client-side libraries</li>
+            <li>Theming using <a href="https://go.microsoft.com/fwlink/?LinkID=398939">Bootstrap</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>How to</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398600">Add a Controller and View</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699315">Manage User Secrets using Secret Manager.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699316">Use logging to log a message.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699317">Add packages using NuGet.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699318">Add client packages using Bower.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699319">Target development, staging or production environment.</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Overview</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=518008">Conceptual overview of what is ASP.NET Core</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=699320">Fundamentals of ASP.NET Core such as Startup and middleware.</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398602">Working with Data</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkId=398603">Security</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699321">Client side development</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699322">Develop on different platforms</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=699323">Read more on the documentation site</a></li>
+        </ul>
+    </div>
+    <div class="col-md-3">
+        <h2>Run &amp; Deploy</h2>
+        <ul>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517851">Run your app</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=517853">Run tools such as EF migrations and more</a></li>
+            <li><a href="https://go.microsoft.com/fwlink/?LinkID=398609">Publish to Microsoft Azure Web Apps</a></li>
+        </ul>
+    </div>
+</div>
diff --git a/src/Razor/test/testapps/SimpleMvc21/Views/Shared/_Layout.cshtml b/src/Razor/test/testapps/SimpleMvc21/Views/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..1a9473e464
--- /dev/null
+++ b/src/Razor/test/testapps/SimpleMvc21/Views/Shared/_Layout.cshtml
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - SimpleMvc</title>
+
+    <environment include="Development">
+        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+        <link rel="stylesheet" href="~/css/site.css" />
+    </environment>
+    <environment exclude="Development">
+        <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
+              asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
+              asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
+        <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
+    </environment>
+</head>
+<body>
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">SimpleMvc</a>
+            </div>
+            <div class="navbar-collapse collapse">
+                <ul class="nav navbar-nav">
+                    <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+    <div class="container body-content">
+        @RenderBody()
+        <hr />
+        <footer>
+            <p>&copy; 2017 - SimpleMvc</p>
+        </footer>
+    </div>
+
+    <environment include="Development">
+        <script src="~/lib/jquery/dist/jquery.js"></script>
+        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
+        <script src="~/js/site.js" asp-append-version="true"></script>
+    </environment>
+    <environment exclude="Development">
+        <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
+                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
+                asp-fallback-test="window.jQuery"
+                crossorigin="anonymous"
+                integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
+        </script>
+        <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
+                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
+                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
+                crossorigin="anonymous"
+                integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">
+        </script>
+        <script src="~/js/site.min.js" asp-append-version="true"></script>
+    </environment>
+
+    @RenderSection("Scripts", required: false)
+</body>
+</html>
diff --git a/src/Razor/test/testapps/SimpleMvc21/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Razor/test/testapps/SimpleMvc21/Views/Shared/_ValidationScriptsPartial.cshtml
new file mode 100644
index 0000000000..a699aafa97
--- /dev/null
+++ b/src/Razor/test/testapps/SimpleMvc21/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -0,0 +1,18 @@
+<environment include="Development">
+    <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
+    <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
+</environment>
+<environment exclude="Development">
+    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.14.0/jquery.validate.min.js"
+            asp-fallback-src="~/lib/jquery-validation/dist/jquery.validate.min.js"
+            asp-fallback-test="window.jQuery && window.jQuery.validator"
+            crossorigin="anonymous"
+            integrity="sha384-Fnqn3nxp3506LP/7Y3j/25BlWeA3PXTyT1l78LjECcPaKCV12TsZP7yyMxOe/G/k">
+    </script>
+    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validation.unobtrusive/3.2.6/jquery.validate.unobtrusive.min.js"
+            asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
+            asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
+            crossorigin="anonymous"
+            integrity="sha384-JrXK+k53HACyavUKOsL+NkmSesD2P+73eDMrbTtTk0h4RmOF8hF8apPlkp26JlyH">
+    </script>
+</environment>
diff --git a/src/Razor/test/testapps/SimpleMvc21/Views/_ViewImports.cshtml b/src/Razor/test/testapps/SimpleMvc21/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..477d4ba603
--- /dev/null
+++ b/src/Razor/test/testapps/SimpleMvc21/Views/_ViewImports.cshtml
@@ -0,0 +1,4 @@
+@using SimpleMvc
+@using SimpleMvc.Models
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@namespace SimpleMvc21
diff --git a/src/Razor/test/testapps/SimpleMvc21/Views/_ViewStart.cshtml b/src/Razor/test/testapps/SimpleMvc21/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Razor/test/testapps/SimpleMvc21/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}
diff --git a/src/Razor/test/testapps/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/test/testapps/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
index e15be7467f..6f2c4cc5c1 100644
--- a/src/Razor/test/testapps/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
+++ b/src/Razor/test/testapps/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
@@ -1,20 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\</_RazorMSBuildRoot>
-    <RazorSdkBuildTasksDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\</RazorSdkBuildTasksDirectoryRoot>
+    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />
-
   <PropertyGroup>
-    <!-- Override for the MVC extension -->
-    <_MvcExtensionAssemblyPath>$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll</_MvcExtensionAssemblyPath>
-  </PropertyGroup>
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.props" />
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
@@ -31,7 +22,6 @@
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
     <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Design\Microsoft.AspNetCore.Razor.Design.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
@@ -43,6 +33,4 @@
 
   <!-- Test Placeholder -->
 
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.targets" />
-
 </Project>
diff --git a/src/Razor/test/testapps/SimplePages/SimplePages.csproj b/src/Razor/test/testapps/SimplePages/SimplePages.csproj
index 292a128c5a..23f9ef1c2e 100644
--- a/src/Razor/test/testapps/SimplePages/SimplePages.csproj
+++ b/src/Razor/test/testapps/SimplePages/SimplePages.csproj
@@ -1,20 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\</_RazorMSBuildRoot>
-    <RazorSdkBuildTasksDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\</RazorSdkBuildTasksDirectoryRoot>
+    <RazorSdkDirectoryRoot>$(RazorSdkProjectDirectory)bin\$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />
-
   <PropertyGroup>
-    <!-- Override for the MVC extension -->
-    <_MvcExtensionAssemblyPath>$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll</_MvcExtensionAssemblyPath>
-  </PropertyGroup>
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.props" />
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RunningAsTest)' == ''">
@@ -26,7 +17,6 @@
     <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
     <ProjectReference Include="..\..\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.csproj"/>
     <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj"/>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Razor.Design\Microsoft.AspNetCore.Razor.Design.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(BinariesRoot)'!=''">
@@ -37,7 +27,5 @@
   </ItemGroup>
 
   <!-- Test Placeholder -->
-
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Mvc.Razor.Extensions\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.targets" />
   
 </Project>
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj b/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj
index 9f6462e3a7..9e27487228 100644
--- a/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj
+++ b/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj
@@ -2,7 +2,7 @@
   <Import Project="AddinMetadata.props" />
   
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -41,6 +41,10 @@
     <PackageReference Include="Mono.Addins" Version="$(MonoAddinsPackageVersion)" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' ">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssemblies)" PrivateAssets="All" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Mac.LanguageServices.Razor\Microsoft.VisualStudio.Mac.LanguageServices.Razor.csproj" />
   </ItemGroup>
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Properties/_Manifest.addin.xml b/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Properties/_Manifest.addin.xml
index 0c81e6caf6..e272787f39 100644
--- a/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Properties/_Manifest.addin.xml
+++ b/src/Razor/tooling/Microsoft.VisualStudio.Mac.RazorAddin/Properties/_Manifest.addin.xml
@@ -5,6 +5,7 @@
     <Import assembly="Microsoft.CodeAnalysis.Razor.Workspaces.dll" />
     <Import assembly="Microsoft.AspNetCore.Razor.Language.dll" />
     <Import assembly="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.dll" />
+    <Import assembly="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.dll" />
     <Import assembly="Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
     <Import assembly="Microsoft.CodeAnalysis.Razor.dll" />
     <Import assembly="Microsoft.VisualStudio.Mac.LanguageServices.Razor.dll" />
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
index 8ba762a40c..7ef34bd712 100644
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
+++ b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
   <PropertyGroup>
-    <VsixVersion>15.8</VsixVersion>
-    
+    <VsixVersion>16.0</VsixVersion>
     <!-- VS does not like letters in package versions -->
     <VSIXBuildNumber Condition="'$(BuildNumber)' == 't000'">99999</VSIXBuildNumber>
     <VSIXBuildNumber Condition="'$(VSIXBuildNumber)' == ''">$(BuildNumber)</VSIXBuildNumber>
     <VsixVersion Condition="'$(VSIXBuildNumber)'!=''">$(VsixVersion).$(VSIXBuildNumber)</VsixVersion>
     <VsixVersion Condition="'$(VSIXBuildNumber)'==''">$(VsixVersion).999999</VsixVersion>
-    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -27,6 +26,7 @@
     <IsProductComponent>true</IsProductComponent>
     <ImportDirectoryBuildProps>false</ImportDirectoryBuildProps>
     <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
+    <IncludePackageReferencesInVSIXContainer>false</IncludePackageReferencesInVSIXContainer>
   </PropertyGroup>
   <Import Project="..\..\version.props" />
   <Import Project="..\..\build\sources.props" />
@@ -41,11 +41,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.VisualStudio.RazorExtension</RootNamespace>
     <AssemblyName>Microsoft.VisualStudio.RazorExtension</AssemblyName>
-    <!--
-    We exclude some facade-only assemblies (i.e. assemblies without any implementation) from the VSIX using the SuppressFromVsix ItemGroup listed in this file.
-    The list is dependent on the framework being targeted. Changes to TargetFrameworkVersion would warrant rebuilding the SuppressFromVsix ItemGroup.
-    -->
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -176,6 +172,15 @@
       <IncludeOutputGroupsInVSIXLocalOnly>
       </IncludeOutputGroupsInVSIXLocalOnly>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj">
+      <Project>{0693ca32-bb75-401e-bc08-72d6deeb4c99}</Project>
+      <Name>Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X</Name>
+      <Private>False</Private>
+      <IncludeOutputGroupsInVSIX>
+      </IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIXLocalOnly>
+      </IncludeOutputGroupsInVSIXLocalOnly>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.Language\Microsoft.AspNetCore.Razor.Language.csproj">
       <Project>{932f3c9c-a6c0-40d3-ba50-9309886242fc}</Project>
       <Name>Microsoft.AspNetCore.Razor.Language</Name>
@@ -235,42 +240,9 @@
       Versions must be written here instead of being set as MSBuild variable.
       See https://github.com/dotnet/project-system/issues/2129.
     -->
-    <PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="15.0.26606" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="15.0.26606" />
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.7.109" />
-  </ItemGroup>
-  <ItemDefinitionGroup>
-    <SuppressFromVsix>
-      <Visible>false</Visible>
-    </SuppressFromVsix>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <SuppressFromVsix Include="Esent.Interop.dll" />
-    <SuppressFromVsix Include="Microsoft.CodeAnalysis.CSharp.EditorFeatures.dll" />
-    <SuppressFromVsix Include="Microsoft.CodeAnalysis.EditorFeatures.dll" />
-    <SuppressFromVsix Include="Microsoft.CodeAnalysis.EditorFeatures.Text.dll" />
-    <SuppressFromVsix Include="Microsoft.CodeAnalysis.Elfie.dll" />
-    <SuppressFromVsix Include="Microsoft.CodeAnalysis.Features.dll" />
-    <SuppressFromVsix Include="Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.dll" />
-    <SuppressFromVsix Include="System.AppContext.dll" />
-    <SuppressFromVsix Include="System.Console.dll" />
-    <SuppressFromVsix Include="System.Diagnostics.FileVersionInfo.dll" />
-    <SuppressFromVsix Include="System.Diagnostics.StackTrace.dll" />
-    <SuppressFromVsix Include="System.IO.Compression.dll" />
-    <SuppressFromVsix Include="System.IO.FileSystem.dll" />
-    <SuppressFromVsix Include="System.IO.FileSystem.Primitives.dll" />
-    <SuppressFromVsix Include="System.Runtime.InteropServices.RuntimeInformation.dll" />
-    <SuppressFromVsix Include="System.Security.Cryptography.Algorithms.dll" />
-    <SuppressFromVsix Include="System.Security.Cryptography.Encoding.dll" />
-    <SuppressFromVsix Include="System.Security.Cryptography.Primitives.dll" />
-    <SuppressFromVsix Include="System.Security.Cryptography.X509Certificates.dll" />
-    <SuppressFromVsix Include="System.Text.Encoding.CodePages.dll" />
-    <SuppressFromVsix Include="System.Threading.Thread.dll" />
-    <SuppressFromVsix Include="System.ValueTuple.dll" />
-    <SuppressFromVsix Include="System.Xml.ReaderWriter.dll" />
-    <SuppressFromVsix Include="System.Xml.XmlDocument.dll" />
-    <SuppressFromVsix Include="System.Xml.XPath.dll" />
-    <SuppressFromVsix Include="System.Xml.XPath.XDocument.dll" />
+    <PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="15.8.525" />
+    <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="15.8.28010" />
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.8.3252" />
   </ItemGroup>
   <Target Name="CopySymbolsToOutput" AfterTargets="Build" Condition="'$(SymbolsPublishDir)' != ''">
     <Copy SourceFiles="$(OutDir)$(AssemblyName).pdb" DestinationFolder="$(SymbolsPublishDir)" />
@@ -300,14 +272,15 @@
     </VSIXSourceItem>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <VSIXSourceItem Include="..\..\src\Microsoft.CodeAnalysis.Remote.Razor\bin\$(Configuration)\net46\Microsoft.CodeAnalysis.Remote.Razor.dll" />
-    <VSIXSourceItem Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\net46\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
-    <VSIXSourceItem Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\bin\$(Configuration)\net46\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.dll" />
-    <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.AspNetCore.Razor.Language.dll" />
-    <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.CodeAnalysis.Razor.dll" />
-    <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.CodeAnalysis.Razor.Workspaces.dll" />
-    <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.VisualStudio.Editor.Razor.dll" />
-    <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.VisualStudio.LanguageServices.Razor.dll" />
+    <VSIXSourceItem Include="..\..\src\Microsoft.CodeAnalysis.Remote.Razor\bin\$(Configuration)\net472\Microsoft.CodeAnalysis.Remote.Razor.dll" />
+    <VSIXSourceItem Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
+    <VSIXSourceItem Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.dll" />
+    <VSIXSourceItem Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.dll" />
+    <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net472\Microsoft.AspNetCore.Razor.Language.dll" />
+    <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net472\Microsoft.CodeAnalysis.Razor.dll" />
+    <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net472\Microsoft.CodeAnalysis.Razor.Workspaces.dll" />
+    <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net472\Microsoft.VisualStudio.Editor.Razor.dll" />
+    <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net472\Microsoft.VisualStudio.LanguageServices.Razor.dll" />
     <Content Include="@(VSIXSourceItem)">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -331,20 +304,14 @@
       <_Parameter1>$(VsixVersion)</_Parameter1>
     </_VSIXAssemblyAttribute>
   </ItemGroup>
-  <Target Name="_GenerateVSIXBindingRedirects"
-    DependsOnTargets="PrepareForBuild"
-    BeforeTargets="CoreCompile"
-    Inputs="$(MSBuildAllProjects)"
-    Outputs="$(_GeneratedVSIXBindingRedirectFile)">
+  <Target Name="_GenerateVSIXBindingRedirects" DependsOnTargets="PrepareForBuild" BeforeTargets="CoreCompile" Inputs="$(MSBuildAllProjects)" Outputs="$(_GeneratedVSIXBindingRedirectFile)">
     <PropertyGroup>
-      <_GeneratedVSIXBindingRedirectContent>
-      <![CDATA[
+      <_GeneratedVSIXBindingRedirectContent><![CDATA[
 // <auto-generated />
 using Microsoft.VisualStudio.Shell;
 
 @(ProjectReference->'[assembly: ProvideBindingRedirection(AssemblyName = "%(Name)", GenerateCodeBase = true, PublicKeyToken = "adb9793829ddae60", OldVersionLowerBound = "0.0.0.0", OldVersionUpperBound = "$(VersionPrefix).0", NewVersion = "$(VersionPrefix).0")]', '%0A')
-]]>
-      </_GeneratedVSIXBindingRedirectContent>
+]]></_GeneratedVSIXBindingRedirectContent>
     </PropertyGroup>
     <WriteLinesToFile Lines="$([MSBuild]::Escape($(_GeneratedVSIXBindingRedirectContent)))" File="$(_GeneratedVSIXBindingRedirectFile)" Overwrite="True" WriteOnlyWhenDifferent="True" />
     <ItemGroup>
diff --git a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/source.extension.vsixmanifest b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/source.extension.vsixmanifest
index 253dcc8b70..803ae60ff3 100644
--- a/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/source.extension.vsixmanifest
+++ b/src/Razor/tooling/Microsoft.VisualStudio.RazorExtension/source.extension.vsixmanifest
@@ -13,11 +13,11 @@
   </Installation>
   <Dependencies>
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,)" />
-    <Dependency Id="Microsoft.VisualStudio.MPF.15.0" DisplayName="Visual Studio MPF 15.0" d:Source="Installed" Version="[15.0]" />
+    <Dependency Id="Microsoft.VisualStudio.MPF.15.0" DisplayName="Visual Studio MPF 15.0" d:Source="Installed" Version="[15.0,)" />
   </Dependencies>
   <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
-    <Prerequisite Id="Microsoft.VisualStudio.Component.Roslyn.LanguageServices" Version="[15.0,16.0)" DisplayName="Roslyn Language Services" />
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,)" DisplayName="Visual Studio core editor" />
+    <Prerequisite Id="Microsoft.VisualStudio.Component.Roslyn.LanguageServices" Version="[15.0,)" DisplayName="Roslyn Language Services" />
   </Prerequisites>
   <Assets>
     <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
@@ -26,6 +26,7 @@
     <Asset Type="Microsoft.ServiceHub.Service" d:Source="File" Path="razorLanguageService64.servicehub.service.json" />
     <Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
     <Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.dll" />
+    <Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.dll" />
     <Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.AspNetCore.Razor.Language.dll" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.AspNetCore.Razor.Language.dll" />
     <Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.CodeAnalysis.Razor.dll" />
diff --git a/src/Razor/version.props b/src/Razor/version.props
index 9f70a3ee7c..584473c9bb 100644
--- a/src/Razor/version.props
+++ b/src/Razor/version.props
@@ -1,7 +1,7 @@
-<Project>
+<Project>
   <PropertyGroup>
-    <VersionPrefix>2.2.0</VersionPrefix>
-    <VersionSuffix>rtm</VersionSuffix>
+    <VersionPrefix>3.0.0</VersionPrefix>
+    <VersionSuffix>alpha1</VersionSuffix>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
     <BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>